Merge branch '2.x' into 3.x

Author: cowtowncoder

src/test/java/tools/jackson/databind/misc/IPhoneStyleProperty5335Test.java

@@ -0,0 +1,61 @@
+package tools.jackson.databind.misc;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.MapperFeature;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [databind#5335], due to [databind#2882]
+public class IPhoneStyleProperty5335Test
+    extends DatabindTestUtil
+{
+    @JsonPropertyOrder({ "aProp" })
+    static class TestPojo {
+        private String aProp;
+        private String anotherProp;
+
+        // Needed in 3.0 due to incompatible naming
+        @JsonProperty("aProp")
+        public String getaProp() {
+            return aProp;
+        }
+
+        // Needed in 3.0 due to incompatible naming
+        @JsonProperty("aProp")
+        public void setaProp(String aProp) {
+            this.aProp = aProp;
+        }
+
+        public String getAnotherProp() {
+            return anotherProp;
+        }
+
+        public void setAnotherProp(String anotherProp) {
+            this.anotherProp = anotherProp;
+        }
+    }
+
+    @Test
+    public void featureEnabledTest()
+    {
+        ObjectMapper mapper = JsonMapper.builder()
+              .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+              .enable(MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX)
+              .build();
+
+        String json = "{\"aProp\":\"aPropValue\",\"prop1\":\"prop1Value\"}";
+        TestPojo result = mapper.readValue(json, TestPojo.class);
+        assertEquals("aPropValue", result.getaProp());
+        String serialized = mapper.writeValueAsString(result);
+        assertEquals("{\"aProp\":\"aPropValue\",\"anotherProp\":null}",
+                serialized);
+    }
+}