forgot to run spotless

Author: ashley-taylor

lang/java/avro/src/main/java/org/apache/avro/generic/GenericDatumReader.java

@@ -22,6 +22,7 @@
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -504,38 +505,9 @@ protected Class findStringClass(Schema schema) {
     }
   }
 
-  /**
-   * This class is used to reproduce part of IdentityHashMap in ConcurrentHashMap
-   * code.
-   */
-  private static final class IdentitySchemaKey {
-    private final Schema schema;
-
-    private final int hashcode;
-
-    public IdentitySchemaKey(Schema schema) {
-      this.schema = schema;
-      this.hashcode = System.identityHashCode(schema);
-    }
-
-    @Override
-    public int hashCode() {
-      return this.hashcode;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      if (!(obj instanceof GenericDatumReader.IdentitySchemaKey)) {
-        return false;
-      }
-      IdentitySchemaKey key = (IdentitySchemaKey) obj;
-      return this == key || this.schema == key.schema;
-    }
-  }
-
   // VisibleForTesting
   static class ReaderCache {
-    private final Map<IdentitySchemaKey, Class> stringClassCache = new ConcurrentHashMap<>();
+    private volatile Map<Schema, Class> stringClassCache = new IdentityHashMap<>();
 
     private final Map<Class, Function<String, Object>> stringCtorCache = new ConcurrentHashMap<>();
 
@@ -569,8 +541,14 @@ private Function<String, Object> buildFunction(Class c) {
     }
 
     public Class getStringClass(final Schema s) {
-      final IdentitySchemaKey key = new IdentitySchemaKey(s);
-      return this.stringClassCache.computeIfAbsent(key, (IdentitySchemaKey k) -> this.findStringClass.apply(k.schema));
+      var type = stringClassCache.get(s);
+      if (type == null) {
+        type = this.findStringClass.apply(s);
+        var repalcement = new IdentityHashMap<>(stringClassCache);
+        repalcement.put(s, type);
+        stringClassCache = repalcement;
+      }
+      return type;
     }
   }
 

lang/java/avro/src/test/java/org/apache/avro/reflect/TestCustomEncoderSchemaChanges.java

@@ -33,28 +33,32 @@
 
 public class TestCustomEncoderSchemaChanges {
 
-  private static final Schema SCHEMA1 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false, Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.STRING), null, null)));
+  private static final Schema SCHEMA1 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
+      Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.STRING), null, null)));
 
-  private static final Schema SCHEMA2 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false, Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.STRING), null, null),
+  private static final Schema SCHEMA2 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
+      Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.STRING), null, null),
           new Schema.Field("v2", Schema.create(Schema.Type.STRING), null, null)));
 
-  private static final Schema SCHEMA3 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false,
+  private static final Schema SCHEMA3 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
       Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.STRING), null, null),
           new Schema.Field("v2", Schema.create(Schema.Type.STRING), null, null),
           new Schema.Field("v3", Schema.create(Schema.Type.STRING), null, null)));
 
-  private static final Schema SCHEMA_INT1 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false, Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.INT), null, null)));
+  private static final Schema SCHEMA_INT1 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
+      Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.INT), null, null)));
 
-  private static final Schema SCHEMA_INT2 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false, Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.INT), null, null),
+  private static final Schema SCHEMA_INT2 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
+      Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.INT), null, null),
           new Schema.Field("v2", Schema.create(Schema.Type.INT), null, null)));
 
-  private static final Schema SCHEMA_INT3 = Schema.createRecord("R1", null, "org.apache.avro.reflect.TestCustomEncoderSchemaChanges",
-      false,
+  private static final Schema SCHEMA_INT3 = Schema.createRecord("R1", null,
+      "org.apache.avro.reflect.TestCustomEncoderSchemaChanges", false,
       Arrays.asList(new Schema.Field("v1", Schema.create(Schema.Type.INT), null, null),
           new Schema.Field("v2", Schema.create(Schema.Type.INT), null, null),
           new Schema.Field("v3", Schema.create(Schema.Type.INT), null, null)));