Migrate to using cthing-annotations.

cthing · Dec 23, 2023 · f1953a0 · f1953a0
1 parent c227468
commit f1953a0
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 62 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,6 +33,7 @@ java {
 }
 
 dependencies {
+    implementation(libs.cthingAnnots)
     implementation(libs.jsr305)
 
     testImplementation(libs.assertJ)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ versions = { id = "com.github.ben-manes.versions", version = "0.50.0" }
 
 [libraries]
 assertJ = "org.assertj:assertj-core:3.24.2"
+cthingAnnots = "org.cthing:cthing-annotations:1.0.0"
 equalsVerifier = "nl.jqno.equalsverifier:equalsverifier:3.15.4"
 jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.16.0"
 jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
@@ -20,4 +21,4 @@ junitLauncher = "org.junit.platform:junit-platform-launcher:1.10.1"
 junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
 mockito = "org.mockito:mockito-core:5.8.0"
 spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.3"
-versionParser = "org.cthing:versionparser:4.2.0"
+versionParser = "org.cthing:versionparser:4.2.1"
diff --git a/src/main/java/org/cthing/molinillo/DependencyGraph.java b/src/main/java/org/cthing/molinillo/DependencyGraph.java
@@ -15,7 +15,7 @@
 
 import javax.annotation.Nullable;
 
-import org.cthing.molinillo.annotations.VisibilityForTesting;
+import org.cthing.annotations.AccessForTesting;
 import org.cthing.molinillo.errors.CircularDependencyError;
 import org.cthing.molinillo.graph.Edge;
 import org.cthing.molinillo.graph.Log;
@@ -46,7 +46,7 @@ public DependencyGraph() {
      *
      * @param log Action log to record changes to the graph
      */
-    @VisibilityForTesting
+    @AccessForTesting
     public DependencyGraph(final Log<P, R> log) {
         this.log = log;
         this.vertices = new HashMap<>();
@@ -226,7 +226,7 @@ public <U> DependencyGraph<U, R> cloneGraph(final Function<P, U> payloadTransfor
      *      are included in the path
      * @throws IllegalArgumentException if no path exists between the specified vertices
      */
-    @VisibilityForTesting
+    @AccessForTesting
     List<Vertex<P, R>> path(final Vertex<P, R> from, final Vertex<P, R> to) {
         final Map<String, Integer> distances = new HashMap<>();
         distances.put(from.getName(), 0);

diff --git a/src/main/java/org/cthing/molinillo/annotations/PackageNonnullByDefault.java b/src/main/java/org/cthing/molinillo/annotations/PackageNonnullByDefault.java
diff --git a/src/main/java/org/cthing/molinillo/annotations/VisibilityForTesting.java b/src/main/java/org/cthing/molinillo/annotations/VisibilityForTesting.java
diff --git a/src/main/java/org/cthing/molinillo/annotations/package-info.java b/src/main/java/org/cthing/molinillo/annotations/package-info.java
diff --git a/src/main/java/org/cthing/molinillo/errors/package-info.java b/src/main/java/org/cthing/molinillo/errors/package-info.java
@@ -4,4 +4,4 @@
 @PackageNonnullByDefault
 package org.cthing.molinillo.errors;
 
-import org.cthing.molinillo.annotations.PackageNonnullByDefault;
+import org.cthing.annotations.PackageNonnullByDefault;
diff --git a/src/main/java/org/cthing/molinillo/graph/package-info.java b/src/main/java/org/cthing/molinillo/graph/package-info.java
@@ -4,4 +4,4 @@
 @PackageNonnullByDefault
 package org.cthing.molinillo.graph;
 
-import org.cthing.molinillo.annotations.PackageNonnullByDefault;
+import org.cthing.annotations.PackageNonnullByDefault;
diff --git a/src/main/java/org/cthing/molinillo/package-info.java b/src/main/java/org/cthing/molinillo/package-info.java
@@ -4,4 +4,4 @@
 @PackageNonnullByDefault
 package org.cthing.molinillo;
 
-import org.cthing.molinillo.annotations.PackageNonnullByDefault;
+import org.cthing.annotations.PackageNonnullByDefault;
diff --git a/src/test/java/org/cthing/molinillo/fixtures/package-info.java b/src/test/java/org/cthing/molinillo/fixtures/package-info.java
@@ -4,4 +4,4 @@
 @PackageNonnullByDefault
 package org.cthing.molinillo.fixtures;
 
-import org.cthing.molinillo.annotations.PackageNonnullByDefault;
+import org.cthing.annotations.PackageNonnullByDefault;
diff --git a/src/test/java/org/cthing/molinillo/fixtures/test/package-info.java b/src/test/java/org/cthing/molinillo/fixtures/test/package-info.java
@@ -4,4 +4,4 @@
 @PackageNonnullByDefault
 package org.cthing.molinillo.fixtures.test;
 
-import org.cthing.molinillo.annotations.PackageNonnullByDefault;
+import org.cthing.annotations.PackageNonnullByDefault;