Merge branch '2.18'

FasterXML · Aug 24, 2024 · 7fd1937 · 7fd1937
2 parents 67f63bb + 7e3c869
commit 7fd1937
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 13 deletions.
diff --git a/avro/pom.xml b/avro/pom.xml
@@ -47,7 +47,7 @@ abstractions.
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.8.2</version>
+      <version>1.11.3</version>
     </dependency>
 
     <!-- and for testing we need logback -->

diff --git a/avro/src/main/java/tools/jackson/dataformat/avro/schema/AvroSchemaHelper.java b/avro/src/main/java/tools/jackson/dataformat/avro/schema/AvroSchemaHelper.java
@@ -101,7 +101,9 @@ protected static String getNamespace(Class<?> cls) {
         //   NOTE: was reverted in 2.8.8, but is enabled for Jackson 2.9.
         Class<?> enclosing = cls.getEnclosingClass();
         if (enclosing != null) {
-            return enclosing.getName() + "$";
+            // 23-Aug-2024: Changed as per [dataformats-binary#167] 
+            // Enclosing class may also be nested
+            return enclosing.getName().replace('$', '.');
         }
         Package pkg = cls.getPackage();
         return (pkg == null) ? "" : pkg.getName();
@@ -337,6 +339,8 @@ public static String getFullName(Schema schema) {
             if (namespace == null) {
                 return name;
             }
+            // 23-Aug-2024: [dataformats-binary#167] Still needed for backwards-compatibility
+            // with schemas that use dollar sign for nested classes (Apache Avro before 1.9)
             final int len = namespace.length();
             if (namespace.charAt(len-1) == '$') {
                 return namespace + name;
@@ -415,13 +419,25 @@ private static String _resolve(FullNameKey key) {
             //     Check if this is a nested class
             // 19-Sep-2020, tatu: This is a horrible, horribly inefficient and all-around
             //    wrong mechanism. To be abolished if possible.
-            final String nestedClassName = key.nameWithSeparator('$');
-            try {
-                Class.forName(nestedClassName);
-                return nestedClassName;
-            } catch (ClassNotFoundException e) {
-                // Could not find a nested class, must be a regular class
-                return key.nameWithSeparator('.');
+            // 23-Aug-2024:[dataformats-binary#167] Based on SpecificData::getClass
+            //   from Apache Avro. Initially assume that namespace is a Java package
+            StringBuilder sb = new StringBuilder(key.nameWithSeparator('.'));
+            int lastDot = sb.length();
+            while (true) {
+                try {
+                    // Try to resolve the class
+                    String className = sb.toString();
+                    Class.forName(className);
+                    return className;
+                } catch (ClassNotFoundException e) {
+                    // Class does not exist - perhaps last dot is actually a nested class
+                    lastDot = sb.lastIndexOf(".", lastDot);
+                    if (lastDot == -1) {
+                        // No more dots so we are unable to resolve, should we throw an exception?
+                        return key.nameWithSeparator('.');
+                    }
+                    sb.setCharAt(lastDot, '$');
+                }
             }
         }
     }

diff --git a/avro/src/test/java/tools/jackson/dataformat/avro/annotation/AvroNamespaceTest.java b/avro/src/test/java/tools/jackson/dataformat/avro/annotation/AvroNamespaceTest.java
@@ -23,6 +23,15 @@ enum EnumWithoutAvroNamespaceAnnotation {FOO, BAR;}
     @AvroNamespace("EnumWithAvroNamespaceAnnotation.namespace")
     enum EnumWithAvroNamespaceAnnotation {FOO, BAR;}
 
+    static class Foo {
+        static class Bar {
+            static class ClassWithMultipleNestingLevels {
+            }
+
+            enum EnumWithMultipleNestingLevels {FOO, BAR;}
+        }
+    }
+
     @Test
     public void class_without_AvroNamespace_test() throws Exception {
         // GIVEN
@@ -35,7 +44,7 @@ public void class_without_AvroNamespace_test() throws Exception {
 
         // THEN
         assertThat(actualSchema.getNamespace())
-                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest$");
+                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest");
     }
 
     @Test
@@ -53,6 +62,21 @@ public void class_with_AvroNamespace_test() throws Exception {
                 .isEqualTo("ClassWithAvroNamespaceAnnotation.namespace");
     }
 
+    @Test
+    public void class_with_multiple_nesting_levels_test() throws Exception {
+        // GIVEN
+        AvroMapper mapper = new AvroMapper();
+        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+
+        // WHEN
+        mapper.acceptJsonFormatVisitor(Foo.Bar.ClassWithMultipleNestingLevels.class, gen);
+        Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
+
+        // THEN
+        assertThat(actualSchema.getNamespace())
+                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest.Foo.Bar");
+    }
+
     @Test
     public void enum_without_AvroNamespace_test() throws Exception {
         // GIVEN
@@ -65,7 +89,7 @@ public void enum_without_AvroNamespace_test() throws Exception {
 
         // THEN
         assertThat(actualSchema.getNamespace())
-                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest$");
+                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest");
     }
 
     @Test
@@ -83,4 +107,18 @@ public void enum_with_AvroNamespace_test() throws Exception {
                 .isEqualTo("EnumWithAvroNamespaceAnnotation.namespace");
     }
 
+    @Test
+    public void enum_with_multiple_nesting_levels_test() throws Exception {
+        // GIVEN
+        AvroMapper mapper = new AvroMapper();
+        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+
+        // WHEN
+        mapper.acceptJsonFormatVisitor(Foo.Bar.EnumWithMultipleNestingLevels.class, gen);
+        Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
+
+        // THEN
+        assertThat(actualSchema.getNamespace())
+                .isEqualTo("tools.jackson.dataformat.avro.annotation.AvroNamespaceTest.Foo.Bar");
+    }
 }
diff --git a/avro/src/test/java/tools/jackson/dataformat/avro/interop/annotations/AvroAliasTest.java b/avro/src/test/java/tools/jackson/dataformat/avro/interop/annotations/AvroAliasTest.java
@@ -15,7 +15,7 @@
 
 public class AvroAliasTest extends InteropTestBase {
 
-    @AvroAlias(alias = "Employee", space = "tools.jackson.dataformat.avro.AvroTestBase$")
+    @AvroAlias(alias = "Employee", space = "tools.jackson.dataformat.avro.AvroTestBase")
     public static class NewEmployee {
 
         public String name;
@@ -40,7 +40,7 @@ public static class AliasedNameEmployee {
         public AliasedNameEmployee boss;
     }
 
-    @AvroAlias(alias = "Size", space = "tools.jackson.dataformat.avro.AvroTestBase$")
+    @AvroAlias(alias = "Size", space = "tools.jackson.dataformat.avro.AvroTestBase")
     public enum NewSize {
         SMALL,
         LARGE;

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -328,6 +328,10 @@ Yoann Vernageau (@yvrng)
    when source is an empty `InputStream`
   (2.17.1)
 
+Rafał Harabień (@rafalh)
+ * Contributed fix for #167: (avro) Incompatibility with Avro >=1.9.0 (upgrade to Avro 1.11.3)
+  (2.18.0)
+
 PJ Fanning (@pjfanning)
  * Contributed #484: (protobuf) Rework synchronization in `ProtobufMapper`
   (2.18.0)

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,6 +16,9 @@ Active maintainers:
 
 2.18.0 (not yet released)
 
+#167: (avro) Incompatibility with Avro >=1.9.0 (upgrade to Avro 1.11.3)
+ (reported by @Sage-Pierce)
+ (fix contributed by Rafał H)
 #484: (protobuf) Rework synchronization in `ProtobufMapper`
  (contributed by @pjfanning)
 #494: (avro) Avro Schema generation: allow mapping Java Enum properties to