Fix ClassInitializationDeadlock error and bump gradle-baseline-java (#…

…7326)
palantir · Oct 9, 2024 · 16e7592 · 16e7592
1 parent ca25f3c
commit 16e7592
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TargetedSweepMetadata.java
@@ -69,14 +69,18 @@ void checkDefaultsForNonSweepableTransaction() {
         }
     }
 
-    public static final Hydrator<TargetedSweepMetadata> BYTES_HYDRATOR =
-            input -> ImmutableTargetedSweepMetadata.builder()
+    public static final Hydrator<TargetedSweepMetadata> BYTES_HYDRATOR = new Hydrator<TargetedSweepMetadata>() {
+        @Override
+        public TargetedSweepMetadata hydrateFromBytes(byte[] input) {
+            return ImmutableTargetedSweepMetadata.builder()
                     .conservative((input[0] & SWEEP_STRATEGY_MASK) != 0)
                     .dedicatedRow((input[0] & USE_DEDICATED_ROWS_MASK) != 0)
                     .shard((input[0] << 2 | (input[1] & BYTE_MASK) >> 6) & BYTE_MASK)
                     .dedicatedRowNumber(input[1] & DEDICATED_ROW_NUMBER_MASK)
                     .nonSweepableTransaction((input[2] & SWEEP_STRATEGY_MASK) != 0)
                     .build();
+        }
+    };
 
     @Override
     public byte[] persistToBytes() {

diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/api/StoredWriteReference.java
@@ -24,7 +24,12 @@
 
 @Immutable
 public interface StoredWriteReference extends Persistable {
-    Hydrator<StoredWriteReference> BYTES_HYDRATOR = ImmutableStoredWriteReference::of;
+    Hydrator<StoredWriteReference> BYTES_HYDRATOR = new Hydrator<StoredWriteReference>() {
+        @Override
+        public StoredWriteReference hydrateFromBytes(byte[] input) {
+            return ImmutableStoredWriteReference.of(input);
+        }
+    };
 
     default <T> T accept(Visitor<T> visitor) {
         byte[] data = data();

diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/sweep/queue/id/SweepTableIdentifier.java
@@ -24,18 +24,21 @@
 
 @Value.Immutable
 public interface SweepTableIdentifier extends Persistable {
-    Hydrator<SweepTableIdentifier> BYTES_HYDRATOR = input -> {
-        int identifier = Ints.checkedCast(EncodingUtils.decodeSignedVarLong(input));
-        if (identifier < 0) {
-            return ImmutableSweepTableIdentifier.builder()
-                    .isPending(true)
-                    .identifier(-identifier)
-                    .build();
-        } else {
-            return ImmutableSweepTableIdentifier.builder()
-                    .isPending(false)
-                    .identifier(identifier)
-                    .build();
+    Hydrator<SweepTableIdentifier> BYTES_HYDRATOR = new Hydrator<SweepTableIdentifier>() {
+        @Override
+        public SweepTableIdentifier hydrateFromBytes(byte[] input) {
+            int identifier = Ints.checkedCast(EncodingUtils.decodeSignedVarLong(input));
+            if (identifier < 0) {
+                return ImmutableSweepTableIdentifier.builder()
+                        .isPending(true)
+                        .identifier(-identifier)
+                        .build();
+            } else {
+                return ImmutableSweepTableIdentifier.builder()
+                        .isPending(false)
+                        .identifier(identifier)
+                        .build();
+            }
         }
     };
 

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.netflix.nebula:gradle-info-plugin:13.1.2'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:21.1.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:5.61.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.69.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.51.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.25.0'
         classpath 'com.palantir.gradle.docker:gradle-docker:0.35.0'

diff --git a/changelog/@unreleased/pr-7326.v2.yml b/changelog/@unreleased/pr-7326.v2.yml
@@ -0,0 +1,9 @@
+type: fix
+fix:
+  description: |-
+    - Bump for gradle-baseline-java
+    - Fixed the ClassInitializationDeadlock error caused by the gradle-baseline-java version bump. The fix uses an anonymous class interface, which will delay the instantiation until required, and therefore reducing the risk of a jvm loop leading to ClassInitializationDeadlock.
+
+    Excavator:  Upgrades Baseline to the latest version
+  links:
+  - https://github.com/palantir/atlasdb/pull/7326