Some followup work wrt #2944

cowtowncoder · cowtowncoder · commit 95d7e2ef2754 · 2020-11-26T16:51:25.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -403,13 +403,12 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
         for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
             // Object Id property?
             if (buffer.readIdProperty(propName) && creatorProp == null) {
                 continue;
             }
             // creator property?
-
             if (creatorProp != null) {
                 // Last creator property to set?
                 Object value;
@@ -794,7 +793,11 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
             // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 // Last creator property to set?
                 if (buffer.assignParameter(creatorProp,
@@ -833,10 +836,6 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) {
@@ -976,7 +975,11 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
             // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 // first: let's check to see if this might be part of value with external type id:
                 // 11-Sep-2015, tatu: Important; do NOT pass buffer as last arg, but null,
@@ -1012,10 +1015,6 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BuilderBasedDeserializer.java
@@ -355,7 +355,11 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
             // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 if ((activeView != null) && !creatorProp.visibleInView(activeView)) {
                     p.skipChildren();
@@ -383,10 +387,6 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p,
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) {
@@ -630,7 +630,11 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
             // creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 // Last creator property to set?
                 if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
@@ -648,10 +652,6 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p,
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayBuilderDeserializer.java
@@ -296,7 +296,11 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
             }
             final String propName = prop.getName();
             // if not yet, maybe we got a creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 // Last creator property to set?
                 if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
@@ -319,10 +323,6 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             buffer.bufferProperty(prop, prop.deserialize(p, ctxt));
         }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java
@@ -313,7 +313,11 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
             }
             final String propName = prop.getName();
             // if not yet, maybe we got a creator property?
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            // Object Id property?
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
+                continue;
+            }
             if (creatorProp != null) {
                 // Last creator property to set?
                 if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {
@@ -340,10 +344,6 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             buffer.bufferProperty(prop, prop.deserialize(p, ctxt));
         }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FactoryBasedEnumDeserializer.java
@@ -179,14 +179,15 @@ protected Object deserializeEnumUsingPropertyBased(final JsonParser p, final Des
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
     
-            SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
-            if (creatorProp != null) {
-                buffer.assignParameter(creatorProp, _deserializeWithErrorWrapping(p, ctxt, creatorProp));
+            final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
+            if (buffer.readIdProperty(propName) && creatorProp == null) {
                 continue;
             }
-            if (buffer.readIdProperty(propName)) {
+            if (creatorProp != null) {
+                buffer.assignParameter(creatorProp, _deserializeWithErrorWrapping(p, ctxt, creatorProp));
                 continue;
             }
+            // 26-Nov-2020, tatu: ... what should we do here tho?
         }
         return creator.build(ctxt, buffer);
     }

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,11 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`296`	`296`	`}`
`297`	`297`	`final String propName = prop.getName();`
`298`	`298`	`// if not yet, maybe we got a creator property?`
`299`		`- SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
	`299`	`+ final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
	`300`	`+ // Object Id property?`
	`301`	`+ if (buffer.readIdProperty(propName) && creatorProp == null) {`
	`302`	`+ continue;`
	`303`	`+ }`
`300`	`304`	`if (creatorProp != null) {`
`301`	`305`	`// Last creator property to set?`
`302`	`306`	`if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {`
`@@ -319,10 +323,6 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p,`
`319`	`323`	`}`
`320`	`324`	`continue;`
`321`	`325`	`}`
`322`		`- // Object Id property?`
`323`		`- if (buffer.readIdProperty(propName)) {`
`324`		`- continue;`
`325`		`- }`
`326`	`326`	`// regular property? needs buffering`
`327`	`327`	`buffer.bufferProperty(prop, prop.deserialize(p, ctxt));`
`328`	`328`	`}`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,11 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final`
`313`	`313`	`}`
`314`	`314`	`final String propName = prop.getName();`
`315`	`315`	`// if not yet, maybe we got a creator property?`
`316`		`- SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
	`316`	`+ final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
	`317`	`+ // Object Id property?`
	`318`	`+ if (buffer.readIdProperty(propName) && creatorProp == null) {`
	`319`	`+ continue;`
	`320`	`+ }`
`317`	`321`	`if (creatorProp != null) {`
`318`	`322`	`// Last creator property to set?`
`319`	`323`	`if (buffer.assignParameter(creatorProp, creatorProp.deserialize(p, ctxt))) {`
`@@ -340,10 +344,6 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final`
`340`	`344`	`}`
`341`	`345`	`continue;`
`342`	`346`	`}`
`343`		`- // Object Id property?`
`344`		`- if (buffer.readIdProperty(propName)) {`
`345`		`- continue;`
`346`		`- }`
`347`	`347`	`// regular property? needs buffering`
`348`	`348`	`buffer.bufferProperty(prop, prop.deserialize(p, ctxt));`
`349`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,14 +179,15 @@ protected Object deserializeEnumUsingPropertyBased(final JsonParser p, final Des`
`179`	`179`	`String propName = p.getCurrentName();`
`180`	`180`	`p.nextToken(); // to point to value`
`181`	`181`
`182`		`- SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
`183`		`- if (creatorProp != null) {`
`184`		`- buffer.assignParameter(creatorProp, _deserializeWithErrorWrapping(p, ctxt, creatorProp));`
	`182`	`+ final SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);`
	`183`	`+ if (buffer.readIdProperty(propName) && creatorProp == null) {`
`185`	`184`	`continue;`
`186`	`185`	`}`
`187`		`- if (buffer.readIdProperty(propName)) {`
	`186`	`+ if (creatorProp != null) {`
	`187`	`+ buffer.assignParameter(creatorProp, _deserializeWithErrorWrapping(p, ctxt, creatorProp));`
`188`	`188`	`continue;`
`189`	`189`	`}`
	`190`	`+ // 26-Nov-2020, tatu: ... what should we do here tho?`
`190`	`191`	`}`
`191`	`192`	`return creator.build(ctxt, buffer);`
`192`	`193`	`}`