Merge branch '2.19'

Author: cowtowncoder

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

@@ -254,9 +254,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean
             return _deserializeFromNonArray(p, ctxt);
         }
 
-        /* No good way to verify that we have an array... although could I guess
-         * check via JsonParser. So let's assume everything is working fine, for now.
-         */
+        // No good way to verify that we have an array... although could I guess
+        // check via JsonParser. So let's assume everything is working fine, for now.
         if (_injectables != null) {
             injectValues(ctxt, bean);
         }
@@ -354,7 +353,7 @@ protected Object _deserializeNonVanilla(JsonParser p, DeserializationContext ctx
             p.skipChildren();
         }
         // Ok; extra fields? Let's fail, unless ignoring extra props is fine
-        if (!_ignoreAllUnknown) {
+        if (!_ignoreAllUnknown && ctxt.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)) {
             ctxt.reportWrongTokenException(this, JsonToken.END_ARRAY,
                     "Unexpected JSON values; expected at most %d properties (in JSON Array)",
                     propCount);

src/test/java/tools/jackson/databind/struct/TestPOJOAsArray.java

@@ -308,9 +308,8 @@ public void testUnknownExtraProp() throws Exception
                 .without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
                 .readValue(json);
         assertNotNull(v);
-        // note: +1 for both so
-        assertEquals(v.value.x, 42);
-        assertEquals(v.value.y, 13);
+        assertEquals(42, v.value.x);
+        assertEquals(13, v.value.y);
         assertTrue(v.value.complete);
         assertEquals("Foobar", v.value.name);
     }