Merge branch '2.x' into 3.x

Author: cowtowncoder

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

@@ -67,11 +67,9 @@ public class RecordVisitor
      */
     private final Schema _typeSchema;
 
-    // !!! 19-May-2025: TODO: make final in 2.20
-    protected Schema _avroSchema;
+    protected final Schema _avroSchema;
 
-    // !!! 19-May-2025: TODO: make final in 2.20
-    protected List<Schema.Field> _fields = new ArrayList<>();
+    protected final List<Schema.Field> _fields = new ArrayList<>();
 
     public RecordVisitor(SerializationContext ctxt, JavaType type,
             VisitorFormatWrapperImpl visitorWrapper)
@@ -100,12 +98,11 @@ public RecordVisitor(SerializationContext ctxt, JavaType type,
             _typeSchema = null;
         } else {
             // If Avro schema for this _type results in UNION I want to know Avro type where to assign fields
-            _avroSchema = AvroSchemaHelper.initializeRecordSchema(ctxt.getConfig(), _type, annotations);
-            _typeSchema = _avroSchema;
+            _typeSchema = AvroSchemaHelper.initializeRecordSchema(ctxt.getConfig(), _type, annotations);
             _overridden = false;
             AvroMeta meta = annotations.getAnnotation(AvroMeta.class);
             if (meta != null) {
-                _avroSchema.addProp(meta.key(), meta.value());
+                _typeSchema.addProp(meta.key(), meta.value());
             }
 
             List<NamedType> subTypes = intr.findSubtypes(config, annotations);
@@ -144,6 +141,8 @@ public RecordVisitor(SerializationContext ctxt, JavaType type,
                     }
                 }
                 _avroSchema = Schema.createUnion(new ArrayList<>(unionSchemas));
+            } else {
+                _avroSchema = _typeSchema;
             }
         }
         _visitorWrapper.getSchemas().addSchema(type, _avroSchema);

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

@@ -42,8 +42,6 @@ public void testSchemaCreation_withLogicalTypesDisabled_onBigDecimalWithAvroDeci
         // because logical types are disabled by default.
         final Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-        //System.out.println(BigDecimalWithAvroDecimalAnnotationWrapper.class.getSimpleName() + " schema:" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getField("bigDecimalValue")).isNotNull();
         Schema bigDecimalValue = actualSchema.getField("bigDecimalValue").schema();
@@ -64,8 +62,6 @@ public void testSchemaCreation_withLogicalTypesEnabled_onBigDecimalWithAvroDecim
         MAPPER.acceptJsonFormatVisitor(BigDecimalWithAvroDecimalAnnotationWrapper.class, gen);
         final Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-        //System.out.println(BigDecimalWithAvroDecimalAnnotationWrapper.class.getSimpleName() + " schema:" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getField("bigDecimalValue")).isNotNull();
         Schema bigDecimalValue = actualSchema.getField("bigDecimalValue").schema();
@@ -97,8 +93,6 @@ public void testSchemaCreation_withLogicalTypesEnabled_onBigDecimalWithAvroDecim
         MAPPER.acceptJsonFormatVisitor(BigDecimalWithAvroDecimalAnnotationToFixedWrapper.class, gen);
         final Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-        //System.out.println(BigDecimalWithAvroDecimalAnnotationToFixedWrapper.class.getSimpleName() + " schema:" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getField("bigDecimalValue")).isNotNull();
 

avro/src/test/java/tools/jackson/dataformat/avro/jsr310/AvroJavaTimeModule_schemaCreationTest.java

@@ -46,8 +46,6 @@ public void testSchemaCreation(Class<?> testClass,
         mapper.acceptJsonFormatVisitor(testClass, gen);
         Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-//        System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(expectedType);
         assertThat(actualSchema.getProp(LogicalType.LOGICAL_TYPE_PROP)).isEqualTo(expectedLogicalType);

avro/src/test/java/tools/jackson/dataformat/avro/schema/DateTimeVisitor_builtAvroSchemaTest.java

@@ -68,8 +68,6 @@ public void builtAvroSchemaTest(Class<?> testClass,
         // WHEN
         Schema actualSchema = dateTimeVisitor.builtAvroSchema();
 
-//        System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(expectedAvroType);
         assertThat(actualSchema.getProp(LogicalType.LOGICAL_TYPE_PROP)).isEqualTo(expectedLogicalType);

avro/src/test/java/tools/jackson/dataformat/avro/schema/Enum_schemaCreationTest.java

@@ -26,8 +26,6 @@ public void testJavaEnumToAvroEnum_test() throws Exception {
         MAPPER.acceptJsonFormatVisitor(NumbersEnum.class , gen);
         Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-        //System.out.println("schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo( Schema.Type.ENUM);
         assertThat(actualSchema.getEnumSymbols()).containsExactlyInAnyOrder("ONE", "TWO", "THREE");
@@ -43,8 +41,6 @@ public void testJavaEnumToAvroString_test() throws Exception {
         MAPPER.acceptJsonFormatVisitor(NumbersEnum.class , gen);
         Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
 
-        //System.out.println("schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo( Schema.Type.STRING);
 

avro/src/test/java/tools/jackson/dataformat/avro/schema/PolymorphicTypeAnnotationsTest.java

@@ -45,8 +45,6 @@ public void subclasses_of_interface_test() throws Exception {
         // WHEN
         Schema actualSchema = MAPPER.schemaFor(AnimalInterface.class).getAvroSchema();
 
-        // System.out.println("Animal schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(Schema.Type.UNION);
         // Because AnimalInterface is interface and AbstractMammal is abstract, they are not expected to be among types in union
@@ -82,8 +80,6 @@ public void jsonSubTypes_on_concrete_class_test() throws Exception {
         // WHEN
         Schema actualSchema = MAPPER.schemaFor(Fruit.class).getAvroSchema();
 
-        // System.out.println("Fruit schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(Schema.Type.UNION);
         assertThat(actualSchema.getTypes()).containsExactlyInAnyOrder(fruitItselfSchema, appleSchema, pearSchema);
@@ -142,8 +138,6 @@ public void jsonSubTypes_of_jsonSubTypes_test() throws Exception {
         // WHEN
         Schema actualSchema = MAPPER.schemaFor(Vehicle.class).getAvroSchema();
 
-        // System.out.println("Vehicle schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(Schema.Type.UNION);
         assertThat(actualSchema.getTypes()).containsExactlyInAnyOrder(
@@ -187,8 +181,6 @@ public void class_is_referenced_twice_in_hierarchy_test() throws Exception {
         // WHEN
         Schema actualSchema = MAPPER.schemaFor(ElementInterface.class).getAvroSchema();
 
-        // System.out.println("ElementInterface schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(Schema.Type.UNION);
         // ElementInterface and AbstractGas are not concrete classes they are not expected to be among types in union
@@ -223,8 +215,6 @@ public void base_class_explicitly_in_JsonSubTypes_annotation_test() throws Excep
         // WHEN
         Schema actualSchema = MAPPER.schemaFor(Image.class).getAvroSchema();
 
-        // System.out.println("Image schema:\n" + actualSchema.toString(true));
-
         // THEN
         assertThat(actualSchema.getType()).isEqualTo(Schema.Type.UNION);
         assertThat(actualSchema.getTypes()).containsExactlyInAnyOrder(imageItselfSchema, jpegSchema, pngSchema);

release-notes/VERSION-2.x

@@ -28,7 +28,7 @@ Active maintainers:
 - Fixes wrt [core#1438] (ParserBase.close() not resetting current token)
 - Generate SBOMs [JSTEP-14]
 
-2.19.1 (not yet released)
+2.19.1 (13-Jun-2025)
 
 #589: AvroSchema: Does not include base class for records with subclasses
  (reported by Rafael W)