Minor post-merge cleanup (naming); catch an unhandled runtime exception wrt initialization

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -1801,7 +1801,7 @@ public TypeDeserializer findTypeDeserializer(DeserializationConfig config,
         //    map to better type here
         try {
             return b.buildTypeDeserializer(config, baseType, subtypes);
-        } catch (IllegalArgumentException e0) {
+        } catch (IllegalArgumentException | IllegalStateException e0) {
             InvalidDefinitionException e = InvalidDefinitionException.from((JsonParser) null,
                     ClassUtil.exceptionMessage(e0), baseType);
             e.initCause(e0);
@@ -2015,7 +2015,7 @@ public TypeDeserializer findPropertyTypeDeserializer(DeserializationConfig confi
                 config, annotated, baseType);
         try {
             return b.buildTypeDeserializer(config, baseType, subtypes);
-        } catch (IllegalArgumentException e0) {
+        } catch (IllegalArgumentException | IllegalStateException e0) {
             InvalidDefinitionException e = InvalidDefinitionException.from((JsonParser) null,
                     ClassUtil.exceptionMessage(e0), baseType);
             e.initCause(e0);

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsDeductionTypeDeserializer.java

@@ -15,12 +15,14 @@
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 
 /**
- * A {@link TypeDeserializer} capable of deducing polymorphic types based on the fields available. Deduction
- * is limited to the <i>names</i> of child fields (not their values or, consequently, any nested descendants).
- * Exceptions will be thrown if not enough unique information is present to select a single subtype.
+ * A {@link TypeDeserializer} capable of deducing polymorphic types based on the
+ * fields available. Deduction is limited to the <i>names</i> of child properties
+ * (not their values or, consequently, any nested descendants).
+ * Exceptions will be thrown if not enough unique information is present
+ * to select a single subtype.
  * <p>
- * The current deduction process <b>does not</b> support pojo-hierarchies such that the
- * absence of child fields infers a parent type. That is, every deducible subtype
+ * The current deduction process <b>does not</b> support pojo-hierarchies such that
+ * the absence of child fields infers a parent type. That is, every deducible subtype
  * MUST have some unique fields and the input data MUST contain said unique fields
  * to provide a <i>positive match</i>.
  */
@@ -33,7 +35,9 @@ public class AsDeductionTypeDeserializer extends AsPropertyTypeDeserializer
     // Bitmap of available fields in each subtype (including its parents)
     private final Map<BitSet, String> subtypeFingerprints;
 
-    public AsDeductionTypeDeserializer(JavaType bt, TypeIdResolver idRes, JavaType defaultImpl, DeserializationConfig config, Collection<NamedType> subtypes) {
+    public AsDeductionTypeDeserializer(JavaType bt, TypeIdResolver idRes, JavaType defaultImpl,
+            DeserializationConfig config, Collection<NamedType> subtypes)
+    {
         super(bt, idRes, null, false, defaultImpl, null);
         fieldBitIndex = new HashMap<>();
         subtypeFingerprints = buildFingerprints(config, subtypes);

src/main/java/com/fasterxml/jackson/databind/jsontype/impl/AsPropertyTypeDeserializer.java

@@ -3,15 +3,12 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.util.JsonParserSequence;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.MapperFeature;
+
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
@@ -31,9 +28,10 @@ public class AsPropertyTypeDeserializer extends AsArrayTypeDeserializer
 
     protected final As _inclusion;
 
-    protected final String msgMissingId = _property == null ?
-      String.format("missing type id property '%s'", _typePropertyName) :
-      String.format("missing type id property '%s' (for POJO property '%s')", _typePropertyName, _property.getName());
+    // @since 2.12.2 (see [databind#3055]
+    protected final String _msgForMissingId = (_property == null)
+            ? String.format("missing type id property '%s'", _typePropertyName)
+            : String.format("missing type id property '%s' (for POJO property '%s')", _typePropertyName, _property.getName());
 
     /**
      * @since 2.8
@@ -95,7 +93,7 @@ public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ct
              * But this can also be due to some custom handling: so, if "defaultImpl"
              * is defined, it will be asked to handle this case.
              */
-            return _deserializeTypedUsingDefaultImpl(p, ctxt, null, msgMissingId);
+            return _deserializeTypedUsingDefaultImpl(p, ctxt, null, _msgForMissingId);
         }
         // Ok, let's try to find the property. But first, need token buffer...
         TokenBuffer tb = null;
@@ -114,7 +112,7 @@ public Object deserializeTypedFromObject(JsonParser p, DeserializationContext ct
             tb.writeFieldName(name);
             tb.copyCurrentStructure(p);
         }
-        return _deserializeTypedUsingDefaultImpl(p, ctxt, tb, msgMissingId);
+        return _deserializeTypedUsingDefaultImpl(p, ctxt, tb, _msgForMissingId);
     }
 
     protected Object _deserializeTypedForId(JsonParser p, DeserializationContext ctxt,
@@ -139,9 +137,17 @@ protected Object _deserializeTypedForId(JsonParser p, DeserializationContext ctx
         return deser.deserialize(p, ctxt);
     }
 
+    @Deprecated // since 2.12.2 (remove from 2.14 or later)
+    protected Object _deserializeTypedUsingDefaultImpl(JsonParser p,
+            DeserializationContext ctxt, TokenBuffer tb) throws IOException {
+        return _deserializeTypedUsingDefaultImpl(p, ctxt, tb, null);
+    }
+
     // off-lined to keep main method lean and mean...
+    // @since 2.12.2 (last arg added)
     protected Object _deserializeTypedUsingDefaultImpl(JsonParser p,
-            DeserializationContext ctxt, TokenBuffer tb, String priorFailureMsg) throws IOException
+            DeserializationContext ctxt, TokenBuffer tb, String priorFailureMsg)
+        throws IOException
     {
         // May have default implementation to use
         // 13-Oct-2020, tatu: As per [databind#2775], need to be careful to

src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeduction.java

@@ -3,17 +3,19 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+
 import static com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION;
 
@@ -152,7 +154,7 @@ public void testAmbiguousClasses() throws Exception {
               .build();
       /*Cat cat =*/ mapper.readValue(liveCatJson, Cat.class);
       fail("Should not get here");
-    } catch (IllegalStateException e) {
+    } catch (InvalidDefinitionException e) {
         verifyException(e, "Subtypes ");
         verifyException(e, "have the same signature");
         verifyException(e, "cannot be uniquely deduced");