Fix #3368

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -8,6 +8,9 @@ Project: jackson-databind
 
 #3344: `Set.of()` (Java 9) cannot be deserialized with polymorphic handling
  (reported by Sam K)
+#3368: `SnakeCaseStrategy` causes unexpected `MismatchedInputException` during
+  deserialization
+ (reported by sszuev@github)
 #3369: Deserialization ignores other Object fields when Object or Array
   value used for enum
  (reported by Krishna G)

src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertiesCollector.java

@@ -446,19 +446,20 @@ protected void collectAll()
             property.mergeAnnotations(_forSerialization);
         }
 
-        // Sort by visibility (explicit over implicit); drop all but first of member
-        // type (getter, setter etc) if there is visibility difference
-        for (POJOPropertyBuilder property : props.values()) {
-            property.trimByVisibility();
-        }
-
         // And use custom naming strategy, if applicable...
-        // As per [databind#2979], should be AFTER trimming
+        // 18-Jan-2021, tatu: To be done before trimming, to resolve
+        //   [databind#3368]
         PropertyNamingStrategy naming = _findNamingStrategy();
         if (naming != null) {
             _renameUsing(props, naming);
         }
 
+        // Sort by visibility (explicit over implicit); drop all but first of member
+        // type (getter, setter etc) if there is visibility difference
+        for (POJOPropertyBuilder property : props.values()) {
+            property.trimByVisibility();
+        }
+
         // and, if required, apply wrapper name: note, MUST be done after
         // annotations are merged.
         if (_config.isEnabled(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)) {

src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java

@@ -3,6 +3,7 @@
 import java.lang.annotation.*;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.*;
 
@@ -143,6 +144,34 @@ protected SnakeNameBean(@Name("id") String id,
         }
     }
 
+    @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+    static class Value3368 {
+        private String timeZone;
+        private String utcZone;
+
+        @JsonProperty("time_zone")
+        void unpackTimeZone(Map<String, String> timeZone) {
+            this.setTimeZone(timeZone.get("name"));
+            this.setUtcZone(timeZone.get("utc_zone"));
+        }
+
+        public String getTimeZone() {
+            return this.timeZone;
+        }
+
+        public String getUtcZone() {
+            return this.utcZone;
+        }
+
+        public void setTimeZone(String timeZone) {
+            this.timeZone = timeZone;
+        }
+
+        public void setUtcZone(String utcZone) {
+            this.utcZone = utcZone;
+        }
+    }
+
     /*
     /**********************************************************
     /* Set up
@@ -346,6 +375,20 @@ public void testLowerCaseUnchangedNames() throws Exception
         assertEquals("_x", result._x);
     }
 
+    // [databind#3368]
+    public void testSnakeCase3368() throws Exception
+    {
+        String test = "    {\n" +
+"      \"time_zone\": {\n" +
+"        \"name\": \"XXX\",\n" +
+"        \"utc_zone\": \"ZZZ\"\n" +
+"      }\n" +
+"    }";
+        Value3368 res = sharedMapper().readerFor(Value3368.class).readValue(test);
+        assertEquals("XXX", res.getTimeZone());
+        assertEquals("ZZZ", res.getUtcZone());
+    }
+
     /*
     /**********************************************************
     /* Test methods for UPPER_SNAKE_CASE