Last part of this round of refactoring aimed at passing full PropertyName (not just simple name) via POJO properties collector

Author: cowtowncoder

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

@@ -435,14 +435,13 @@ protected void _addCreators()
             for (int i = 0, len = ctor.getParameterCount(); i < len; ++i) {
                 AnnotatedParameter param = ctor.getParameter(i);
                 PropertyName pn = ai.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
                 // is it legal not to have name?
-                if (name != null && name.length() > 0) {
+                if (pn != null && !pn.isEmpty()) {
                     // shouldn't need to worry about @JsonIgnore (no real point, so)
-                    POJOPropertyBuilder prop = _property(name);
+                    POJOPropertyBuilder prop = _property(pn);
                     // 28-Mar-2014, tatu: for now, all creator names considered explicit;
                     //    may need to change for JDK 8 where implicit names exist
-                    prop.addCtor(param, name, true, true, false);
+                    prop.addCtor(param, pn, true, true, false);
                     _creatorProperties.add(prop);
                 }
             }
@@ -454,13 +453,12 @@ protected void _addCreators()
             for (int i = 0, len = factory.getParameterCount(); i < len; ++i) {
                 AnnotatedParameter param = factory.getParameter(i);
                 PropertyName pn = ai.findNameForDeserialization(param);
-                String name = (pn == null) ? null : pn.getSimpleName();
                 // is it legal not to have name?
-                if (name != null) {
+                if (pn != null && !pn.isEmpty()) {
                     // shouldn't need to worry about @JsonIgnore (no real point, so)
-                    POJOPropertyBuilder prop = _property(name);
+                    POJOPropertyBuilder prop = _property(pn);
                     // 28-Mar-2014, tatu: for now, all names considered explicit
-                    prop.addCtor(param, name, true, true, false);
+                    prop.addCtor(param, pn, true, true, false);
                     _creatorProperties.add(prop);
                 }
             }
@@ -824,7 +822,12 @@ protected void _renameWithWrappers()
     protected void reportProblem(String msg) {
         throw new IllegalArgumentException("Problem with definition of "+_classDef+": "+msg);
     }
+
+    protected POJOPropertyBuilder _property(PropertyName name) {
+        return _property(name.getSimpleName());
+    }
 
+    // !!! TODO: deprecate, require use of PropertyName
     protected POJOPropertyBuilder _property(String implName)
     {
         POJOPropertyBuilder prop = _properties.get(implName);

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

@@ -778,10 +778,6 @@ private Linked<? extends AnnotatedMember> findRenamed(Linked<? extends Annotated
             }
             PropertyName name = node.name;
             // different from default name?
-            /* 14-Mar-2014, tatu: As per [#369], Must match local name... but,
-             *   shouldn't really exclude namespace. Not sure what's the best
-             *   fix but for now, let's not worry about that.
-             */
             if (name.equals(_name)) { // nope, skip
                 continue;
             }
@@ -878,6 +874,10 @@ public Linked(T v, Linked<T> n,
             next = n;
             // ensure that we'll never have missing names
             this.name = (name == null || !name.hasSimpleName()) ? null : name;
+
+            if (explName && this.name == null) { // sanity check to catch internal problems
+                throw new IllegalArgumentException("Can not pass true for 'explName' if name is null/empty");
+            }
 
             isNameExplicit = explName;
             isVisible = visible;