Switch to Palantir's JavaPoet

square · Oct 10, 2024 · 53b4bc8 · 53b4bc8
1 parent ea50a78
commit 53b4bc8
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ dokka = "1.9.20"
 grpc = "1.68.0"
 gson = "2.11.0"
 guava = "32.0.1-jre"
-javapoet = "1.13.0"
+javapoet = "0.5.0"
 jimfs = "1.3.0"
 jmh = "1.37"
 jsr305 = "3.0.2"
@@ -43,7 +43,7 @@ grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
-javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
+javapoet = { module = "com.palantir.javapoet:javapoet", version.ref = "javapoet" }
 jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }

diff --git a/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java b/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java
@@ -39,18 +39,18 @@
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Ordering;
-import com.squareup.javapoet.AnnotationSpec;
-import com.squareup.javapoet.ArrayTypeName;
-import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
-import com.squareup.javapoet.FieldSpec;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.NameAllocator;
-import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
-import com.squareup.javapoet.WildcardTypeName;
+import com.palantir.javapoet.AnnotationSpec;
+import com.palantir.javapoet.ArrayTypeName;
+import com.palantir.javapoet.ClassName;
+import com.palantir.javapoet.CodeBlock;
+import com.palantir.javapoet.FieldSpec;
+import com.palantir.javapoet.MethodSpec;
+import com.palantir.javapoet.NameAllocator;
+import com.palantir.javapoet.ParameterSpec;
+import com.palantir.javapoet.ParameterizedTypeName;
+import com.palantir.javapoet.TypeName;
+import com.palantir.javapoet.TypeSpec;
+import com.palantir.javapoet.WildcardTypeName;
 import com.squareup.wire.EnumAdapter;
 import com.squareup.wire.FieldEncoding;
 import com.squareup.wire.Message;
@@ -510,7 +510,7 @@ public TypeName typeName(ProtoType protoType) {
     if (typeName instanceof ClassName) {
       javaName = (ClassName) typeName;
     } else if (typeName instanceof ParameterizedTypeName) {
-      javaName = ((ParameterizedTypeName) typeName).rawType;
+      javaName = ((ParameterizedTypeName) typeName).rawType();
     } else {
       throw new IllegalArgumentException("Unexpected typeName :" + typeName);
     }
@@ -1641,7 +1641,7 @@ private String adapterString(ProtoType type) {
   private String reflectionName(TypeName typeName) {
     ClassName className;
     if (typeName instanceof ParameterizedTypeName) {
-      className = ((ParameterizedTypeName) typeName).rawType;
+      className = ((ParameterizedTypeName) typeName).rawType();
     } else {
       className = (ClassName) typeName;
     }

diff --git a/wire-java-generator/src/main/java/com/squareup/wire/java/JavaSchemaHandler.kt b/wire-java-generator/src/main/java/com/squareup/wire/java/JavaSchemaHandler.kt
@@ -15,7 +15,7 @@
  */
 package com.squareup.wire.java
 
-import com.squareup.javapoet.JavaFile
+import com.palantir.javapoet.JavaFile
 import com.squareup.wire.schema.Extend
 import com.squareup.wire.schema.Field
 import com.squareup.wire.schema.Location
@@ -86,8 +86,8 @@ class JavaSchemaHandler(
   }
 
   private fun write(
-    javaTypeName: com.squareup.javapoet.ClassName,
-    typeSpec: com.squareup.javapoet.TypeSpec,
+    javaTypeName: com.palantir.javapoet.ClassName,
+    typeSpec: com.palantir.javapoet.TypeSpec,
     source: Any,
     location: Location,
     context: Context,
@@ -98,12 +98,12 @@ class JavaSchemaHandler(
       .addFileComment("\nSource: \$L in \$L", source, location.withPathOnly())
       .build()
     val filePath = outDirectory /
-      javaFile.packageName.replace(".", "/") /
+      javaFile.packageName().replace(".", "/") /
       "${javaTypeName.simpleName()}.java"
 
     context.logger.artifactHandled(
       outDirectory,
-      "${javaFile.packageName}.${javaFile.typeSpec.name}",
+      "${javaFile.packageName()}.${javaFile.typeSpec().name()}",
       "Java",
     )
     try {
@@ -113,7 +113,7 @@ class JavaSchemaHandler(
       }
     } catch (e: IOException) {
       throw IOException(
-        "Error emitting ${javaFile.packageName}.${javaFile.typeSpec.name} to $outDirectory",
+        "Error emitting ${javaFile.packageName()}.${javaFile.typeSpec().name()} to $outDirectory",
         e,
       )
     }

diff --git a/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorHelper.kt b/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorHelper.kt
@@ -15,7 +15,7 @@
  */
 package com.squareup.wire.java
 
-import com.squareup.javapoet.JavaFile
+import com.palantir.javapoet.JavaFile
 import com.squareup.wire.schema.Location
 import com.squareup.wire.schema.Profile
 import com.squareup.wire.schema.Schema

diff --git a/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java b/wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java
@@ -19,8 +19,8 @@
 import static com.squareup.wire.schema.SchemaHelpersJvmKt.addFromTest;
 import static org.junit.Assert.fail;
 
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
+import com.palantir.javapoet.JavaFile;
+import com.palantir.javapoet.TypeSpec;
 import com.squareup.wire.SchemaBuilder;
 import com.squareup.wire.schema.MessageType;
 import com.squareup.wire.schema.PruningRules;

diff --git a/wire-java-generator/src/test/java/com/squareup/wire/java/JavaWithProfilesGenerator.kt b/wire-java-generator/src/test/java/com/squareup/wire/java/JavaWithProfilesGenerator.kt
@@ -15,7 +15,7 @@
  */
 package com.squareup.wire.java
 
-import com.squareup.javapoet.JavaFile
+import com.palantir.javapoet.JavaFile
 import com.squareup.wire.schema.Location
 import com.squareup.wire.schema.Profile
 import com.squareup.wire.schema.Schema

diff --git a/wire-schema/src/jvmMain/kotlin/com/squareup/wire/schema/AdapterConstant.kt b/wire-schema/src/jvmMain/kotlin/com/squareup/wire/schema/AdapterConstant.kt
@@ -15,7 +15,7 @@
  */
 package com.squareup.wire.schema
 
-import com.squareup.javapoet.ClassName
+import com.palantir.javapoet.ClassName
 import com.squareup.kotlinpoet.ClassName as KClassName
 
 /**

diff --git a/wire-schema/src/jvmMain/kotlin/com/squareup/wire/schema/Profile.kt b/wire-schema/src/jvmMain/kotlin/com/squareup/wire/schema/Profile.kt
@@ -15,8 +15,8 @@
  */
 package com.squareup.wire.schema
 
-import com.squareup.javapoet.ClassName
-import com.squareup.javapoet.TypeName
+import com.palantir.javapoet.ClassName
+import com.palantir.javapoet.TypeName
 import com.squareup.kotlinpoet.ClassName as KClassName
 import com.squareup.kotlinpoet.TypeName as KTypeName
 import com.squareup.wire.schema.internal.ProfileFileElement

diff --git a/wire-schema/src/jvmTest/kotlin/com/squareup/wire/schema/ProfileLoaderTest.kt b/wire-schema/src/jvmTest/kotlin/com/squareup/wire/schema/ProfileLoaderTest.kt
@@ -19,7 +19,7 @@ import assertk.assertThat
 import assertk.assertions.hasMessage
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
-import com.squareup.javapoet.ClassName
+import com.palantir.javapoet.ClassName
 import com.squareup.wire.testing.add
 import com.squareup.wire.testing.addZip
 import java.io.IOException