Add builder-construction for AvroMapper

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroMapper.java

@@ -7,10 +7,13 @@
 import org.apache.avro.Schema;
 
 import com.fasterxml.jackson.core.Version;
+
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.cfg.MapperBuilder;
+import com.fasterxml.jackson.dataformat.avro.AvroMapper.Builder;
 import com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaGenerator;
 
 /**
@@ -22,7 +25,77 @@
  */
 public class AvroMapper extends ObjectMapper
 {
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
+
+    /**
+     * Base implementation for "Vanilla" {@link ObjectMapper}, used with
+     * Avro backend.
+     *
+     * @since 2.10
+     */
+    public static class Builder extends MapperBuilder<AvroMapper, Builder>
+    {
+        protected final AvroFactory _streamFactory; // since 2.10
+
+        public Builder(AvroMapper m) {
+            super(m);
+            _streamFactory = m.getFactory();
+        }
+
+        /*
+        /******************************************************************
+        /* Format features
+        /******************************************************************
+         */
+
+        public Builder enable(AvroParser.Feature... features) {
+            for (AvroParser.Feature f : features) {
+                _streamFactory.enable(f);
+            }
+            return this;
+        }
+
+        public Builder disable(AvroParser.Feature... features) {
+            for (AvroParser.Feature f : features) {
+                _streamFactory.disable(f);
+            }
+            return this;
+        }
+
+        public Builder configure(AvroParser.Feature f, boolean state)
+        {
+            if (state) {
+                _streamFactory.enable(f);
+            } else {
+                _streamFactory.disable(f);
+            }
+            return this;
+        }
+
+        public Builder enable(AvroGenerator.Feature... features) {
+            for (AvroGenerator.Feature f : features) {
+                _streamFactory.enable(f);
+            }
+            return this;
+        }
+
+        public Builder disable(AvroGenerator.Feature... features) {
+            for (AvroGenerator.Feature f : features) {
+                _streamFactory.disable(f);
+            }
+            return this;
+        }
+
+        public Builder configure(AvroGenerator.Feature f, boolean state)
+        {
+            if (state) {
+                _streamFactory.enable(f);
+            } else {
+                _streamFactory.disable(f);
+            }
+            return this;
+        }
+    }
 
     /**
      * Constructor that will construct mapper with standard {@link AvroFactory}
@@ -65,6 +138,25 @@ protected AvroMapper(ObjectMapper src) {
         super(src);
     }
 
+    /**
+     * @since 2.10
+     */
+    public static AvroMapper.Builder xmlBuilder() {
+        return new AvroMapper.Builder(new AvroMapper());
+    }
+
+    /**
+     * @since 2.10
+     */
+    @SuppressWarnings("unchecked")
+    public static AvroMapper.Builder builder() {
+        return new AvroMapper.Builder(new AvroMapper());
+    }
+
+    public static Builder builder(AvroFactory streamFactory) {
+        return new AvroMapper.Builder(new AvroMapper(streamFactory));
+    }
+
     @Override
     public AvroMapper copy()
     {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/AvroTestBase.java

@@ -290,7 +290,7 @@ protected AvroMapper getMapper() {
     }
 
     protected AvroMapper newMapper() {
-        return new AvroMapper();
+        return AvroMapper.builder().build();
     }
 
     protected byte[] toAvro(Employee empl) throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/BigDecimalTest.java

@@ -20,7 +20,7 @@ public NamedAmount(@JsonProperty("name") String name,
     }
 
     public void testSerializeBigDecimal() throws Exception {
-        AvroMapper mapper = new AvroMapper();
+        AvroMapper mapper = newMapper();
         AvroSchema schema = mapper.schemaFor(NamedAmount.class);
 
         byte[] bytes = mapper.writer(schema)

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/BinaryDataTest.java

@@ -26,8 +26,8 @@ public FilePojo(String text) throws IOException {
         public long size;
     }
 
-    private final AvroMapper AVRO_JACKSON_MAPPER =  new AvroMapper(new AvroFactory());
-    private final AvroMapper AVRO_APACHE_MAPPER =  new AvroMapper(new ApacheAvroFactory());
+    private final AvroMapper AVRO_JACKSON_MAPPER =  AvroMapper.builder(new AvroFactory()).build();
+    private final AvroMapper AVRO_APACHE_MAPPER =  AvroMapper.builder(new ApacheAvroFactory()).build();
 
     public void testAvroSchemaGenerationWithJackson() throws Exception
     {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/EnumTest.java

@@ -21,7 +21,7 @@ protected static class EmployeeStr {
         public String gender;
     }
 
-    private final AvroMapper MAPPER = new AvroMapper();
+    private final AvroMapper MAPPER = newMapper();
 
     public void testSimple() throws Exception
     {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/MapperConfigTest.java

@@ -80,10 +80,11 @@ public void testGeneratorDefaults() throws Exception
     // Test to verify that data format affects default state of order-props-alphabetically
     public void testDefaultSettingsWithObjectMapper()
     {
-        ObjectMapper mapper = new ObjectMapper(AVRO_F);
+        ObjectMapper mapper = AvroMapper.builder(AVRO_F).build();
         _testAvroMapperDefaults(mapper);
 
-        // and even with default mapper, may become so, if configred with AvroFactory
+        // and even with default mapper, may become so if configured with AvroFactory
+        // 26-Jun-2018, tatu: NOTE! 2.x only -- 3.x will not allow mix-n-matching
         ObjectMapper vanilla = new ObjectMapper();
         assertFalse(vanilla.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY));
         ObjectReader r = vanilla.reader();
@@ -95,7 +96,7 @@ public void testDefaultSettingsWithObjectMapper()
 
     public void testDefaultSettingsWithAvroMapper()
     {
-        AvroMapper mapper = new AvroMapper();
+        AvroMapper mapper = AvroMapper.builder().build();
         assertNotNull(mapper.version());
 
         _testAvroMapperDefaults(mapper);

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/NumberTest.java

@@ -37,8 +37,8 @@ public Numbers(int i0, long l0,
         }
     }
 
-    private final AvroMapper MAPPER = new AvroMapper();
-    
+    private final AvroMapper MAPPER = newMapper();
+
     // for [dataformat-avro#41]
     public void testNumberType() throws Exception
     {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/OptionalEnumTest.java

@@ -8,7 +8,7 @@ protected static class Employee {
         public Gender gender;
     }
 
-    private final AvroMapper MAPPER = new AvroMapper();
+    private final AvroMapper MAPPER = newMapper();
 
     // [dataformat-avro#12]
     public void testEnumViaGeneratedSchema() throws Exception

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/SerializeGeneratedTest.java

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.dataformat.avro;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
+
 import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 import com.fasterxml.jackson.dataformat.avro.gen.Event35;
 import com.fasterxml.jackson.dataformat.avro.gen.Event35Id;
@@ -15,7 +15,7 @@ public void testWriteGeneratedEvent() throws Exception
         event.setPlayerCount(100);
         Event35Id id = new Event35Id();
         id.setFirst(10);
-        ObjectMapper mapper = new AvroMapper();
+        ObjectMapper mapper = newMapper();
         byte[] bytes = mapper.writer(new AvroSchema(Event35.SCHEMA$)).writeValueAsBytes(event);
         assertNotNull(bytes);
     }