Fix #1580 (and minor test cleanup)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/cfg/ConfigOverrides.java

@@ -54,31 +54,36 @@ public ConfigOverrides() {
                 // !!! TODO: change to (ALWAYS, ALWAYS)?
                 JsonInclude.Value.empty(),
                 JsonSetter.Value.empty(),
-                VisibilityChecker.Std.defaultInstance()
+                VisibilityChecker.Std.defaultInstance(),
+                null
         );
     }
 
     protected ConfigOverrides(Map<Class<?>, MutableConfigOverride> overrides,
             JsonInclude.Value defIncl,
             JsonSetter.Value defSetter,
-            VisibilityChecker<?> defVisibility) {
+            VisibilityChecker<?> defVisibility,
+            Boolean defMergeable) {
         _overrides = overrides;
         _defaultInclusion = defIncl;
         _defaultSetterInfo = defSetter;
         _visibilityChecker = defVisibility;
+        _defaultMergeable = defMergeable;
     }
 
     public ConfigOverrides copy()
     {
+        Map<Class<?>, MutableConfigOverride> newOverrides;
         if (_overrides == null) {
-            return new ConfigOverrides();
-        }
-        Map<Class<?>, MutableConfigOverride> newOverrides = _newMap();
-        for (Map.Entry<Class<?>, MutableConfigOverride> entry : _overrides.entrySet()) {
-            newOverrides.put(entry.getKey(), entry.getValue().copy());
+            newOverrides = null;
+        } else {
+            newOverrides = _newMap();
+            for (Map.Entry<Class<?>, MutableConfigOverride> entry : _overrides.entrySet()) {
+                newOverrides.put(entry.getKey(), entry.getValue().copy());
+            }
         }
         return new ConfigOverrides(newOverrides,
-                _defaultInclusion, _defaultSetterInfo, _visibilityChecker);
+                _defaultInclusion, _defaultSetterInfo, _visibilityChecker, _defaultMergeable);
     }
 
     /*
@@ -131,28 +136,34 @@ public VisibilityChecker<?> getDefaultVisibility() {
         return _visibilityChecker;
     }
 
+    /**
+     * @since 2.9
+     */
     public void setDefaultInclusion(JsonInclude.Value v) {
         _defaultInclusion = v;
     }
 
+    /**
+     * @since 2.9
+     */
     public void setDefaultSetterInfo(JsonSetter.Value v) {
         _defaultSetterInfo = v;
     }
 
     /**
      * @since 2.9
      */
-    public void setDefaultVisibility(VisibilityChecker<?> v) {
-        _visibilityChecker = v;
+    public void setDefaultMergeable(Boolean v) {
+        _defaultMergeable = v;
     }
 
     /**
      * @since 2.9
      */
-    public void setDefaultMergeable(Boolean v) {
-        _defaultMergeable = v;
+    public void setDefaultVisibility(VisibilityChecker<?> v) {
+        _visibilityChecker = v;
     }
-    
+
     /*
     /**********************************************************
     /* Helper methods

src/main/java/com/fasterxml/jackson/databind/introspect/VisibilityChecker.java

@@ -427,13 +427,8 @@ public boolean isSetterVisible(AnnotatedMethod m) {
 
         @Override
         public String toString() {
-            return new StringBuilder("[Visibility:")
-            .append(" getter: ").append(_getterMinLevel)
-            .append(", isGetter: ").append(_isGetterMinLevel)
-            .append(", setter: ").append(_setterMinLevel)
-            .append(", creator: ").append(_creatorMinLevel)
-            .append(", field: ").append(_fieldMinLevel)
-            .append("]").toString();
+            return String.format("[Visibility: getter=%s,isGetter=%s,setter=%s,creator=%s,field=%s]",
+                    _getterMinLevel, _isGetterMinLevel, _setterMinLevel, _creatorMinLevel, _fieldMinLevel);
         }
     }
 }

src/test/java/com/fasterxml/jackson/databind/TestParserUsingMapper.java renamed to src/test/java/com/fasterxml/jackson/databind/MapperViaParserTest.java

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class TestParserUsingMapper  extends BaseMapTest
+public class MapperViaParserTest  extends BaseMapTest
 {
     final static int TWO_BYTE_ESCAPED = 0x111;
     final static int THREE_BYTE_ESCAPED = 0x1111;
@@ -72,27 +72,6 @@ public SerializableString getEscapeSequence(int ch)
     /********************************************************
      */
 
-    public void testReadingArrayAsTree() throws IOException
-    {
-        JsonFactory jf = new MappingJsonFactory();
-        final String JSON = "[ 1, 2, false ]";
-
-        for (int i = 0; i < 2; ++i) {
-            JsonParser jp = jf.createParser(new StringReader(JSON));
-            // whether to try advancing first or not? Try both
-            if (i == 0) {
-                assertToken(JsonToken.START_ARRAY, jp.nextToken());
-            }
-            JsonNode root = (JsonNode) jp.readValueAsTree();
-            jp.close();
-            assertTrue(root.isArray());
-            assertEquals(3, root.size());
-            assertEquals(1, root.get(0).intValue());
-            assertEquals(2, root.get(1).intValue());
-            assertFalse(root.get(2).booleanValue());
-        }
-    }
-    
     public void testPojoReading() throws IOException
     {
         JsonFactory jf = new MappingJsonFactory();