migrate to the maintained javapoet project

ben-manes · Jan 11, 2025 · 3ff2445 · 3ff2445
1 parent bbf54be
commit 3ff2445
Show file tree

Hide file tree

Showing 27 changed files with 76 additions and 76 deletions.
diff --git a/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/LocalCacheFactoryGenerator.java b/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/LocalCacheFactoryGenerator.java
@@ -59,11 +59,11 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeSpec;
 
 /**
  * Generates a factory that creates the cache optimized for the user specified configuration.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/NodeFactoryGenerator.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/NodeFactoryGenerator.java
@@ -54,11 +54,11 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.google.common.io.Resources;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeSpec;
 
 /**
  * Generates the cache entry's specialized type. These entries are optimized for the configuration
@@ -171,7 +171,7 @@ private TypeSpec makeNodeSpec(String className, boolean isFinal, ImmutableSet<Fe
     if (features.size() == 2) {
       parentFeatures = ImmutableSet.of();
       generateFeatures = features;
-      superClass = TypeName.OBJECT;
+      superClass = ClassName.OBJECT;
     } else {
       // Requires that parentFeatures is in featureByIndex order for super class naming
       parentFeatures = ImmutableSet.copyOf(Iterables.limit(features, features.size() - 1));

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/Specifications.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/Specifications.java
@@ -22,11 +22,11 @@
 
 import org.jspecify.annotations.Nullable;
 
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeVariableName;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.ParameterSpec;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeVariableName;
 
 /**
  * Shared constants for a code generation specification.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddConstructor.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddConstructor.java
@@ -22,7 +22,7 @@
 
 import javax.lang.model.element.Modifier;
 
-import com.squareup.javapoet.FieldSpec;
+import com.palantir.javapoet.FieldSpec;
 
 /**
  * Adds the constructor to the cache.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddDeques.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddDeques.java
@@ -21,9 +21,9 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeName;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpirationTicker.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpirationTicker.java
@@ -20,8 +20,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpireAfterAccess.java b/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpireAfterAccess.java
@@ -21,8 +21,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpireAfterWrite.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddExpireAfterWrite.java
@@ -18,8 +18,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddFastPath.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddFastPath.java
@@ -19,7 +19,7 @@
 
 import com.github.benmanes.caffeine.cache.Feature;
 import com.google.common.collect.Sets;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddKeyValueStrength.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddKeyValueStrength.java
@@ -21,9 +21,9 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeName;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddMaximum.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddMaximum.java
@@ -21,9 +21,9 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.CodeBlock;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddPacer.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddPacer.java
@@ -20,8 +20,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddRefreshAfterWrite.java b/...eine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddRefreshAfterWrite.java
@@ -18,8 +18,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddRemovalListener.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddRemovalListener.java
@@ -20,8 +20,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddStats.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/AddStats.java
@@ -21,8 +21,8 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.Feature;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/Finalize.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/Finalize.java
@@ -17,7 +17,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.squareup.javapoet.AnnotationSpec;
+import com.palantir.javapoet.AnnotationSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/LocalCacheContext.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/local/LocalCacheContext.java
@@ -23,9 +23,9 @@
 import com.github.benmanes.caffeine.cache.Feature;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeSpec;
 
 /**
  * @author [email protected] (Ben Manes)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddConstructors.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddConstructors.java
@@ -20,7 +20,7 @@
 import static com.github.benmanes.caffeine.cache.Specifications.valueSpec;
 import static com.github.benmanes.caffeine.cache.node.NodeContext.varHandleName;
 
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * Adds the constructors to the node.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddExpiration.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddExpiration.java
@@ -24,8 +24,8 @@
 import com.github.benmanes.caffeine.cache.Feature;
 import com.github.benmanes.caffeine.cache.node.NodeContext.Strength;
 import com.github.benmanes.caffeine.cache.node.NodeContext.Visibility;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeName;
 
 /**
  * Adds the expiration support to the node.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddFactoryMethods.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddFactoryMethods.java
@@ -28,8 +28,8 @@
 
 import com.github.benmanes.caffeine.cache.Feature;
 import com.google.common.collect.ImmutableList;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.ParameterSpec;
 
 /**
  * @author github.com/jvassev (Julian Vassev)

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddHealth.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddHealth.java
@@ -23,7 +23,7 @@
 import static com.github.benmanes.caffeine.cache.node.NodeContext.varHandleName;
 
 import com.github.benmanes.caffeine.cache.node.NodeContext.Strength;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * Adds the health state to the node.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddKey.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddKey.java
@@ -22,9 +22,9 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.node.NodeContext.Visibility;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * Adds the key to the node.
@@ -57,7 +57,7 @@ private static void addIfStrongValue(NodeContext context) {
         .addMethod(context.newGetRef("key"));
     context.addVarHandle("key", context.isStrongKeys()
         ? ClassName.get(Object.class)
-        : context.keyReferenceType().rawType);
+        : context.keyReferenceType().rawType());
   }
 
   private static void addIfCollectedValue(NodeContext context) {

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddMaximum.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddMaximum.java
@@ -18,8 +18,8 @@
 import com.github.benmanes.caffeine.cache.Feature;
 import com.github.benmanes.caffeine.cache.node.NodeContext.Strength;
 import com.github.benmanes.caffeine.cache.node.NodeContext.Visibility;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.TypeName;
 
 /**
  * Adds the maximum metadata to the node.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddValue.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/AddValue.java
@@ -25,10 +25,10 @@
 import javax.lang.model.element.Modifier;
 
 import com.github.benmanes.caffeine.cache.node.NodeContext.Strength;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.CodeBlock;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
 
 /**
  * Adds the value to the node.
@@ -53,7 +53,7 @@ public void execute(NodeContext context) {
     if (context.isStrongValues()) {
       context.addVarHandle("value", ClassName.get(Object.class));
     } else {
-      context.addVarHandle("value", context.valueReferenceType().rawType);
+      context.addVarHandle("value", context.valueReferenceType().rawType());
     }
   }
 

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/Finalize.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/Finalize.java
@@ -20,8 +20,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.CodeBlock;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.CodeBlock;
 
 /**
  * Finishes construction of the node.

diff --git a/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/NodeContext.java b/caffeine/src/javaPoet/java/com/github/benmanes/caffeine/cache/node/NodeContext.java
@@ -40,13 +40,13 @@
 import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.CodeBlock;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeSpec;
 
 /**
  * @author [email protected] (Ben Manes)
@@ -90,7 +90,7 @@ public Modifier[] publicFinalModifiers() {
   }
 
   public boolean isBaseClass() {
-    return superClass.equals(TypeName.OBJECT);
+    return superClass.equals(ClassName.OBJECT);
   }
 
   public Strength keyStrength() {
@@ -132,7 +132,7 @@ public void addVarHandle(String varName, TypeName type) {
         Modifier.PROTECTED, Modifier.STATIC, Modifier.FINAL).build());
     Consumer<CodeBlock.Builder> statement = builder -> builder
         .addStatement("$L = lookup.findVarHandle($T.class, $L.$L, $T.class)", fieldName,
-            ClassName.bestGuess(className), NODE_FACTORY.rawType.simpleName(),
+            ClassName.bestGuess(className), NODE_FACTORY.rawType().simpleName(),
             fieldName, type);
     varHandles.add(statement);
   }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -47,7 +47,7 @@ jakarta-inject = "2.0.1"
 jamm = "0.4.0"
 java-object-layout = "0.17"
 javax-inject = "1"
-javapoet = "1.13.0"
+javapoet = "0.6.0"
 jazzer = "0.23.0"
 jcache = "1.1.1"
 jcommander = "1.82"
@@ -87,7 +87,7 @@ sigstore = "1.2.0"
 sonarqube = "6.0.1.5171"
 spotbugs = "4.8.6"
 spotbugs-contrib = "7.6.9"
-spotbugs-plugin = "6.0.27"
+spotbugs-plugin = "6.1.0"
 stream = "2.9.8"
 tcache = "2.0.1"
 testng = "7.10.2"
@@ -149,7 +149,7 @@ jacoco-ant = { module = "org.jacoco:org.jacoco.ant", version.ref = "jacoco" }
 jakarta-inject = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject" }
 jamm = { module = "com.github.jbellis:jamm", version.ref = "jamm" }
 java-object-layout = { module = "org.openjdk.jol:jol-cli", version.ref = "java-object-layout" }
-javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
+javapoet = { module = "com.palantir.javapoet:javapoet", version.ref = "javapoet" }
 javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
 jazzer = { module = "com.code-intelligence:jazzer", version.ref = "jazzer" }
 jazzer-junit = { module = "com.code-intelligence:jazzer-junit", version.ref = "jazzer" }