Post #4690 clean up wrt early exit from deser loop (#5448)

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/CreatorProperty.java

@@ -276,6 +276,9 @@ public boolean isInjectionOnly() {
 
     //  public boolean isInjectionOnly() { return false; }
 
+    @Override // @since 3.1
+    public boolean isCreatorProperty() { return true; }
+
     /*
     /**********************************************************************
     /* Overridden methods, other

src/main/java/tools/jackson/databind/deser/SettableBeanProperty.java

@@ -354,8 +354,6 @@ public void markAsIgnorable() { }
 
     /**
      * Whether this property requires merging of values (read-then-write)
-     *
-     * @since 2.20
      */
     public boolean isMerging() {
         // Most are not merging so default to this implementation
@@ -488,6 +486,11 @@ public int getCreatorIndex() {
      */
     public boolean isInjectionOnly() { return false; } // overridden by CreatorProperty
 
+    /**
+     * Since 3.1
+     */
+    public boolean isCreatorProperty() { return false; } // overridden by CreatorProperty
+
     /*
     /**********************************************************************
     /* Public API
@@ -778,6 +781,9 @@ public void fixAccess(DeserializationConfig config) {
         @Override
         public boolean isInjectionOnly() { return delegate.isInjectionOnly(); }
 
+        @Override
+        public boolean isCreatorProperty() { return delegate.isCreatorProperty(); }
+
         @Override
         public AnnotatedMember getMember() {
             return delegate.getMember();

src/main/java/tools/jackson/databind/deser/bean/BeanDeserializer.java

@@ -1261,24 +1261,10 @@ protected Object deserializeUsingPropertyBasedWithExternalTypeId(JsonParser p, D
                 //   since it is not the bean
                 if (!ext.handlePropertyValue(p, ctxt, propName, null)) {
                     // Last creator property to set?
-                    if (buffer.assignParameter(creatorProp, _deserializeWithErrorWrapping(p, ctxt, creatorProp))) {
-                        t = p.nextToken(); // to move to following PROPERTY_NAME/END_OBJECT
-                        Object bean;
-                        try {
-                            bean = creator.build(ctxt, buffer);
-                        } catch (Exception e) {
-                            throw wrapAndThrow(e, _beanType.getRawClass(), propName, ctxt);
-                        }
-                        if (bean.getClass() != _beanType.getRawClass()) {
-                            // !!! 08-Jul-2011, tatu: Could theoretically support; but for now
-                            //   it's too complicated, so bail out
-                            return ctxt.reportBadDefinition(_beanType, String.format(
-                                    "Cannot create polymorphic instances with external type ids (%s -> %s)",
-                                    _beanType, bean.getClass()));
-                        }
-                        // 19-Feb-2021, tatu: [databind#3045] Better delegate
-                        return _deserializeWithExternalTypeId(p, ctxt, bean, ext);
-                    }
+                    // [databind#4690] cannot quit early as optimization any more
+                    // if (buffer.assignParameter(creatorProp, value)) { ... build ... }
+                    buffer.assignParameter(creatorProp,
+                            _deserializeWithErrorWrapping(p, ctxt, creatorProp));
                 }
                 continue;
             }

src/main/java/tools/jackson/databind/deser/impl/ExternalTypeHandler.java

@@ -4,6 +4,7 @@
 
 import tools.jackson.core.*;
 import tools.jackson.databind.*;
+import tools.jackson.databind.deser.CreatorProperty;
 import tools.jackson.databind.deser.SettableBeanProperty;
 import tools.jackson.databind.deser.bean.BeanPropertyMap;
 import tools.jackson.databind.deser.bean.PropertyBasedCreator;
@@ -303,13 +304,13 @@ public Object complete(JsonParser p, DeserializationContext ctxt,
 
             final SettableBeanProperty prop = extProp.getProperty();
             // also: if it's creator prop, fill in
-            if (prop.getCreatorIndex() >= 0) {
+            if (prop.isCreatorProperty()) {
                 buffer.assignParameter(prop, values[i]);
 
                 // [databind#999] And maybe there's creator property for type id too?
                 SettableBeanProperty typeProp = extProp.getTypeProperty();
                 // for now, should only be needed for creator properties, too
-                if ((typeProp != null) && (typeProp.getCreatorIndex() >= 0)) {
+                if (typeProp != null && typeProp.isCreatorProperty()) {
                     // 31-May-2018, tatu: [databind#1328] if id is NOT plain `String`, need to
                     //    apply deserializer... fun fun.
                     final Object v;
@@ -329,7 +330,7 @@ public Object complete(JsonParser p, DeserializationContext ctxt,
         // third: assign non-creator properties
         for (int i = 0; i < len; ++i) {
             SettableBeanProperty prop = _properties[i].getProperty();
-            if (prop.getCreatorIndex() < 0) {
+            if (!prop.isCreatorProperty()) {
                 prop.set(ctxt, bean, values[i]);
             }
         }