Skip to content

Commit

Permalink
Merge pull request #742 from ascopes/task/delete-api-guardian
Browse files Browse the repository at this point in the history
Delete API guardian from the library.
  • Loading branch information
ascopes authored Sep 30, 2024
2 parents fd3608c + 304d5fc commit f340554
Show file tree
Hide file tree
Showing 135 changed files with 50 additions and 502 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
build/
out/
target/
*.javaimport

# Maven invoker plugin
**/interpolated-pom.xml
Expand Down
6 changes: 0 additions & 6 deletions java-compiler-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@
<artifactId>fuzzywuzzy</artifactId>
</dependency>

<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions java-compiler-testing/src/it/dogfood/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
</dependency>

<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import io.github.ascopes.jct.containers.ContainerGroup;
import java.util.ArrayList;
import java.util.List;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.AbstractListAssert;
import org.assertj.core.api.ObjectAssert;
Expand All @@ -36,7 +34,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public abstract class AbstractContainerGroupAssert<I extends AbstractContainerGroupAssert<I, C>, C extends ContainerGroup>
extends AbstractAssert<I, C> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@

import java.util.Collection;
import java.util.List;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.jspecify.annotations.Nullable;

Expand All @@ -34,7 +32,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public abstract class AbstractEnumAssert<A extends AbstractEnumAssert<A, E>, E extends Enum<E>>
extends AbstractAssert<A, E> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import java.nio.charset.StandardCharsets;
import java.time.Instant;
import javax.tools.JavaFileObject;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.AbstractByteArrayAssert;
import org.assertj.core.api.AbstractInstantAssert;
Expand All @@ -44,7 +42,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public abstract class AbstractJavaFileObjectAssert<I extends AbstractJavaFileObjectAssert<I, A>, A extends JavaFileObject>
extends AbstractAssert<I, A> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package io.github.ascopes.jct.assertions;

import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.jspecify.annotations.Nullable;

Expand All @@ -29,7 +27,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class ClassLoaderAssert extends AbstractAssert<ClassLoaderAssert, ClassLoader> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import java.util.EnumSet;
import java.util.Set;
import javax.tools.Diagnostic.Kind;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.jspecify.annotations.Nullable;

/**
Expand All @@ -28,7 +26,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class DiagnosticKindAssert
extends AbstractEnumAssert<DiagnosticKindAssert, Kind> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
package io.github.ascopes.jct.assertions;

import javax.tools.JavaFileObject;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.jspecify.annotations.Nullable;

/**
Expand All @@ -26,7 +24,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class JavaFileObjectAssert
extends AbstractJavaFileObjectAssert<JavaFileObjectAssert, JavaFileObject> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import static org.assertj.core.api.Assertions.assertThat;

import javax.tools.JavaFileObject.Kind;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractStringAssert;
import org.jspecify.annotations.Nullable;

Expand All @@ -29,7 +27,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class JavaFileObjectKindAssert
extends AbstractEnumAssert<JavaFileObjectKindAssert, Kind> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import javax.tools.Diagnostic;
import javax.tools.JavaFileManager.Location;
import javax.tools.JavaFileObject;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.jspecify.annotations.Nullable;

/**
Expand All @@ -36,7 +34,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
@SuppressWarnings("unused")
public final class JctAssertions extends UtilityClass {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
import javax.tools.Diagnostic.Kind;
import javax.tools.JavaFileManager.Location;
import javax.tools.StandardLocation;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.StringAssert;
import org.jspecify.annotations.Nullable;
Expand All @@ -37,7 +35,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class JctCompilationAssert
extends AbstractAssert<JctCompilationAssert, JctCompilation> {

Expand Down Expand Up @@ -249,8 +246,8 @@ public OutputContainerGroupAssert outputGroup(Location location) {
*
* @return the assertions to perform on the class package outputs.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public PackageContainerGroupAssert classOutputPackages() {
return outputGroup(StandardLocation.CLASS_OUTPUT).packages();
}
Expand All @@ -262,8 +259,8 @@ public PackageContainerGroupAssert classOutputPackages() {
*
* @return the assertions to perform on the class module outputs.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public ModuleContainerGroupAssert classOutputModules() {
return outputGroup(StandardLocation.CLASS_OUTPUT).modules();
}
Expand All @@ -275,8 +272,8 @@ public ModuleContainerGroupAssert classOutputModules() {
*
* @return the assertions to perform on the source package outputs.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public PackageContainerGroupAssert sourceOutputPackages() {
return outputGroup(StandardLocation.SOURCE_OUTPUT).packages();
}
Expand All @@ -288,8 +285,8 @@ public PackageContainerGroupAssert sourceOutputPackages() {
*
* @return the assertions to perform on the source module outputs.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public ModuleContainerGroupAssert sourceOutputModules() {
return outputGroup(StandardLocation.SOURCE_OUTPUT).modules();
}
Expand All @@ -301,8 +298,8 @@ public ModuleContainerGroupAssert sourceOutputModules() {
*
* @return the assertions to perform on the class path.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public PackageContainerGroupAssert classPathPackages() {
return packageGroup(StandardLocation.CLASS_PATH);
}
Expand All @@ -314,8 +311,8 @@ public PackageContainerGroupAssert classPathPackages() {
*
* @return the assertions to perform on the source path.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public PackageContainerGroupAssert sourcePathPackages() {
return packageGroup(StandardLocation.SOURCE_PATH);
}
Expand All @@ -327,8 +324,8 @@ public PackageContainerGroupAssert sourcePathPackages() {
*
* @return the assertions to perform on the source path.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public ModuleContainerGroupAssert moduleSourcePathModules() {
return moduleGroup(StandardLocation.MODULE_SOURCE_PATH);
}
Expand All @@ -340,8 +337,8 @@ public ModuleContainerGroupAssert moduleSourcePathModules() {
*
* @return the assertions to perform on the module path.
* @throws AssertionError if the compilation was null, or no group for the location was found.
* @since 0.6.4
*/
@API(since = "0.6.4", status = Status.STABLE)
public ModuleContainerGroupAssert modulePathModules() {
return moduleGroup(StandardLocation.MODULE_PATH);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

import io.github.ascopes.jct.repr.LocationRepresentation;
import javax.tools.JavaFileManager.Location;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.AbstractStringAssert;
import org.jspecify.annotations.Nullable;
Expand All @@ -31,7 +29,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class LocationAssert extends AbstractAssert<LocationAssert, Location> {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import io.github.ascopes.jct.containers.ModuleContainerGroup;
import io.github.ascopes.jct.filemanagers.ModuleLocation;
import io.github.ascopes.jct.utils.StringUtils;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.jspecify.annotations.Nullable;

/**
Expand All @@ -30,7 +28,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class ModuleContainerGroupAssert
extends AbstractContainerGroupAssert<ModuleContainerGroupAssert, ModuleContainerGroup> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
package io.github.ascopes.jct.assertions;

import io.github.ascopes.jct.containers.OutputContainerGroup;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.jspecify.annotations.Nullable;

/**
Expand All @@ -26,7 +24,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class OutputContainerGroupAssert
extends AbstractContainerGroupAssert<OutputContainerGroupAssert, OutputContainerGroup> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractPathAssert;
import org.assertj.core.description.TextDescription;
import org.assertj.core.error.MultipleAssertionsError;
Expand All @@ -47,7 +45,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class PackageContainerGroupAssert
extends AbstractContainerGroupAssert<PackageContainerGroupAssert, PackageContainerGroup> {

Expand Down Expand Up @@ -185,7 +182,6 @@ public PackageContainerGroupAssert fileDoesNotExist(String... fragments) {
* @throws NullPointerException if any of the fragments are null.
* @throws IllegalArgumentException if no fragments are provided.
*/

public AbstractPathAssert<?> fileExists(String... fragments) {
requireNonNullValues(fragments, "fragments");
requireAtLeastOne(fragments, "fragments");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import static org.assertj.core.api.Assertions.assertThat;

import io.github.ascopes.jct.filemanagers.PathFileObject;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractPathAssert;
import org.jspecify.annotations.Nullable;

Expand All @@ -29,7 +27,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class PathFileObjectAssert
extends AbstractJavaFileObjectAssert<PathFileObjectAssert, PathFileObject> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
import io.github.ascopes.jct.repr.StackTraceRepresentation;
import java.util.ArrayList;
import java.util.List;
import org.apiguardian.api.API;
import org.apiguardian.api.API.Status;
import org.assertj.core.api.AbstractListAssert;
import org.jspecify.annotations.Nullable;

Expand All @@ -32,7 +30,6 @@
* @author Ashley Scopes
* @since 0.0.1
*/
@API(since = "0.0.1", status = Status.STABLE)
public final class StackTraceAssert
extends AbstractListAssert<StackTraceAssert, List<? extends StackTraceElement>, StackTraceElement, StackTraceElementAssert> {

Expand Down Expand Up @@ -61,3 +58,4 @@ protected StackTraceAssert newAbstractIterableAssert(
return new StackTraceAssert(list);
}
}

Loading

0 comments on commit f340554

Please sign in to comment.