Skip to content

Commit 304d5fc

Browse files
committed
Delete API guardian from the library.
Usages of the annotation have never been fully consistent and users should be using reflection to determine the JAR version on the off chance they are manipulating this API programmatically. API guardian has never been specified as part of the public API, so this is not a breaking change.
1 parent 756ac80 commit 304d5fc

File tree

135 files changed

+50
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+50
-502
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
build/
33
out/
44
target/
5+
*.javaimport
56

67
# Maven invoker plugin
78
**/interpolated-pom.xml

java-compiler-testing/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@
4848
<artifactId>fuzzywuzzy</artifactId>
4949
</dependency>
5050

51-
<dependency>
52-
<groupId>org.apiguardian</groupId>
53-
<artifactId>apiguardian-api</artifactId>
54-
<optional>true</optional>
55-
</dependency>
56-
5751
<dependency>
5852
<groupId>org.assertj</groupId>
5953
<artifactId>assertj-core</artifactId>

java-compiler-testing/src/it/dogfood/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
<scope>test</scope>
7575
</dependency>
7676

77-
<dependency>
78-
<groupId>org.apiguardian</groupId>
79-
<artifactId>apiguardian-api</artifactId>
80-
</dependency>
81-
8277
<dependency>
8378
<groupId>org.jspecify</groupId>
8479
<artifactId>jspecify</artifactId>

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/AbstractContainerGroupAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import io.github.ascopes.jct.containers.ContainerGroup;
2222
import java.util.ArrayList;
2323
import java.util.List;
24-
import org.apiguardian.api.API;
25-
import org.apiguardian.api.API.Status;
2624
import org.assertj.core.api.AbstractAssert;
2725
import org.assertj.core.api.AbstractListAssert;
2826
import org.assertj.core.api.ObjectAssert;
@@ -36,7 +34,6 @@
3634
* @author Ashley Scopes
3735
* @since 0.0.1
3836
*/
39-
@API(since = "0.0.1", status = Status.STABLE)
4037
public abstract class AbstractContainerGroupAssert<I extends AbstractContainerGroupAssert<I, C>, C extends ContainerGroup>
4138
extends AbstractAssert<I, C> {
4239

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/AbstractEnumAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import java.util.Collection;
2323
import java.util.List;
24-
import org.apiguardian.api.API;
25-
import org.apiguardian.api.API.Status;
2624
import org.assertj.core.api.AbstractAssert;
2725
import org.jspecify.annotations.Nullable;
2826

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

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/AbstractJavaFileObjectAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import java.nio.charset.StandardCharsets;
2828
import java.time.Instant;
2929
import javax.tools.JavaFileObject;
30-
import org.apiguardian.api.API;
31-
import org.apiguardian.api.API.Status;
3230
import org.assertj.core.api.AbstractAssert;
3331
import org.assertj.core.api.AbstractByteArrayAssert;
3432
import org.assertj.core.api.AbstractInstantAssert;
@@ -44,7 +42,6 @@
4442
* @author Ashley Scopes
4543
* @since 0.0.1
4644
*/
47-
@API(since = "0.0.1", status = Status.STABLE)
4845
public abstract class AbstractJavaFileObjectAssert<I extends AbstractJavaFileObjectAssert<I, A>, A extends JavaFileObject>
4946
extends AbstractAssert<I, A> {
5047

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/ClassLoaderAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package io.github.ascopes.jct.assertions;
1717

18-
import org.apiguardian.api.API;
19-
import org.apiguardian.api.API.Status;
2018
import org.assertj.core.api.AbstractAssert;
2119
import org.jspecify.annotations.Nullable;
2220

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

3532
/**

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/DiagnosticKindAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import java.util.EnumSet;
1919
import java.util.Set;
2020
import javax.tools.Diagnostic.Kind;
21-
import org.apiguardian.api.API;
22-
import org.apiguardian.api.API.Status;
2321
import org.jspecify.annotations.Nullable;
2422

2523
/**
@@ -28,7 +26,6 @@
2826
* @author Ashley Scopes
2927
* @since 0.0.1
3028
*/
31-
@API(since = "0.0.1", status = Status.STABLE)
3229
public final class DiagnosticKindAssert
3330
extends AbstractEnumAssert<DiagnosticKindAssert, Kind> {
3431

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JavaFileObjectAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package io.github.ascopes.jct.assertions;
1717

1818
import javax.tools.JavaFileObject;
19-
import org.apiguardian.api.API;
20-
import org.apiguardian.api.API.Status;
2119
import org.jspecify.annotations.Nullable;
2220

2321
/**
@@ -26,7 +24,6 @@
2624
* @author Ashley Scopes
2725
* @since 0.0.1
2826
*/
29-
@API(since = "0.0.1", status = Status.STABLE)
3027
public final class JavaFileObjectAssert
3128
extends AbstractJavaFileObjectAssert<JavaFileObjectAssert, JavaFileObject> {
3229

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JavaFileObjectKindAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import javax.tools.JavaFileObject.Kind;
21-
import org.apiguardian.api.API;
22-
import org.apiguardian.api.API.Status;
2321
import org.assertj.core.api.AbstractStringAssert;
2422
import org.jspecify.annotations.Nullable;
2523

@@ -29,7 +27,6 @@
2927
* @author Ashley Scopes
3028
* @since 0.0.1
3129
*/
32-
@API(since = "0.0.1", status = Status.STABLE)
3330
public final class JavaFileObjectKindAssert
3431
extends AbstractEnumAssert<JavaFileObjectKindAssert, Kind> {
3532

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JctAssertions.java

-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import javax.tools.Diagnostic;
2727
import javax.tools.JavaFileManager.Location;
2828
import javax.tools.JavaFileObject;
29-
import org.apiguardian.api.API;
30-
import org.apiguardian.api.API.Status;
3129
import org.jspecify.annotations.Nullable;
3230

3331
/**
@@ -36,7 +34,6 @@
3634
* @author Ashley Scopes
3735
* @since 0.0.1
3836
*/
39-
@API(since = "0.0.1", status = Status.STABLE)
4037
@SuppressWarnings("unused")
4138
public final class JctAssertions extends UtilityClass {
4239

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/JctCompilationAssert.java

+8-11
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import javax.tools.Diagnostic.Kind;
2626
import javax.tools.JavaFileManager.Location;
2727
import javax.tools.StandardLocation;
28-
import org.apiguardian.api.API;
29-
import org.apiguardian.api.API.Status;
3028
import org.assertj.core.api.AbstractAssert;
3129
import org.assertj.core.api.StringAssert;
3230
import org.jspecify.annotations.Nullable;
@@ -37,7 +35,6 @@
3735
* @author Ashley Scopes
3836
* @since 0.0.1
3937
*/
40-
@API(since = "0.0.1", status = Status.STABLE)
4138
public final class JctCompilationAssert
4239
extends AbstractAssert<JctCompilationAssert, JctCompilation> {
4340

@@ -249,8 +246,8 @@ public OutputContainerGroupAssert outputGroup(Location location) {
249246
*
250247
* @return the assertions to perform on the class package outputs.
251248
* @throws AssertionError if the compilation was null, or no group for the location was found.
249+
* @since 0.6.4
252250
*/
253-
@API(since = "0.6.4", status = Status.STABLE)
254251
public PackageContainerGroupAssert classOutputPackages() {
255252
return outputGroup(StandardLocation.CLASS_OUTPUT).packages();
256253
}
@@ -262,8 +259,8 @@ public PackageContainerGroupAssert classOutputPackages() {
262259
*
263260
* @return the assertions to perform on the class module outputs.
264261
* @throws AssertionError if the compilation was null, or no group for the location was found.
262+
* @since 0.6.4
265263
*/
266-
@API(since = "0.6.4", status = Status.STABLE)
267264
public ModuleContainerGroupAssert classOutputModules() {
268265
return outputGroup(StandardLocation.CLASS_OUTPUT).modules();
269266
}
@@ -275,8 +272,8 @@ public ModuleContainerGroupAssert classOutputModules() {
275272
*
276273
* @return the assertions to perform on the source package outputs.
277274
* @throws AssertionError if the compilation was null, or no group for the location was found.
275+
* @since 0.6.4
278276
*/
279-
@API(since = "0.6.4", status = Status.STABLE)
280277
public PackageContainerGroupAssert sourceOutputPackages() {
281278
return outputGroup(StandardLocation.SOURCE_OUTPUT).packages();
282279
}
@@ -288,8 +285,8 @@ public PackageContainerGroupAssert sourceOutputPackages() {
288285
*
289286
* @return the assertions to perform on the source module outputs.
290287
* @throws AssertionError if the compilation was null, or no group for the location was found.
288+
* @since 0.6.4
291289
*/
292-
@API(since = "0.6.4", status = Status.STABLE)
293290
public ModuleContainerGroupAssert sourceOutputModules() {
294291
return outputGroup(StandardLocation.SOURCE_OUTPUT).modules();
295292
}
@@ -301,8 +298,8 @@ public ModuleContainerGroupAssert sourceOutputModules() {
301298
*
302299
* @return the assertions to perform on the class path.
303300
* @throws AssertionError if the compilation was null, or no group for the location was found.
301+
* @since 0.6.4
304302
*/
305-
@API(since = "0.6.4", status = Status.STABLE)
306303
public PackageContainerGroupAssert classPathPackages() {
307304
return packageGroup(StandardLocation.CLASS_PATH);
308305
}
@@ -314,8 +311,8 @@ public PackageContainerGroupAssert classPathPackages() {
314311
*
315312
* @return the assertions to perform on the source path.
316313
* @throws AssertionError if the compilation was null, or no group for the location was found.
314+
* @since 0.6.4
317315
*/
318-
@API(since = "0.6.4", status = Status.STABLE)
319316
public PackageContainerGroupAssert sourcePathPackages() {
320317
return packageGroup(StandardLocation.SOURCE_PATH);
321318
}
@@ -327,8 +324,8 @@ public PackageContainerGroupAssert sourcePathPackages() {
327324
*
328325
* @return the assertions to perform on the source path.
329326
* @throws AssertionError if the compilation was null, or no group for the location was found.
327+
* @since 0.6.4
330328
*/
331-
@API(since = "0.6.4", status = Status.STABLE)
332329
public ModuleContainerGroupAssert moduleSourcePathModules() {
333330
return moduleGroup(StandardLocation.MODULE_SOURCE_PATH);
334331
}
@@ -340,8 +337,8 @@ public ModuleContainerGroupAssert moduleSourcePathModules() {
340337
*
341338
* @return the assertions to perform on the module path.
342339
* @throws AssertionError if the compilation was null, or no group for the location was found.
340+
* @since 0.6.4
343341
*/
344-
@API(since = "0.6.4", status = Status.STABLE)
345342
public ModuleContainerGroupAssert modulePathModules() {
346343
return moduleGroup(StandardLocation.MODULE_PATH);
347344
}

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/LocationAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
import io.github.ascopes.jct.repr.LocationRepresentation;
2121
import javax.tools.JavaFileManager.Location;
22-
import org.apiguardian.api.API;
23-
import org.apiguardian.api.API.Status;
2422
import org.assertj.core.api.AbstractAssert;
2523
import org.assertj.core.api.AbstractStringAssert;
2624
import org.jspecify.annotations.Nullable;
@@ -31,7 +29,6 @@
3129
* @author Ashley Scopes
3230
* @since 0.0.1
3331
*/
34-
@API(since = "0.0.1", status = Status.STABLE)
3532
public final class LocationAssert extends AbstractAssert<LocationAssert, Location> {
3633

3734
/**

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/ModuleContainerGroupAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import io.github.ascopes.jct.containers.ModuleContainerGroup;
2121
import io.github.ascopes.jct.filemanagers.ModuleLocation;
2222
import io.github.ascopes.jct.utils.StringUtils;
23-
import org.apiguardian.api.API;
24-
import org.apiguardian.api.API.Status;
2523
import org.jspecify.annotations.Nullable;
2624

2725
/**
@@ -30,7 +28,6 @@
3028
* @author Ashley Scopes
3129
* @since 0.0.1
3230
*/
33-
@API(since = "0.0.1", status = Status.STABLE)
3431
public final class ModuleContainerGroupAssert
3532
extends AbstractContainerGroupAssert<ModuleContainerGroupAssert, ModuleContainerGroup> {
3633

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/OutputContainerGroupAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package io.github.ascopes.jct.assertions;
1717

1818
import io.github.ascopes.jct.containers.OutputContainerGroup;
19-
import org.apiguardian.api.API;
20-
import org.apiguardian.api.API.Status;
2119
import org.jspecify.annotations.Nullable;
2220

2321
/**
@@ -26,7 +24,6 @@
2624
* @author Ashley Scopes
2725
* @since 0.0.1
2826
*/
29-
@API(since = "0.0.1", status = Status.STABLE)
3027
public final class OutputContainerGroupAssert
3128
extends AbstractContainerGroupAssert<OutputContainerGroupAssert, OutputContainerGroup> {
3229

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/PackageContainerGroupAssert.java

-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import java.util.Set;
3535
import java.util.stream.Collectors;
3636
import java.util.stream.StreamSupport;
37-
import org.apiguardian.api.API;
38-
import org.apiguardian.api.API.Status;
3937
import org.assertj.core.api.AbstractPathAssert;
4038
import org.assertj.core.description.TextDescription;
4139
import org.assertj.core.error.MultipleAssertionsError;
@@ -47,7 +45,6 @@
4745
* @author Ashley Scopes
4846
* @since 0.0.1
4947
*/
50-
@API(since = "0.0.1", status = Status.STABLE)
5148
public final class PackageContainerGroupAssert
5249
extends AbstractContainerGroupAssert<PackageContainerGroupAssert, PackageContainerGroup> {
5350

@@ -185,7 +182,6 @@ public PackageContainerGroupAssert fileDoesNotExist(String... fragments) {
185182
* @throws NullPointerException if any of the fragments are null.
186183
* @throws IllegalArgumentException if no fragments are provided.
187184
*/
188-
189185
public AbstractPathAssert<?> fileExists(String... fragments) {
190186
requireNonNullValues(fragments, "fragments");
191187
requireAtLeastOne(fragments, "fragments");

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/PathFileObjectAssert.java

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
import io.github.ascopes.jct.filemanagers.PathFileObject;
21-
import org.apiguardian.api.API;
22-
import org.apiguardian.api.API.Status;
2321
import org.assertj.core.api.AbstractPathAssert;
2422
import org.jspecify.annotations.Nullable;
2523

@@ -29,7 +27,6 @@
2927
* @author Ashley Scopes
3028
* @since 0.0.1
3129
*/
32-
@API(since = "0.0.1", status = Status.STABLE)
3330
public final class PathFileObjectAssert
3431
extends AbstractJavaFileObjectAssert<PathFileObjectAssert, PathFileObject> {
3532

java-compiler-testing/src/main/java/io/github/ascopes/jct/assertions/StackTraceAssert.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import io.github.ascopes.jct.repr.StackTraceRepresentation;
1919
import java.util.ArrayList;
2020
import java.util.List;
21-
import org.apiguardian.api.API;
22-
import org.apiguardian.api.API.Status;
2321
import org.assertj.core.api.AbstractListAssert;
2422
import org.jspecify.annotations.Nullable;
2523

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

@@ -61,3 +58,4 @@ protected StackTraceAssert newAbstractIterableAssert(
6158
return new StackTraceAssert(list);
6259
}
6360
}
61+

0 commit comments

Comments
 (0)