Merge branch '2.8'

Author: cowtowncoder

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

@@ -79,15 +79,16 @@ public static boolean isStringable(AnnotatedClass type) {
 
     protected static String getNamespace(JavaType type) {
         Class<?> cls = type.getRawClass();
-        // 16-Feb-2017, tatu: Fixed as suggested by `baharclerode@github`
+        // 16-Feb-2017, tatu: Fixed as suggested by `baharclerode@github`;
+        //   NOTE: was revert in 2.8.8, but is enabled for Jackson 2.9.
         Class<?> enclosing = cls.getEnclosingClass();
         if (enclosing != null) {
             return enclosing.getName() + "$";
         }
         Package pkg = cls.getPackage();
         return (pkg == null) ? "" : pkg.getName();
     }
-    
+
     protected static String getName(JavaType type) {
         String name = type.getRawClass().getSimpleName();
         // Alas, some characters not accepted...
@@ -96,7 +97,7 @@ protected static String getName(JavaType type) {
         }
         return name;
     }
-    
+
     protected static Schema unionWithNull(Schema otherSchema)
     {
         List<Schema> schemas = new ArrayList<Schema>();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/ApacheAvroInteropUtil.java

@@ -92,8 +92,7 @@ public byte[] apply(Schema schema, Object originalObject) throws IOException {
         @SuppressWarnings({"unchecked", "SuspiciousMethodCalls", "rawtypes"})
         @Override
         protected Schema createSchema(Type type, Map<String, Schema> names) {
-        /*
-         * Note, we abuse the fact that we can stick whatever we want into "names" and it won't interfere as long as we don't use String
+        /* Note, we abuse the fact that we can stick whatever we want into "names" and it won't interfere as long as we don't use String
          * keys. To persist and look up type variable information, we watch for ParameterizedTypes, TypeVariables, and Classes with
          * generic superclasses to extract type variable information and store it in the map. This allows full type variable resolution
          * when building a schema from reflection data.

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/InteropTestBase.java

@@ -5,18 +5,45 @@
 import java.lang.reflect.Type;
 
 import org.apache.avro.Schema;
+import org.junit.Assume;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.*;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.apacheDeserializer;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.apacheSerializer;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonDeserializer;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.jacksonSerializer;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.getApacheSchema;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.getJacksonSchema;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.Function;
+import static com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil.BiFunction;
 
 /**
  * Parameterized base class for tests that populates {@link #schemaFunctor}, {@link #serializeFunctor}, and
  * {@link #deserializeFunctor} with permutations of Apache and Jackson implementations to test all aspects of
  * interoperability between the implementations.
  */
 @RunWith(Parameterized.class)
-public abstract class InteropTestBase {
+public abstract class InteropTestBase
+{
+    public enum DummyEnum {
+        NORTH, SOUTH, EAST, WEST
+    }
+
+    // To work around 2.8/2.9 difference wrt namespaces for enums
+    // See [dataformats-binary#58] for details
+    protected void assumeCompatibleNsForDeser() {
+        Assume.assumeTrue(deserializeFunctor != apacheDeserializer
+                || schemaFunctor != ApacheAvroInteropUtil.getJacksonSchema);
+    }
+
+    // To work around 2.8/2.9 difference wrt namespaces for enums
+    // See [dataformats-binary#58] for details
+    protected void assumeCompatibleNsForSer() {
+        Assume.assumeTrue(serializeFunctor != apacheSerializer
+                || schemaFunctor != ApacheAvroInteropUtil.getJacksonSchema);
+    }
+
     /**
      * Helper method for building a {@link ParameterizedType} for use with {@link #roundTrip(Type, Object)}
      *
@@ -85,13 +112,13 @@ public String toString() {
     }
 
     @Parameterized.Parameter
-    public Function<Type, Schema>             schemaFunctor;
+    public Function<Type, Schema> schemaFunctor;
     @Parameterized.Parameter(1)
     public BiFunction<Schema, Object, byte[]> serializeFunctor;
     @Parameterized.Parameter(2)
     public BiFunction<Schema, byte[], Object> deserializeFunctor;
     @Parameterized.Parameter(3)
-    public String                             combinationName;
+    public String combinationName;
 
     @Parameterized.Parameters(name = "{3}")
     public static Object[][] getParameters() {
@@ -141,13 +168,9 @@ protected <T> T roundTrip(T object) throws IOException {
     protected <T> T roundTrip(Type schemaType, T object) throws IOException {
         Schema schema = schemaFunctor.apply(schemaType);
         // Temporary hack until jackson supports native type Ids and we don't need to give it a target type
-        if (deserializeFunctor == jacksonDeserializer) {
-            return jacksonDeserialize(schema, schemaType, serializeFunctor.apply(schema, object));
+        if (deserializeFunctor == ApacheAvroInteropUtil.jacksonDeserializer) {
+            return ApacheAvroInteropUtil.jacksonDeserialize(schema, schemaType, serializeFunctor.apply(schema, object));
         }
         return (T) deserializeFunctor.apply(schema, serializeFunctor.apply(schema, object));
     }
-
-    public enum DummyEnum {
-        NORTH, SOUTH, EAST, WEST
-    }
 }

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroIgnoreTest.java

@@ -1,14 +1,17 @@
 package com.fasterxml.jackson.dataformat.avro.interop.annotations;
 
-import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 import org.apache.avro.reflect.AvroIgnore;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
+
 import static org.junit.Assert.assertThat;
 
 import java.io.IOException;
 
+import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
+
 public class AvroIgnoreTest extends InteropTestBase
 {
     static class RecordWithIgnoredField {
@@ -19,6 +22,12 @@ public RecordWithIgnoredField() {}
         public String notIgnoredField;
     }
 
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
+
     @Test
     public void testFieldIgnored() throws IOException {
         RecordWithIgnoredField r = new RecordWithIgnoredField();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/AvroNameTest.java

@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
 
 import org.apache.avro.reflect.AvroName;
-
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -34,6 +34,12 @@ public static class RecordWithNameCollision {
         public String otherField;
     }
 
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
+
     @Test
     public void testRecordWithRenamedField() throws IOException{
         RecordWithRenamed original = new RecordWithRenamed();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/arrays/ListWithComplexTest.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.DummyRecord;
@@ -17,7 +18,14 @@
 /**
  * Tests lists involving complex element types (Lists, Records, Maps, Enums)
  */
-public class ListWithComplexTest extends InteropTestBase {
+public class ListWithComplexTest extends InteropTestBase
+{
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
+
     @Test
     public void testEmptyListWithRecordElements() throws IOException {
         List<DummyRecord> original = new ArrayList<>();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/maps/MapWithComplexTest.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.*;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.DummyRecord;
@@ -14,7 +15,13 @@
 /**
  * Tests Maps involving complex value types (Lists, Records, Maps, Enums)
  */
-public class MapWithComplexTest extends InteropTestBase {
+public class MapWithComplexTest extends InteropTestBase
+{
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
 
     @Test
     public void testMapWithRecordValues() throws IOException {

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithComplexTest.java

@@ -5,6 +5,8 @@
 import java.util.Map;
 
 import org.apache.avro.AvroTypeException;
+
+import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -17,7 +19,15 @@
 /**
  * Tests records involving complex value types (Lists, Records, Maps, Enums)
  */
-public class RecordWithComplexTest extends InteropTestBase {
+public class RecordWithComplexTest extends InteropTestBase
+{
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+        assumeCompatibleNsForSer();
+    }
+
     @Test
     public void testEmptyRecordWithRecordValues() throws IOException {
         Map<String, DummyRecord> original = new HashMap<>();

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveArrayTest.java

@@ -1,6 +1,8 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
 import lombok.Data;
+
+import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
@@ -12,7 +14,14 @@
 /**
  * Tests serializing primitive array fields on records
  */
-public class RecordWithPrimitiveArrayTest extends InteropTestBase {
+public class RecordWithPrimitiveArrayTest extends InteropTestBase
+{
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
+
     @Data
     public static class TestRecord {
         private byte[]   byteArrayField      = new byte[0];

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/records/RecordWithPrimitiveTest.java

@@ -1,6 +1,8 @@
 package com.fasterxml.jackson.dataformat.avro.interop.records;
 
 import lombok.Data;
+
+import org.junit.Before;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
@@ -12,7 +14,8 @@
 /**
  * Tests serializing primitive fields on records
  */
-public class RecordWithPrimitiveTest extends InteropTestBase {
+public class RecordWithPrimitiveTest extends InteropTestBase
+{
     @Data
     public static class TestRecord {
         private byte   byteField;
@@ -24,6 +27,12 @@ public static class TestRecord {
         private double doubleField;
     }
 
+    @Before
+    public void setup() {
+        // 2.8 doesn't generate schemas with compatible namespaces for Apache deserializer
+        assumeCompatibleNsForDeser();
+    }
+    
     @Test
     public void testByteField() throws IOException {
         TestRecord record = new TestRecord();