Merge branch '2.12'

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroReaderFactory.java

@@ -66,24 +66,23 @@ public ScalarDecoder createScalarValueDecoder(Schema type)
         case FLOAT:
             return READER_FLOAT;
         case INT:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new IntReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new IntReader(typeId) : READER_INT;
             }
-            return READER_INT;
         case LONG:
             return READER_LONG;
         case NULL:
             return READER_NULL;
         case STRING:
-            if (AvroSchemaHelper.getTypeId(type) != null) {
-                return new StringReader(AvroSchemaHelper.getTypeId(type));
+            {
+                final String typeId = AvroSchemaHelper.getTypeId(type);
+                return (typeId != null) ? new StringReader(typeId) : READER_STRING;
             }
-            return READER_STRING;
         case UNION:
-            /* Union is a "scalar union" if all the alternative types
-             * are scalar. One common type is that of "nullable" one,
-             * but general handling should work just fine.
-             */
+            // Union is a "scalar union" if all the alternative types
+            // are scalar. One common type is that of "nullable" one,
+            // but general handling should work just fine.
             List<Schema> types = type.getTypes();
             {
                 ScalarDecoder[] readers = new ScalarDecoder[types.size()];

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

@@ -1,12 +1,8 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
-
-/* 23-Aug-2017, tatu: There was some confusion on whether potential ambiguity
- *   might be problematic (compared to actual one) -- this test verifies
- *   it should not be.
- */
+// 23-Aug-2017, tatu: There was some confusion on whether potential ambiguity
+//   might be problematic (compared to actual one) -- this test verifies
+//   it should not be.
 public class AmbiguousUnionWriteTest extends AvroTestBase
 {
     protected final String SCHEMA_WITH_AMBIGUITY = aposToQuotes("{\n"

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

@@ -7,8 +7,6 @@
 
 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.schema.AvroSchemaGenerator;
 
 public class NestedMapTest extends AvroTestBase

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

@@ -2,9 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 
-import com.fasterxml.jackson.dataformat.avro.AvroMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroSchema;
-
 public class RootEmptyRecord177Test extends AvroTestBase
 {
     private final AvroMapper MAPPER = getMapper();

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

@@ -1,8 +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;
 

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

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.core.StreamWriteFeature;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.avro.AvroFactory;
 
 public class SimpleGenerationTest extends AvroTestBase
 {

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

@@ -50,11 +50,11 @@ public static ParameterizedType type(Class<?> baseClass, Type... parameters) {
         return new ParameterizedTypeImpl(baseClass, parameters);
     }
 
-    private static class ParameterizedTypeImpl implements ParameterizedType {
+    static class ParameterizedTypeImpl implements ParameterizedType {
         private final Class<?> rawType;
         private final Type[]   typeBindings;
 
-        private ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {
+        ParameterizedTypeImpl(Class<?> rawType, Type[] typeBindings) {
             this.rawType = rawType;
             this.typeBindings = typeBindings;
         }

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

@@ -53,7 +53,7 @@ static class CustomComponent {
         public Long longValue;
 
         @AvroEncode(using = UuidAsBytesAvroEncoding.class)
-        private UUID uuidValue;
+        UUID uuidValue;
 
         protected CustomComponent() { }
     }

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/failing/PolymorphicRoundtripTest.java

@@ -28,6 +28,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import com.fasterxml.jackson.core.Version;
+
 import com.fasterxml.jackson.databind.DatabindContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -39,6 +40,7 @@
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.impl.ClassNameIdResolver;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+
 import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
 import com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationIntrospector;
 import com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationTypeResolverBuilder;
@@ -173,9 +175,9 @@ public String selectId(String[] ids) {
      * ClassNameIonAnnotationIntrospector, and MultipleClassNameIdResolver (where they actually get used). I think
      * this is (a little) easier to understand.
      */
-    private boolean resolveAllTypes = false; // apply resolver under test to all types, not just annotated ones
-    private String preferredTypeId = null; // if asked to resolve from multiple ids, choose this one.
-    private IonSystem ionSystem = IonSystemBuilder.standard().build();
+    boolean resolveAllTypes = false; // apply resolver under test to all types, not just annotated ones
+    String preferredTypeId = null; // if asked to resolve from multiple ids, choose this one.
+    IonSystem ionSystem = IonSystemBuilder.standard().build();
 
     @Before
     public void reset() {

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java

@@ -109,11 +109,11 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base
         }
     }
 
-    private static class ClassA {
+    static class ClassA {
         public int value;
     }
 
-    private static class ClassB<T> {
+    static class ClassB<T> {
         public T content;
     }
 }