Backport #8 fix in 2.3.4 as well as it's easy, safe to do.

FasterXML · Jun 12, 2014 · 5e24f27 · 5e24f27
1 parent 4ae4bb6
commit 5e24f27
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -1,6 +1,8 @@
 Project: jackson-dataformat-avro
 Version: 2.3.4 (xx-xxx-2014)
 
+#8: Error in creating Avro Schema for `java.util.Date` (and related) type.
+
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/RecordVisitor.java b/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/RecordVisitor.java
@@ -104,12 +104,14 @@ protected Schema schemaForWriter(BeanProperty prop)
             BeanPropertyWriter bpw = (BeanPropertyWriter) prop;
             ser = bpw.getSerializer();
         }
+        final SerializerProvider prov = getProvider();
         if (ser == null) {
-            SerializerProvider prov = getProvider();
             if (prov == null) throw new Error();
             ser = prov.findValueSerializer(prop.getType(), prop);
         }
         VisitorFormatWrapperImpl visitor = new VisitorFormatWrapperImpl(_schemas);
+        // Fix #8:
+        visitor.setProvider(prov);
         ser.acceptJsonFormatVisitor(visitor, prop.getType());
         return visitor.getAvroSchema();
     }

diff --git a/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/TestSimpleGeneration.java b/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/TestSimpleGeneration.java
@@ -18,6 +18,10 @@ public static class RootType
 
     @SuppressWarnings("serial")
     public static class StringMap extends HashMap<String,String> { }
+
+    static class WithDate {
+        public Date date;
+    }
 
     /*
     /**********************************************************
@@ -92,4 +96,14 @@ public void testMap() throws Exception
 
 //        System.out.println("Map schema:\n"+json);
     }
+
+    // [Issue#8]
+    public void testWithDate() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper(new AvroFactory());
+        AvroSchemaGenerator gen = new AvroSchemaGenerator();
+        mapper.acceptJsonFormatVisitor(WithDate.class, gen);
+        AvroSchema schema = gen.getGeneratedSchema();
+        assertNotNull(schema);
+    }
 }