fix: DH-20142: Revert "refactor: DH-20135: migrate javapoet (deephaven#7082)" (deephaven#7084)

cpwright · web-flow · commit 7d0dda1419f3 · 2025-08-13T16:37:19.000Z
This reverts commit df99399. This version of javapoet requires Java 17+; we require javapoet at runtime to generate the hashers for combinations of types that we don’t have pre-generated.
diff --git a/authorization-codegen/build.gradle b/authorization-codegen/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     implementation platform(libs.grpc.bom)
     implementation libs.grpc.services
 
-    implementation libs.javapoet
+    implementation libs.squareup.javapoet
 
     implementation libs.protobuf.java
 }
diff --git a/authorization-codegen/src/main/java/io/deephaven/auth/codegen/GenerateContextualAuthWiring.java b/authorization-codegen/src/main/java/io/deephaven/auth/codegen/GenerateContextualAuthWiring.java
@@ -5,12 +5,12 @@
 
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.compiler.PluginProtos;
-import com.palantir.javapoet.ClassName;
-import com.palantir.javapoet.FieldSpec;
-import com.palantir.javapoet.JavaFile;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterizedTypeName;
-import com.palantir.javapoet.TypeSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeSpec;
 import io.deephaven.auth.AuthContext;
 import io.deephaven.engine.table.Table;
 
diff --git a/authorization-codegen/src/main/java/io/deephaven/auth/codegen/GenerateServiceAuthWiring.java b/authorization-codegen/src/main/java/io/deephaven/auth/codegen/GenerateServiceAuthWiring.java
@@ -6,12 +6,12 @@
 import com.google.common.base.Strings;
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.compiler.PluginProtos;
-import com.palantir.javapoet.ClassName;
-import com.palantir.javapoet.FieldSpec;
-import com.palantir.javapoet.JavaFile;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterizedTypeName;
-import com.palantir.javapoet.TypeSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeSpec;
 import io.deephaven.auth.AuthContext;
 import io.grpc.ServerServiceDefinition;
 
diff --git a/authorization/README.md b/authorization/README.md
@@ -30,7 +30,7 @@ Here is a sample bash script to generate the provided authorizing wiring if you
 DEEPHAVEN_VERSION="$(./gradlew printVersion -q)"
 OUT_DIR=authorization/src/main/java/
 PROTO_DIR=proto/proto-backplane-grpc/src/main/proto/
-ROOT_DIR=$PROTO_DIR/deephaven_core/proto
+ROOT_DIR=$PROTO_DIR/deephaven/proto
 
 DEEPHAVEN_VERSION=${DEEPHAVEN_VERSION} PATH=authorization-codegen:$PATH protoc --service-auth-wiring_out=$OUT_DIR -I $PROTO_DIR    \
      $ROOT_DIR/application.proto                                        \
diff --git a/engine/table/build.gradle b/engine/table/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation libs.f4b6a3.uuid.creator
     // TODO(deephaven-core#3204): t-digest 3.3 appears to have higher errors than 3.2
     implementation libs.tdunning.t.digest
-    implementation libs.javapoet
+    implementation libs.squareup.javapoet
     implementation libs.classgraph
     implementation libs.dsi.fastutil
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/TypedAsOfJoinFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/TypedAsOfJoinFactory.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.engine.table.impl.asofjoin;
 
-import com.palantir.javapoet.CodeBlock;
+import com.squareup.javapoet.CodeBlock;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.impl.by.typed.HasherConfig;
 import io.deephaven.util.QueryConstants;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java
@@ -3,9 +3,9 @@
 //
 package io.deephaven.engine.table.impl.by.typed;
 
-import com.palantir.javapoet.CodeBlock;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterSpec;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
 import groovyjarjarantlr4.v4.runtime.misc.NotNull;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ChunkType;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java
@@ -3,8 +3,8 @@
 //
 package io.deephaven.engine.table.impl.by.typed;
 
-import com.palantir.javapoet.CodeBlock;
-import com.palantir.javapoet.MethodSpec;
+import com.squareup.javapoet.CodeBlock;
+import com.squareup.javapoet.MethodSpec;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.util.type.TypeUtils;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java
@@ -4,7 +4,7 @@
 package io.deephaven.engine.table.impl.by.typed;
 
 import com.google.common.io.BaseEncoding;
-import com.palantir.javapoet.*;
+import com.squareup.javapoet.*;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.api.NaturalJoinType;
 import io.deephaven.base.verify.Assert;
@@ -729,7 +729,7 @@ private static <T> MethodSpec createConstructor(HasherConfig<T> hasherConfig, Ch
             TypeSpec.Builder hasherBuilder) {
         CodeBlock.Builder constructorCodeBuilder = CodeBlock.builder();
         final String extraSuper = hasherConfig.extraConstructorParameters.isEmpty() ? ""
-                : ", " + hasherConfig.extraConstructorParameters.stream().map(ParameterSpec::name)
+                : ", " + hasherConfig.extraConstructorParameters.stream().map(spec -> spec.name)
                         .collect(Collectors.joining(", "));
 
         if (hasherConfig.includeOriginalSources) {
@@ -842,7 +842,8 @@ private static MethodSpec createRehashInternalFullMethod(HasherConfig<?> hasherC
         for (int ii = 0; ii < chunkTypes.length; ++ii) {
             builder.addStatement("destKeyArray$L[destinationTableLocation] = k$L", ii, ii);
         }
-        builder.addStatement("destState[destinationTableLocation] = originalStateArray[sourceBucket]");
+        builder.addStatement("destState[destinationTableLocation] = originalStateArray[sourceBucket]",
+                hasherConfig.mainStateName);
         if (!hasherConfig.alwaysMoveMain) {
             builder.beginControlFlow("if (sourceBucket != destinationTableLocation)");
         }
@@ -1011,7 +1012,7 @@ private static MethodSpec createMigrateFront(HasherConfig<?> hasherConfig) {
     private static @NotNull String getExtraMigrateParams(List<ParameterSpec> hasherConfig) {
         final String extraParamNames;
         if (!hasherConfig.isEmpty()) {
-            extraParamNames = ", " + hasherConfig.stream().map(ParameterSpec::name)
+            extraParamNames = ", " + hasherConfig.stream().map(ps -> ps.name)
                     .collect(Collectors.joining(", "));
         } else {
             extraParamNames = "";
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/TypedMultiJoinFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/TypedMultiJoinFactory.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.engine.table.impl.multijoin;
 
-import com.palantir.javapoet.CodeBlock;
+import com.squareup.javapoet.CodeBlock;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.engine.table.impl.by.typed.HasherConfig;
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.engine.table.impl.naturaljoin;
 
-import com.palantir.javapoet.CodeBlock;
+import com.squareup.javapoet.CodeBlock;
 import io.deephaven.api.NaturalJoinType;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.LongChunk;
@@ -273,7 +273,7 @@ public static void rightIncrementalAddFound(HasherConfig<?> hasherConfig, boolea
 
     public static void rightIncrementalModify(HasherConfig<?> hasherConfig, boolean alternate,
             CodeBlock.Builder builder) {
-        builder.addStatement("final long oldRightRow = rightRowKey.getUnsafe(tableLocation)");
+        builder.addStatement("final long oldRightRow = rightRowKey.getUnsafe(tableLocation)", RowSet.class);
         builder.addStatement(
                 "modifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(modifiedTrackerCookieSource.getUnsafe(tableLocation), tableLocation, oldRightRow, $T.FLAG_RIGHT_MODIFY_PROBE))",
                 NaturalJoinModifiedSlotTracker.class);
@@ -365,7 +365,7 @@ public static void incrementalRightFound(HasherConfig<?> hasherConfig, boolean a
         builder.addStatement("final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey)");
         builder.addStatement(
                 "rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition))");
-        builder.nextControlFlow("else");
+        builder.nextControlFlow("else", RowSet.class);
 
         builder.beginControlFlow("if (addOnly && joinType == NaturalJoinType.FIRST_MATCH) ");
         builder.addStatement("// nop, we already have the first match");
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/TypedUpdateByFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/TypedUpdateByFactory.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.engine.table.impl.updateby.hashing;
 
-import com.palantir.javapoet.CodeBlock;
+import com.squareup.javapoet.CodeBlock;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.Chunk;
 import io.deephaven.engine.rowset.RowSetFactory;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -75,7 +75,7 @@ rdblue = "0.1.1"
 selenium = "4.30.0"
 slf4j = "2.0.17"
 snappy = "1.1.10.8"
-javapoet = "0.7.0"
+squareup = "1.13.0"
 sslcontext = "9.1.0"
 tdunning = "3.3"
 trove = "3.0.3"
@@ -304,7 +304,7 @@ slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
 
 snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappy" }
 
-javapoet = { module = "com.palantir.javapoet:javapoet", version.ref = "javapoet" }
+squareup-javapoet = { module = "com.squareup:javapoet", version.ref = "squareup" }
 
 sslcontext-kickstart = { module = "io.github.hakky54:sslcontext-kickstart", version.ref = "sslcontext" }
 sslcontext-kickstart-jetty = { module = "io.github.hakky54:sslcontext-kickstart-for-jetty", version.ref = "sslcontext" }
diff --git a/replication/reflective/build.gradle b/replication/reflective/build.gradle
@@ -8,7 +8,7 @@ description 'Reflective Replicators: Source code generators and replicators with
 dependencies {
     implementation project(':replication-util')
     implementation project(':engine-table')
-    implementation libs.javapoet
+    implementation libs.squareup.javapoet
     implementation libs.trove
     implementation libs.commons.io
     implementation libs.commons.lang3
diff --git a/replication/reflective/src/main/java/io/deephaven/replicators/GenerateArrowColumnSourceTests.java b/replication/reflective/src/main/java/io/deephaven/replicators/GenerateArrowColumnSourceTests.java
@@ -3,16 +3,16 @@
 //
 package io.deephaven.replicators;
 
-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.JavaFile;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterizedTypeName;
-import com.palantir.javapoet.TypeName;
-import com.palantir.javapoet.TypeSpec;
+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.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
 
 import javax.lang.model.element.Modifier;
 import java.io.File;
diff --git a/replication/reflective/src/main/java/io/deephaven/replicators/GenerateArrowColumnSources.java b/replication/reflective/src/main/java/io/deephaven/replicators/GenerateArrowColumnSources.java
@@ -3,15 +3,15 @@
 //
 package io.deephaven.replicators;
 
-import com.palantir.javapoet.AnnotationSpec;
-import com.palantir.javapoet.ClassName;
-import com.palantir.javapoet.JavaFile;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterizedTypeName;
-import com.palantir.javapoet.TypeName;
-import com.palantir.javapoet.TypeSpec;
-import com.palantir.javapoet.TypeVariableName;
-import com.palantir.javapoet.WildcardTypeName;
+import com.squareup.javapoet.AnnotationSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterizedTypeName;
+import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.TypeVariableName;
+import com.squareup.javapoet.WildcardTypeName;
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.WritableDoubleChunk;
diff --git a/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java b/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java
@@ -3,11 +3,11 @@
 //
 package io.deephaven.replicators;
 
-import com.palantir.javapoet.ClassName;
-import com.palantir.javapoet.JavaFile;
-import com.palantir.javapoet.MethodSpec;
-import com.palantir.javapoet.ParameterSpec;
-import com.palantir.javapoet.TypeSpec;
+import com.squareup.javapoet.ClassName;
+import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.ParameterSpec;
+import com.squareup.javapoet.TypeSpec;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.impl.asofjoin.RightIncrementalAsOfJoinStateManagerTypedBase;
@@ -59,7 +59,7 @@ private static void generatePackage(Class<?> baseClass, boolean doDouble) throws
         }
 
         final String extraInit = hasherConfig.extraConstructorParameters.isEmpty() ? ""
-                : ", " + hasherConfig.extraConstructorParameters.stream().map(ParameterSpec::name)
+                : ", " + hasherConfig.extraConstructorParameters.stream().map(spec -> spec.name)
                         .collect(Collectors.joining(", "));
 
         final MethodSpec.Builder dispatchMethodBuilder = MethodSpec.methodBuilder("dispatch")
@@ -122,7 +122,7 @@ private static MethodSpec generateSingleDispatch(Class<?> baseClass,
                 "Invalid chunk type for typed hashers: ");
 
         final String extraInit = hasherConfig.extraConstructorParameters.isEmpty() ? ""
-                : ", " + hasherConfig.extraConstructorParameters.stream().map(ParameterSpec::name)
+                : ", " + hasherConfig.extraConstructorParameters.stream().map(spec -> spec.name)
                         .collect(Collectors.joining(", "));
 
         final ChunkType[] array = new ChunkType[1];
@@ -160,7 +160,7 @@ private static MethodSpec generateDoubleDispatch(Class<?> baseClass,
         addHasherParametersAndReturnType(doubleDispatchBuilder, baseClass, hasherConfig.extraConstructorParameters);
 
         final String extraInit = hasherConfig.extraConstructorParameters.isEmpty() ? ""
-                : ", " + hasherConfig.extraConstructorParameters.stream().map(spec -> spec.type() + " " + spec.name())
+                : ", " + hasherConfig.extraConstructorParameters.stream().map(spec -> spec.type + " " + spec.name)
                         .collect(Collectors.joining(", "));
 
         doubleDispatchBuilder.beginControlFlow("switch (chunkType0)");

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ dependencies {`
`13`	`13`	`implementation platform(libs.grpc.bom)`
`14`	`14`	`implementation libs.grpc.services`
`15`	`15`
`16`		`- implementation libs.javapoet`
	`16`	`+ implementation libs.squareup.javapoet`
`17`	`17`
`18`	`18`	`implementation libs.protobuf.java`
`19`	`19`	`}`