more test coverage

FasterXML · Nov 3, 2016 · 8f80662 · 8f80662
1 parent d227752
commit 8f80662
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 87 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.java b/src/main/java/com/fasterxml/jackson/databind/introspect/BeanPropertyDefinition.java
@@ -183,20 +183,42 @@ public Iterator<AnnotatedParameter> getConstructorParameters() {
      * value of the property.
      * Null if no such member exists.
      */
-    public abstract AnnotatedMember getAccessor();
+    public AnnotatedMember getAccessor()
+    {
+        AnnotatedMember m = getGetter();
+        if (m == null) {
+            m = getField();
+        }
+        return m;
+    }
 
     /**
      * Method used to find mutator (constructor parameter, setter, field) to use for
      * changing value of the property.
      * Null if no such member exists.
      */
-    public abstract AnnotatedMember getMutator();
+    public AnnotatedMember getMutator() {
+        AnnotatedMember acc = getConstructorParameter();
+        if (acc == null) {
+            acc = getSetter();
+            if (acc == null) {
+                acc = getField();
+            }
+        }
+        return acc;
+    }
 
     /**
      * @since 2.3
      */
-    public abstract AnnotatedMember getNonConstructorMutator();
+    public AnnotatedMember getNonConstructorMutator() {
-
+        AnnotatedMember m = getSetter();
+        if (m == null) {
+            m = getField();
+        }
+        return m;
+    }
+
     /**
      * Method used to find the property member (getter, setter, field) that has
      * the highest precedence in current context (getter method when serializing,

diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
@@ -509,38 +509,6 @@ public Iterator<AnnotatedParameter> getConstructorParameters() {
         }
         return new MemberIterator<AnnotatedParameter>(_ctorParameters);
     }
-
-    @Override
-    public AnnotatedMember getAccessor()
-    {
-        AnnotatedMember m = getGetter();
-        if (m == null) {
-            m = getField();
-        }
-        return m;
-    }
-
-    @Override
-    public AnnotatedMember getMutator()
-    {
-        AnnotatedMember m = getConstructorParameter();
-        if (m == null) {
-            m = getSetter();
-            if (m == null) {
-                m = getField();
-            }
-        }
-        return m;
-    }
-
-    @Override
-    public AnnotatedMember getNonConstructorMutator() {
-        AnnotatedMember m = getSetter();
-        if (m == null) {
-            m = getField();
-        }
-        return m;
-    }
 
     @Override
     public AnnotatedMember getPrimaryMember() {

diff --git a/src/main/java/com/fasterxml/jackson/databind/module/SimpleDeserializers.java b/src/main/java/com/fasterxml/jackson/databind/module/SimpleDeserializers.java
@@ -85,15 +85,15 @@ public JsonDeserializer<?> findArrayDeserializer(ArrayType type,
             TypeDeserializer elementTypeDeserializer, JsonDeserializer<?> elementDeserializer)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
     }
 
     @Override
     public JsonDeserializer<?> findBeanDeserializer(JavaType type,
             DeserializationConfig config, BeanDescription beanDesc)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
     }
 
     @Override
@@ -103,7 +103,7 @@ public JsonDeserializer<?> findCollectionDeserializer(CollectionType type,
             JsonDeserializer<?> elementDeserializer)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
     }
 
     @Override
@@ -113,7 +113,7 @@ public JsonDeserializer<?> findCollectionLikeDeserializer(CollectionLikeType typ
             JsonDeserializer<?> elementDeserializer)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
     }
 
     @Override
@@ -138,19 +138,22 @@ public JsonDeserializer<?> findTreeNodeDeserializer(Class<? extends JsonNode> no
             DeserializationConfig config, BeanDescription beanDesc)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(nodeType));
+        if (_classMappings == null) {
+            return null;
+        }
+        return _classMappings.get(new ClassKey(nodeType));
     }
-    
+
     @Override
     public JsonDeserializer<?> findReferenceDeserializer(ReferenceType refType,
             DeserializationConfig config, BeanDescription beanDesc,
             TypeDeserializer contentTypeDeserializer, JsonDeserializer<?> contentDeserializer)
         throws JsonMappingException {
         // 21-Oct-2015, tatu: Unlikely this will really get used (reference types need more
         //    work, simple registration probably not sufficient). But whatever.
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(refType.getRawClass()));
+        return _find(refType);
     }
-    
+
     @Override
     public JsonDeserializer<?> findMapDeserializer(MapType type,
             DeserializationConfig config, BeanDescription beanDesc,
@@ -159,7 +162,7 @@ public JsonDeserializer<?> findMapDeserializer(MapType type,
             JsonDeserializer<?> elementDeserializer)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
     }
 
     @Override
@@ -170,6 +173,13 @@ public JsonDeserializer<?> findMapLikeDeserializer(MapLikeType type,
             JsonDeserializer<?> elementDeserializer)
         throws JsonMappingException
     {
-        return (_classMappings == null) ? null : _classMappings.get(new ClassKey(type.getRawClass()));
+        return _find(type);
+    }
+
+    private final JsonDeserializer<?> _find(JavaType type) {
+        if (_classMappings == null) {
+            return null;
+        }
+        return _classMappings.get(new ClassKey(type.getRawClass()));
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java b/src/main/java/com/fasterxml/jackson/databind/util/SimpleBeanPropertyDefinition.java
@@ -273,46 +273,6 @@ public Iterator<AnnotatedParameter> getConstructorParameters() {
         return Collections.singleton(param).iterator();
     }
 
-    /**
-     * Method used to find accessor (getter, field to access) to use for accessing
-     * value of the property.
-     * Null if no such member exists.
-     */
-    @Override
-    public AnnotatedMember getAccessor() {
-        AnnotatedMember acc = getGetter();
-        if (acc == null) {
-            acc = getField();
-        }
-        return acc;
-    }
-
-    /**
-     * Method used to find mutator (constructor parameter, setter, field) to use for
-     * changing value of the property.
-     * Null if no such member exists.
-     */
-    @Override
-    public AnnotatedMember getMutator() {
-        AnnotatedMember acc = getConstructorParameter();
-        if (acc == null) {
-            acc = getSetter();
-            if (acc == null) {
-                acc = getField();
-            }
-        }
-        return acc;
-    }
-
-    @Override
-    public AnnotatedMember getNonConstructorMutator() {
-        AnnotatedMember acc = getSetter();
-        if (acc == null) {
-            acc = getField();
-        }
-        return acc;
-    }
-
     @Override
     public AnnotatedMember getPrimaryMember() { return _member; }
 }
diff --git a/src/test/java/com/fasterxml/jackson/databind/module/SimpleModuleTest.java b/src/test/java/com/fasterxml/jackson/databind/module/SimpleModuleTest.java
@@ -279,7 +279,10 @@ public void testMultipleModules() throws Exception
         SimpleModule mod2 = new SimpleModule("test2", Version.unknownVersion());
         mod1.addSerializer(SimpleEnum.class, new SimpleEnumSerializer());
         mod1.addDeserializer(CustomBean.class, new CustomBeanDeserializer());
-        mod2.addDeserializer(SimpleEnum.class, new SimpleEnumDeserializer());
+
+        Map<Class<?>,JsonDeserializer<?>> desers = new HashMap<>();
+        desers.put(SimpleEnum.class, new SimpleEnumDeserializer());
+        mod2.setDeserializers(new SimpleDeserializers(desers));
         mod2.addSerializer(CustomBean.class, new CustomBeanSerializer());
 
         ObjectMapper mapper = new ObjectMapper();

diff --git a/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java b/src/test/java/com/fasterxml/jackson/databind/util/ClassUtilTest.java
@@ -194,7 +194,10 @@ public void testWrapperToPrimitiveType()
     public void testFindEnumType()
     {
         assertEquals(TestEnum.class, ClassUtil.findEnumType(TestEnum.A));
+        // different codepaths for empty and non-empty EnumSets...
         assertEquals(TestEnum.class, ClassUtil.findEnumType(EnumSet.allOf(TestEnum.class)));
+        assertEquals(TestEnum.class, ClassUtil.findEnumType(EnumSet.noneOf(TestEnum.class)));
+
         assertEquals(TestEnum.class, ClassUtil.findEnumType(new EnumMap<TestEnum,Integer>(TestEnum.class)));
     }
 

diff --git a/src/test/java/com/fasterxml/jackson/databind/util/EnumValuesTest.java b/src/test/java/com/fasterxml/jackson/databind/util/EnumValuesTest.java
@@ -1,5 +1,7 @@
 package com.fasterxml.jackson.databind.util;
 
+import java.util.List;
+
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationConfig;
@@ -47,4 +49,19 @@ public void testConstructWithToString() {
         assertEquals(3, values.values().size());
         assertEquals(3, values.internalMap().size());
     }
+
+    @SuppressWarnings("deprecation")
+    public void testEnumResolver()
+    {
+        EnumResolver enumRes = EnumResolver.constructUnsafeUsingToString(ABC.class);
+        assertEquals(ABC.B, enumRes.getEnum(1));
+        assertNull(enumRes.getEnum(-1));
+        assertNull(enumRes.getEnum(3));
+        assertEquals(2, enumRes.lastValidIndex());
+        List<Enum<?>> enums = enumRes.getEnums();
+        assertEquals(3, enums.size());
+        assertEquals(ABC.A, enums.get(0));
+        assertEquals(ABC.B, enums.get(1));
+        assertEquals(ABC.C, enums.get(2));
+    }
 }