Merge branch '2.11' into 2.12

Author: cowtowncoder

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

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.schema;
 
+import com.fasterxml.jackson.databind.util.LRUMap;
 import java.io.File;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -332,33 +333,56 @@ public static String getTypeId(Schema schema) {
      * </p>
      */
     public static String getFullName(Schema schema) {
-        switch (schema.getType()) {
+        final Schema.Type type = schema.getType();
+        switch (type) {
         case RECORD:
         case ENUM:
         case FIXED:
-            String namespace = schema.getNamespace();
-            String name = schema.getName();
+            final String namespace = schema.getNamespace();
+            final String name = schema.getName();
+
+            // Handle (presumed) common case
             if (namespace == null) {
-                return schema.getName();
+                return name;
             }
-            if (namespace.endsWith("$")) {
+            final int len = namespace.length();
+            if (namespace.charAt(len-1) == '$') {
                 return namespace + 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();
-            try {
-                Class.forName(nestedClassName);
-                return nestedClassName;
-            } catch (ClassNotFoundException e) {
-                // Could not find a nested class, must be a regular class
-                sb.setLength(0);
-                return sb.append(namespace).append('.').append(name).toString();
-            }
-            default:
-            return schema.getType().getName();
+            return _findFullName(namespace, name);
+
+        default:
+            return type.getName();
+        }
+    }
+
+    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
+        final String nestedClassName = sb.append(namespace).append('$').append(name).toString();
+        try {
+            Class.forName(nestedClassName);
+
+            return nestedClassName;
+        } catch (ClassNotFoundException e) {
+            // Could not find a nested class, must be a regular class
+            sb.setLength(0);
+
+            return sb.append(namespace).append('.').append(name).toString();
         }
     }
 
@@ -414,4 +438,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

@@ -16,6 +16,11 @@ Project: jackson-datatypes-binaryModules:
  (contributed by Michael L)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
+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