trying to streamline new test

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -968,7 +968,7 @@ public static List<Module> findModules(ClassLoader classLoader)
     public ObjectMapper findAndRegisterModules() {
         return registerModules(findModules());
     }
-    
+
     /*
     /**********************************************************
     /* Configuration: main config object access

src/main/java/com/fasterxml/jackson/databind/deser/impl/CreatorCollector.java

@@ -266,23 +266,23 @@ public boolean hasPropertyBasedCreator() {
     /**********************************************************
      */
 
-    private JavaType _computeDelegateType(AnnotatedWithParams creator, SettableBeanProperty[] delegateArgs)
+    private JavaType _computeDelegateType(AnnotatedWithParams creator,
+            SettableBeanProperty[] delegateArgs)
     {
         if (!_hasNonDefaultCreator || (creator == null)) {
             return null;
-        } else {
-            // need to find type...
-            int ix = 0;
-            if (delegateArgs != null) {
-                for (int i = 0, len = delegateArgs.length; i < len; ++i) {
-                    if (delegateArgs[i] == null) { // marker for delegate itself
-                        ix = i;
-                        break;
-                    }
+        }
+        // need to find type...
+        int ix = 0;
+        if (delegateArgs != null) {
+            for (int i = 0, len = delegateArgs.length; i < len; ++i) {
+                if (delegateArgs[i] == null) { // marker for delegate itself
+                    ix = i;
+                    break;
                 }
             }
-            return creator.getParameterType(ix);
         }
+        return creator.getParameterType(ix);
     }
 
     private <T extends AnnotatedMember> T _fixAccess(T member)

src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java

@@ -234,8 +234,9 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
                 kd = ((ContextualKeyDeserializer) kd).createContextual(ctxt, property);
             }
         }
+        
         JsonDeserializer<?> vd = _valueDeserializer;
-        // #125: May have a content converter
+        // [databind#125]: May have a content converter
         if (property != null) {
             vd = findConvertingContentDeserializer(ctxt, property, vd);
         }
@@ -329,7 +330,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt)
         // Ok: must point to START_OBJECT, FIELD_NAME or END_OBJECT
         JsonToken t = p.getCurrentToken();
         if (t != JsonToken.START_OBJECT && t != JsonToken.FIELD_NAME && t != JsonToken.END_OBJECT) {
-            // [JACKSON-620] (empty) String may be ok however:
+            // (empty) String may be ok however:
             if (t == JsonToken.VALUE_STRING) {
                 return (Map<Object,Object>) _valueInstantiator.createFromString(ctxt, p.getText());
             }
@@ -398,7 +399,7 @@ protected final void _readAndBind(JsonParser p, DeserializationContext ctxt,
         final KeyDeserializer keyDes = _keyDeserializer;
         final JsonDeserializer<Object> valueDes = _valueDeserializer;
         final TypeDeserializer typeDeser = _valueTypeDeserializer;
-
+        
         MapReferringAccumulator referringAccumulator = null;
         boolean useObjectId = valueDes.getObjectIdReader() != null;
         if (useObjectId) {
@@ -465,7 +466,7 @@ protected final void _readAndBindStringMap(JsonParser p, DeserializationContext
         if (useObjectId) {
             referringAccumulator = new MapReferringAccumulator(_mapType.getContentType().getRawClass(), result);
         }
-
+        
         String key;
         if (p.isExpectedStartObjectToken()) {
             key = p.nextFieldName();

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

@@ -123,7 +123,7 @@ public final class AnnotatedClass
      * or have at least one annotation.
      */
     protected List<AnnotatedField> _fields;
-    
+
     /*
     /**********************************************************
     /* Life-cycle
@@ -427,8 +427,12 @@ private void resolveCreators()
         // Then see which constructors we have
         List<AnnotatedConstructor> constructors = null;
         ClassUtil.Ctor[] declaredCtors = ClassUtil.getConstructors(_class);
-        // Constructor also always members of this class, so
-        TypeResolutionContext typeContext = this;        
+        // Constructor also always members of this class
+        TypeResolutionContext typeContext = this; 
+
+        // 30-Apr-2016, tatu: [databind#1215]: Actually, while true, this does
+        //   NOT apply to context since sub-class may have type bindings
+//        TypeResolutionContext typeContext = new TypeResolutionContext.Basic(_typeFactory, _type.getBindings());
         for (ClassUtil.Ctor ctor : declaredCtors) {
             if (_isIncludableConstructor(ctor.getConstructor())) {
                 if (ctor.getParamCount() == 0) {
@@ -524,9 +528,9 @@ private void resolveMemberMethods()
         // and then augment these with annotations from super-types:
         for (JavaType type : _superTypes) {
             Class<?> mixin = (_mixInResolver == null) ? null : _mixInResolver.findMixInClassFor(type.getRawClass());
-            TypeResolutionContext typeContext = new TypeResolutionContext.Basic(_typeFactory,
-                    type.getBindings());
-            _addMemberMethods(type.getRawClass(), typeContext, _memberMethods, mixin, mixins);
+            _addMemberMethods(type.getRawClass(),
+                    new TypeResolutionContext.Basic(_typeFactory, type.getBindings()),
+                    _memberMethods, mixin, mixins);
         }
         // Special case: mix-ins for Object.class? (to apply to ALL classes)
         if (_mixInResolver != null) {
@@ -539,7 +543,7 @@ private void resolveMemberMethods()
         /* Any unmatched mix-ins? Most likely error cases (not matching
          * any method); but there is one possible real use case:
          * exposing Object#hashCode (alas, Object#getClass can NOT be
-         * exposed, see [JACKSON-140])
+         * exposed)
          */
         // 14-Feb-2011, tatu: AnnotationIntrospector is null if annotations not enabled; if so, can skip:
         if (_annotationIntrospector != null) {
@@ -890,15 +894,15 @@ protected AnnotatedConstructor _constructNonDefaultConstructor(ClassUtil.Ctor ct
                     _emptyAnnotationMap(), _emptyAnnotationMaps(paramCount));
         }
 
-        /* [JACKSON-701]: Looks like JDK has discrepancy, whereas annotations for implicit 'this'
-         * (for non-static inner classes) are NOT included, but type is? Strange, sounds like
-         * a bug. Alas, we can't really fix that...
+        /* Looks like JDK has discrepancy, whereas annotations for implicit 'this'
+         * (for non-static inner classes) are NOT included, but type is?
+         * Strange, sounds like a bug. Alas, we can't really fix that...
          */
         if (paramCount == 0) { // no-arg default constructors, can simplify slightly
             return new AnnotatedConstructor(typeContext, ctor.getConstructor(),
                     _collectRelevantAnnotations(ctor.getDeclaredAnnotations()), NO_ANNOTATION_MAPS);
         }
-        // Also: [JACKSON-757] (enum value constructors)
+        // Also: enum value constructors
         AnnotationMap[] resolvedAnnotations;
         Annotation[][] paramAnns = ctor.getParameterAnnotations();
         if (paramCount != paramAnns.length) {

src/test/java/com/fasterxml/jackson/failing/TypeRefinementForMap1215Test.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -13,10 +13,6 @@ public class TypeRefinementForMap1215Test extends BaseMapTest
 {
     interface HasUniqueId<K> {
         K getId();
-        String getIdFieldName();
-    }
-    interface AnotherMap<K, V extends HasUniqueId<K>> extends Map<K, V> {
-        public void add(V v);
     }
 
     static class Item implements HasUniqueId<String>
@@ -26,58 +22,30 @@ static class Item implements HasUniqueId<String>
 
         @Override
         public String getId() { return id; }
-        
-        @Override
-        public String getIdFieldName() {
-            return "id";
-        }
     }
 
     static class Data
     {
         public String id;
 
-        @JsonProperty
-        private Map<String, Item> items;
-
-        public Data() { }
-
-        public Map<String, Item> getItems() {
-            return items;
-        }
-
         @JsonDeserialize(as = MyHashMap.class)
-        public void setItems(Map<String, Item> items) {
-            this.items = items;
-        }
+        public Map<String, Item> items;
+
+        // Would work with straight arguments:
+//        public MyHashMap<String, Item> items;
     }
 
     @SuppressWarnings("serial")
     static class MyHashMap<K, V extends HasUniqueId<K>>
         extends LinkedHashMap<K, V>
-        implements AnotherMap<K, V>
     {
         @JsonCreator(mode=JsonCreator.Mode.DELEGATING)
         public MyHashMap(V[] values) {
             for (int i = 0; i < values.length; i++) {
                 V v = values[i];
-                if (v.getId() == null) {
-                    throw new RuntimeException("Failed to get id");
-                }
-                if (containsKey(v.getId())) {
-                    throw new RuntimeException("Conflict on id");
-                }
                 put(v.getId(), v);
             }
         }
-
-        @Override
-        public void add(V v) {
-            if (containsKey(v.getId())) {
-                throw new RuntimeException("Conflict on add of id");
-            }
-            put(v.getId(), v);
-        }
     }
 
     /*
@@ -99,6 +67,8 @@ public void testMapRefinement() throws Exception
         assertEquals(ID1, data.id);
         assertNotNull(data.items);
         assertEquals(1, data.items.size());
-        assertEquals(ID2, data.items.get(0).id);
+        Item value = data.items.get(ID2);
+        assertNotNull(value);
+        assertEquals("value", value.property);
     }
 }