...

Author: cowtowncoder

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

@@ -74,13 +74,15 @@ public AvroFactory() {
         super(new AvroFactoryBuilder(), false);
         _avroParserFeatures = DEFAULT_AVRO_PARSER_FEATURE_FLAGS;
         _avroGeneratorFeatures = DEFAULT_AVRO_GENERATOR_FEATURE_FLAGS;
+        _useApacheLibDecoder = false;
     }
 
     public AvroFactory(ObjectCodec oc)
     {
         super(oc);
         _avroParserFeatures = DEFAULT_AVRO_PARSER_FEATURE_FLAGS;
         _avroGeneratorFeatures = DEFAULT_AVRO_GENERATOR_FEATURE_FLAGS;
+        _useApacheLibDecoder = false;
 
         /* 04-Mar-2013, tatu: Content auto-closing is unfortunately a feature
          *    that works poorly with Avro error reporting, and generally
@@ -96,6 +98,7 @@ protected AvroFactory(AvroFactory src, ObjectCodec oc)
         super(src, oc);
         _avroParserFeatures = src._avroParserFeatures;
         _avroGeneratorFeatures = src._avroGeneratorFeatures;
+        _useApacheLibDecoder = src._useApacheLibDecoder;
     }
 
     /**

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

@@ -7,29 +7,31 @@
 import org.apache.avro.io.DatumReader;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheAvroFactory;
 
 // for [dataformats-binary#15]
 public class FileFormatTest extends AvroTestBase
 {
     public void testFileFormatOutput() throws Exception
     {
-        _testFileFormatOutput(new AvroFactory());
-        _testFileFormatOutput(new ApacheAvroFactory());
+        _testFileFormatOutput(true);
+        _testFileFormatOutput(false);
     }
 
-    private void _testFileFormatOutput(AvroFactory af) throws Exception
+    private void _testFileFormatOutput(boolean useApacheImpl) throws Exception
     {
         Employee empl = new Employee();
         empl.name = "Bobbee";
         empl.age = 39;
         empl.emails = new String[] { "[email protected]", "[email protected]" };
         empl.boss = null;
 
+        AvroFactory af = (useApacheImpl
+                ? AvroFactory.builderWithApacheDecoder()
+                : AvroFactory.builderWithNativeDecoder())
+                .enable(AvroGenerator.Feature.AVRO_FILE_OUTPUT)
+                .build();
         ObjectMapper mapper = new ObjectMapper(af);
 
-        af.enable(AvroGenerator.Feature.AVRO_FILE_OUTPUT);
-
         AvroSchema schema = getEmployeeSchema();
         byte[] bytes = mapper.writer(schema).writeValueAsBytes(empl);
 

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

@@ -33,7 +33,12 @@ public void testParserDefaults() throws Exception
     {
         AvroParser p = AVRO_F.createParser(new byte[0]);
         assertTrue(p.isEnabled(AvroParser.Feature.AVRO_BUFFERING));
-        p.disable(AvroParser.Feature.AVRO_BUFFERING);
+        p.close();
+
+        AvroFactory f = AvroFactory.builder()
+                .disable(AvroParser.Feature.AVRO_BUFFERING)
+                .build();
+        p = f.createParser(new byte[0]);
         assertFalse(p.isEnabled(AvroParser.Feature.AVRO_BUFFERING));
         try {
             p.setSchema(BOGUS_SCHEMA);
@@ -49,7 +54,12 @@ public void testGeneratorDefaults() throws Exception
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         AvroGenerator g = AVRO_F.createGenerator(bytes);
         assertTrue(g.isEnabled(AvroGenerator.Feature.AVRO_BUFFERING));
-        g.disable(AvroGenerator.Feature.AVRO_BUFFERING);
+        g.close();
+
+        AvroFactory f = AvroFactory.builder()
+                .disable(AvroGenerator.Feature.AVRO_BUFFERING)
+                .build();
+        g = f.createGenerator(bytes);
         assertFalse(g.isEnabled(AvroGenerator.Feature.AVRO_BUFFERING));
 
         try {
@@ -59,8 +69,6 @@ public void testGeneratorDefaults() throws Exception
             ; // finel
         }
         g.close();
-
-        
     }
 
     /*