Merge branch '2.12' into 2.13

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/deser/jdk/EnumDefaultReadTest.java

@@ -213,19 +213,19 @@ public void testEmptyStringAsDefault() throws Exception
         ObjectReader r = MAPPER.readerFor(SimpleEnumWithDefault.class)
                 .with(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE);
         assertEquals(SimpleEnumWithDefault.ONE,
-                r.readValue(quote("ONE")));
+                r.readValue(q("ONE")));
         assertEquals(SimpleEnumWithDefault.ZERO,
-                r.readValue(quote("Zero")));
+                r.readValue(q("Zero")));
         assertEquals(SimpleEnumWithDefault.ZERO,
-                r.readValue(quote("")));
+                r.readValue(q("")));
         assertEquals(SimpleEnumWithDefault.ZERO,
-                r.readValue(quote("    ")));
+                r.readValue(q("    ")));
 
         // Also check with `null` coercion as well
         ObjectReader r2 = MAPPER.readerFor(SimpleEnumWithDefault.class)
                 .with(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL);
-        assertNull(r2.readValue(quote("")));
-        assertNull(r2.readValue(quote("    ")));
+        assertNull(r2.readValue(q("")));
+        assertNull(r2.readValue(q("    ")));
     }
 
     private <T> void _verifyOkDeserialization(ObjectReader reader, String fromValue,