Merge branch '2.17' into 2.18

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1785,6 +1785,11 @@ Peter Levart (plevart@github)
    a Converter that may return null for a non-null input
   (2.17.2)
 
+Susan Witts (susanw1@github)
+ * Reported #4607: `MismatchedInput`: No Object Id found for an instance of X to
+   assign to property '@id'
+  (2.17.2)
+
 Ulf Dreyer (u3r@github)
  * Reported #4085: `@JsonView` does not work on class-level for records
   (2.18.0)

release-notes/VERSION-2.x

@@ -66,6 +66,9 @@ Project: jackson-databind
  (reported by @dmelisso)
 #4595: No way to explicitly disable wrapping in custom annotation processor
  (reported by @SimonCockx)
+#4607: `MismatchedInput`: No Object Id found for an instance of X to
+  assign to property '@id'
+ (reported by Susan W)
 #4610: `DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS` does not work when
  used with Polymorphic type handling
  (fix by Joo-Hyuk K)

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

@@ -363,15 +363,18 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
         final Object bean = _valueInstantiator.createUsingDefault(ctxt);
         // [databind#631]: Assign current value, to be accessible by custom deserializers
         p.assignCurrentValue(bean);
+
+        // First: do we have native Object Ids (like YAML)?
         if (p.canReadObjectId()) {
             Object id = p.getObjectId();
             if (id != null) {
                 _handleTypedObjectId(p, ctxt, bean, id);
             }
         }
         // [databind#3838]: since 2.16 Uniform handling of missing objectId
-        // only for the specific "empty JSON Object" case
-        if (_objectIdReader != null && p.hasTokenId(JsonTokenId.ID_END_OBJECT)) {
+        // only for the specific "empty JSON Object" case (and only for non-Native
+        // Object Ids, see [databind#4607]
+        else if (_objectIdReader != null && p.hasTokenId(JsonTokenId.ID_END_OBJECT)) {
             // [databind#4610]: check if we are to skip failure
             if (ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS)) {
                 ctxt.reportUnresolvedObjectId(_objectIdReader, bean);