Add release notes wrt #219, minor reorg

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroReaderFactory.java

@@ -66,19 +66,19 @@ public ScalarDecoder createScalarValueDecoder(Schema type)
         case FLOAT:
             return READER_FLOAT;
         case INT:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new IntReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new IntReader(typeId) : READER_INT;
             }
-            return READER_INT;
         case LONG:
             return READER_LONG;
         case NULL:
             return READER_NULL;
         case STRING:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new StringReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new StringReader(typeId) : READER_STRING;
             }
-            return READER_STRING;
         case UNION:
             /* Union is a "scalar union" if all the alternative types
              * are scalar. One common type is that of "nullable" one,

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/AvroSchemaHelper.java

@@ -25,8 +25,6 @@
 
 public abstract class AvroSchemaHelper
 {
-    private static final LRUMap<String, String> SCHEMA_NAME_CACHE = new LRUMap<>(16, 1024);
-
     /**
      * Dedicated mapper for handling default values (String &lt;-&gt; JsonNode &lt;-&gt; Object)
      *
@@ -334,46 +332,47 @@ public static String getTypeId(Schema schema) {
      * </p>
      */
     public static String getFullName(Schema schema) {
-        switch (schema.getType()) {
-            case RECORD:
-            case ENUM:
-            case FIXED:
-                String namespace = schema.getNamespace();
-                String name = schema.getName();
-                String key = namespace + "." + name;
-                String schemaName = SCHEMA_NAME_CACHE.get(key);
-
-                if (schemaName == null) {
-                    schemaName = resolveFullName(schema);
-                    SCHEMA_NAME_CACHE.put(key, schemaName);
-                }
-
-                return schemaName;
-
-            default:
-                return schema.getType().getName();
-        }
-    }
+        final Schema.Type type = schema.getType();
+        switch (type) {
+        case RECORD:
+        case ENUM:
+        case FIXED:
+            final String namespace = schema.getNamespace();
+            final String name = schema.getName();
 
-    private static String resolveFullName(Schema schema) {
-        String namespace = schema.getNamespace();
-        String name = schema.getName();
+            // Handle (presumed) common case
+            if (namespace == null) {
+                return name;
+            }
+            final int len = namespace.length();
+            if (namespace.charAt(len-1) == '$') {
+                return namespace + name;
+            }
+            return _findFullName(namespace, name);
 
-        if (namespace == null) {
-            return schema.getName();
+        default:
+            return type.getName();
         }
+    }
 
-        if (namespace.endsWith("$")) {
-            return namespace + name;
-        }
+    private static String _findFullName(final String namespace, final String name) {
+        final String cacheKey = namespace + "." + name;
+        String schemaName = SCHEMA_NAME_CACHE.get(cacheKey);
 
+        if (schemaName == null) {
+            schemaName = _resolveFullName(namespace, name);
+            SCHEMA_NAME_CACHE.put(cacheKey, schemaName);
+        }
+        return schemaName;
+    }
+        
+    private static String _resolveFullName(final String namespace, final String name) {
         StringBuilder sb = new StringBuilder(1 + namespace.length() + name.length());
 
         // 28-Feb-2020: [dataformats-binary#195] somewhat complicated logic of trying
         //     to support differences between avro-lib 1.8 and 1.9...
         //     Check if this is a nested class
-        String nestedClassName = sb.append(namespace).append('$').append(name).toString();
-
+        final String nestedClassName = sb.append(namespace).append('$').append(name).toString();
         try {
             Class.forName(nestedClassName);
 
@@ -438,4 +437,7 @@ public static JsonNode parseDefaultValue(String defaultValue) throws JsonMapping
             throw new JsonMappingException(null, "Failed to parse default value", e);
         }
     }
+
+    // @since 2.11.3
+    private static final LRUMap<String, String> SCHEMA_NAME_CACHE = new LRUMap<>(80, 800);
 }

release-notes/CREDITS-2.x

@@ -108,6 +108,8 @@ Marcos Passos (marcospassos@github)
  (2.10.5)
 * Contributed fix for #216: (avro) Avro null deserialization
  (2.11.2)
+* Contributed #219: Cache record names to avoid hitting class loader
+ (2.11.3)
 
 John (iziamos@github)
 * Reported, suggested fix for #178: Fix issue wit input offsets when parsing CBOR from `InputStream`

release-notes/VERSION-2.x

@@ -8,6 +8,11 @@ Project: jackson-datatypes-binaryModules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.11.3 (not yet released)
+
+#219: Cache record names to avoid hitting class loader
+ (contributed by Marcos P)
+
 2.11.2 (02-Aug-2020)
 
 #216: (avro) Avro null deserialization