Merge branch '2.19'

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/schema/AvroSchemaHelper.java

@@ -254,17 +254,23 @@ public static Schema parseJsonSchema(String json) {
      * Constructs a new enum schema
      *
      * @param values List of enum names
+     *
      * @return An {@link org.apache.avro.Schema.Type#ENUM ENUM} schema.
      */
     public static Schema createEnumSchema(MapperConfig<?> config, JavaType enumType,
             AnnotatedClass annotations, List<String> values) {
+        final AnnotationIntrospector intr = config.getAnnotationIntrospector();
+        Class<Enum<?>> rawEnumClass = (Class<Enum<?>>) enumType.getRawClass();
+        final Enum<?> defaultEnumValue = intr.findDefaultEnumValue(config, annotations,
+                rawEnumClass.getEnumConstants());
         final Schema avroSchema;
         try {
             avroSchema = Schema.createEnum(
                     getTypeName(enumType),
                     config.getAnnotationIntrospector().findClassDescription(config, annotations),
                     getNamespace(enumType, annotations),
-                    values);
+                    values,
+                    defaultEnumValue != null ? defaultEnumValue.toString() : null);
         } catch (SchemaParseException spe) {
             final String msg = String.format("Problem generating Avro `Schema` for Enum type %s: %s",
                     ClassUtil.getTypeDescription(enumType), spe.getMessage());

avro/src/test/java/tools/jackson/dataformat/avro/AvroTestBase.java

@@ -246,6 +246,7 @@ public Image(String uri, String title, int w, int h, Size s)
       public void setSize(Size s) { _size = s; }
     }
 
+    // public because needed by "AvroAliasTest"
     public enum Size { SMALL, LARGE; }
 
     /*

avro/src/test/java/tools/jackson/dataformat/avro/EnumTest.java

@@ -1,7 +1,18 @@
 package tools.jackson.dataformat.avro;
 
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Test;
 
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Type;
+
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import tools.jackson.dataformat.avro.schema.AvroSchemaGenerator;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
@@ -35,6 +46,19 @@ protected static class EmployeeStr {
         public String gender;
     }
 
+    protected enum ABC {
+        A,
+        B,
+        @JsonEnumDefaultValue
+        C; 
+    }
+
+    protected static class ABCDefaultClass {
+        public String name;
+        @JsonProperty(required = true)
+        public ABC abc;
+    }
+
     private final AvroMapper MAPPER = newMapper();
 
     @Test
@@ -127,4 +151,35 @@ public void test_avroSchemaWithString_fromStringValueToEnumValue() throws Except
         assertEquals(Gender.F, output.gender);
     }
 
+    // [dataformats-binary#388]: Default value for enums with class
+    @Test
+    public void testClassEnumWithDefault() throws Exception
+    {
+        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+
+        MAPPER.acceptJsonFormatVisitor(ABCDefaultClass.class, gen);
+        AvroSchema schema = gen.getGeneratedSchema();
+        assertNotNull(schema);
+
+        String json = schema.getAvroSchema().toString(true);
+        assertNotNull(json);
+
+        // And read it back too just for fun
+        AvroSchema s2 = MAPPER.schemaFrom(json);
+        assertNotNull(s2);
+
+        Schema avroSchema = s2.getAvroSchema();
+
+        // String name, int value
+        assertEquals(Type.RECORD, avroSchema.getType());
+        Schema.Field f = avroSchema.getField("abc");
+        assertNotNull(f);
+        assertEquals("abc", f.name());
+
+        assertEquals(Type.ENUM, f.schema().getType());
+        assertEquals(ABC.C.toString(), f.schema().getEnumDefault());
+        assertEquals(Stream.of(ABC.values())
+                               .map(ABC::name)
+                               .collect(Collectors.toList()), f.schema().getEnumSymbols());
+    }   
 }

release-notes/VERSION-2.x

@@ -21,6 +21,9 @@ Active maintainers:
 #308: (avro) Incorrect serialization for `LogicalType.Decimal` (Java `BigDecimal`)
  (reported by Idan S)
  (fix contributed by Michal F)
+#388: (avro) `@JsonEnumDefaultValue` not supported when using AvroMapper
+  to generate schema from Java class
+ (requested by @Sonic-Rage)
 #422: Avro generation failed with enums containing values with special characters
  (reported by @pfr-enedis)
 #535: (avro) AvroSchemaGenerator: logicalType(s) never set for non-date classes