Test, logic fixes.

Author: cowtowncoder

src/main/java/tools/jackson/databind/ext/javatime/deser/MonthDeserializer.java

@@ -94,21 +94,26 @@ public Month deserialize(JsonParser p, DeserializationContext ctxt)
                 return (Month) ctxt.handleUnexpectedToken(getValueType(ctxt),
                         JsonToken.START_ARRAY, p, "Cannot deserialize `Month` from empty JSON Array");
             }
+            // Validate token shape before checking UNWRAP, so inputs like [true], [1.5]
+            // or [{}] get a token-type diagnostic instead of a misleading suggestion to
+            // enable UNWRAP_SINGLE_VALUE_ARRAYS (which would not help).
+            if (t != JsonToken.VALUE_NUMBER_INT
+                    && t != JsonToken.VALUE_STRING
+                    && t != JsonToken.VALUE_EMBEDDED_OBJECT) {
+                return _reportWrongToken(ctxt, JsonToken.VALUE_NUMBER_INT, Integer.class.getName());
+            }
             if (!ctxt.isEnabled(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)) {
                 return (Month) ctxt.handleUnexpectedToken(getValueType(ctxt),
                         JsonToken.START_ARRAY, p,
                         "Cannot deserialize `Month` out of START_ARRAY token: enable `DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS`");
             }
-            if ((t == JsonToken.VALUE_STRING || t == JsonToken.VALUE_EMBEDDED_OBJECT)) {
+            if (t == JsonToken.VALUE_STRING || t == JsonToken.VALUE_EMBEDDED_OBJECT) {
                 final Month parsed = deserialize(p, ctxt);
                 if (p.nextToken() != JsonToken.END_ARRAY) {
                     handleMissingEndArrayForSingle(p, ctxt);
                 }
                 return parsed;
             }
-            if (t != JsonToken.VALUE_NUMBER_INT) {
-                return _reportWrongToken(ctxt, JsonToken.VALUE_NUMBER_INT, Integer.class.getName());
-            }
             int month = p.getIntValue();
             if (p.nextToken() != JsonToken.END_ARRAY) {
                 throw ctxt.wrongTokenException(p, handledType(), JsonToken.END_ARRAY,

src/test/java/tools/jackson/databind/ext/javatime/deser/MonthDeserializerTest.java

@@ -324,11 +324,11 @@ public void testDeserializationAsArrayWithMoreThanOneElement() throws Exception
     @Test
     public void testDeserializationAsArrayWithWrongToken() throws Exception
     {
-        // [databind#5957]: Boolean in array without UNWRAP should fail (UNWRAP check fires first)
+        // [databind#5957]: Boolean is not a coercible token shape; report token-type mismatch
         assertError(
             () -> readerForOneBased().readValue("[true]"),
             MismatchedInputException.class,
-            "UNWRAP_SINGLE_VALUE_ARRAYS"
+            "Expected VALUE_NUMBER_INT"
         );
     }
 
@@ -346,22 +346,22 @@ public void testDeserializationAsArrayWithStringUnwrapDisabled() throws Exceptio
     @Test
     public void testDeserializationAsArrayWithFloatUnwrapDisabled() throws Exception
     {
-        // [databind#5957]: Float in array without UNWRAP should fail (UNWRAP check fires first)
+        // [databind#5957]: Float is not a coercible token shape; report token-type mismatch
         assertError(
             () -> readerForOneBased().readValue("[1.5]"),
             MismatchedInputException.class,
-            "UNWRAP_SINGLE_VALUE_ARRAYS"
+            "Expected VALUE_NUMBER_INT"
         );
     }
 
     @Test
     public void testDeserializationAsArrayWithObjectUnwrapDisabled() throws Exception
     {
-        // [databind#5957]: Object in array without UNWRAP should fail (UNWRAP check fires first)
+        // [databind#5957]: Object is not a coercible token shape; report token-type mismatch
         assertError(
             () -> readerForOneBased().readValue("[{}]"),
             MismatchedInputException.class,
-            "UNWRAP_SINGLE_VALUE_ARRAYS"
+            "Expected VALUE_NUMBER_INT"
         );
     }