Improve error handling for #98

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/VisitorFormatWrapperImpl.java

@@ -2,8 +2,12 @@
 
 import org.apache.avro.Schema;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.*;
 import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 
@@ -164,9 +168,10 @@ public JsonNullFormatVisitor expectNullFormat(JavaType convertedType) {
     }
 
     @Override
-    public JsonAnyFormatVisitor expectAnyFormat(JavaType convertedType) {
+    public JsonAnyFormatVisitor expectAnyFormat(JavaType convertedType) throws JsonMappingException {
         // could theoretically create union of all possible types but...
-        return _throwUnsupported("'Any' type not supported: expectAnyFormat called with type "+convertedType);
+        final String msg = "\"Any\" type (usually for `java.lang.Object`) not supported: `expectAnyFormat` called with type "+convertedType;
+        throw InvalidDefinitionException.from((JsonGenerator) null, msg, convertedType);
     }
 
     /*

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/TestSimpleGeneration.java

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonValue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.dataformat.avro.*;
 
 import org.apache.avro.Schema;
@@ -57,20 +58,21 @@ public ByteBuffer getBytes() {
     /* Tests
     /**********************************************************
      */
-    
+
+    private final AvroMapper MAPPER = newMapper();
+
     public void testBasic() throws Exception
     {
-        AvroMapper mapper = getMapper();
         AvroSchemaGenerator gen = new AvroSchemaGenerator();
-        mapper.acceptJsonFormatVisitor(RootType.class, gen);
+        MAPPER.acceptJsonFormatVisitor(RootType.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);
+        AvroSchema s2 = MAPPER.schemaFrom(json);
         assertNotNull(s2);
 
 //        System.out.println("Basic schema:\n"+json);
@@ -88,15 +90,14 @@ public void testBasic() throws Exception
 
     public void testEmployee() throws Exception
     {
-        AvroMapper mapper = getMapper();
         AvroSchemaGenerator gen = new AvroSchemaGenerator();
-        mapper.acceptJsonFormatVisitor(Employee.class, gen);
+        MAPPER.acceptJsonFormatVisitor(Employee.class, gen);
         AvroSchema schema = gen.getGeneratedSchema();
         assertNotNull(schema);
 
         String json = schema.getAvroSchema().toString(true);        
         assertNotNull(json);
-        AvroSchema s2 = mapper.schemaFrom(json);
+        AvroSchema s2 = MAPPER.schemaFrom(json);
         assertNotNull(s2);
 
         Employee empl = new Employee();
@@ -106,7 +107,7 @@ public void testEmployee() throws Exception
         empl.boss = null;
 
         // So far so good: try producing actual Avro data...
-        byte[] bytes = mapper.writer(schema).writeValueAsBytes(empl);
+        byte[] bytes = MAPPER.writer(schema).writeValueAsBytes(empl);
         assertNotNull(bytes);
 
         // and bring it back, too
@@ -120,15 +121,14 @@ public void testEmployee() throws Exception
 
     public void testMap() throws Exception
     {
-        AvroMapper mapper = getMapper();
         AvroSchemaGenerator gen = new AvroSchemaGenerator();
-        mapper.acceptJsonFormatVisitor(StringMap.class, gen);
+        MAPPER.acceptJsonFormatVisitor(StringMap.class, gen);
         AvroSchema schema = gen.getGeneratedSchema();
         assertNotNull(schema);
 
         String json = schema.getAvroSchema().toString(true);
         assertNotNull(json);
-        AvroSchema s2 = mapper.schemaFrom(json);
+        AvroSchema s2 = MAPPER.schemaFrom(json);
         assertNotNull(s2);
 
         // should probably verify, maybe... ?
@@ -139,18 +139,16 @@ public void testMap() throws Exception
     // [Issue#8]
     public void testWithDate() throws Exception
     {
-        ObjectMapper mapper = new ObjectMapper(new AvroFactory());
         AvroSchemaGenerator gen = new AvroSchemaGenerator();
-        mapper.acceptJsonFormatVisitor(WithDate.class, gen);
+        MAPPER.acceptJsonFormatVisitor(WithDate.class, gen);
         AvroSchema schema = gen.getGeneratedSchema();
         assertNotNull(schema);
     }
 
     public void testFixed() throws Exception
     {
         AvroSchemaGenerator gen = new AvroSchemaGenerator();
-        ObjectMapper mapper = new ObjectMapper(new AvroFactory());
-        mapper.acceptJsonFormatVisitor(WithFixedField.class, gen);
+        MAPPER.acceptJsonFormatVisitor(WithFixedField.class, gen);
         Schema generated = gen.getAvroSchema();
         Schema fixedFieldSchema = generated.getField("fixedField").schema();
         assertEquals(Schema.Type.FIXED, fixedFieldSchema.getType());
@@ -160,4 +158,18 @@ public void testFixed() throws Exception
         assertEquals(Schema.Type.FIXED, wrappedFieldSchema.getType());
         assertEquals(8, wrappedFieldSchema.getFixedSize());
     }
+
+    // as per [dataformats-binary#98], no can do (unless we start supporting polymorphic
+    // handling or something...)
+    public void testSchemaForUntypedMap() throws Exception
+    {
+        try {
+            MAPPER.schemaFor(Map.class);
+            fail("Not expected to work yet");
+        } catch (InvalidDefinitionException e) {
+            verifyException(e, "\"Any\" type");
+            verifyException(e, "not supported");
+            verifyException(e, "`java.lang.Object`");
+        }
+    }
 }

release-notes/VERSION

@@ -29,6 +29,8 @@ Modules:
 #69 (avro): Add support for `@AvroEncode` annotation
 #79 (proto): Fix wire type for packed arrays
 #95: Add new method, `withUnsafeReaderSchema` in `AvroSchema` to allow avoiding verification exception
+#98: [Avro] AvroMapper with Map throwing UnsupportedOperationException
+ (reported by coder-hub@github)
 - [avro] Upgrade `avro-core` dep from 1.7.7 to 1.8.1
 
 2.8.9.1 (not yet released)