Merge branch '2.x' into 2.x

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java

@@ -496,7 +496,6 @@ public SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser)
         }
     }
 
-
     /**
      * [databind#562] Allow @JsonAnySetter on Creator constructor
      *
@@ -539,7 +538,6 @@ protected void _set(Object instance, Object propName, Object value)
 
         @Override
         public Object createParameterObject() { return new HashMap<>(); }
-
     }
 
     /**
@@ -590,7 +588,5 @@ public SettableAnyProperty withValueDeserializer(JsonDeserializer<Object> deser)
 
         @Override
         public Object createParameterObject() { return _nodeFactory.objectNode(); }
-
     }
-
 }

src/main/java/com/fasterxml/jackson/databind/ser/ContainerSerializer.java

@@ -10,6 +10,9 @@
  * {@link java.util.Collection}s (<code>Lists</code>, <code>Sets</code>
  * etc) and {@link java.util.Map}s and iterable things
  * ({@link java.util.Iterator}s).
+ *<p>
+ * NOTE: in Jackson 3.x, this class is renamed {@code StdContainerSerializer}
+ * (in package {@code tools.jackson.databind.ser.std}).
  */
 @SuppressWarnings("serial")
 public abstract class ContainerSerializer<T>
@@ -35,8 +38,6 @@ protected ContainerSerializer(JavaType fullType) {
     /**
      * Alternate constructor that is (alas!) needed to work
      * around kinks of generic type handling
-     *
-     * @param t
      */
     protected ContainerSerializer(Class<?> t, boolean dummy) {
         super(t, dummy);

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

@@ -79,7 +79,7 @@ enum MixinOverloadedDefault {
         A,
         @JsonEnumDefaultValue
         B,
-        @JsonEnumDefaultValue
+        // Let's leave one un-annotated:
         C,
         @JsonEnumDefaultValue
         Z;
@@ -305,7 +305,9 @@ public void testFirstEnumDefaultValueViaMixin() throws Exception
                 .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)
                 .addMixIn(BaseOverloaded.class, MixinOverloadedDefault.class)
                 .build();
-        
+
+        // While not guaranteed by annotation Javadocs, default implementation does
+        // pick the first annotated enum value (in declaration order))
         assertEquals(BaseOverloaded.A, 
                 mixinMapper.readValue(q("UNKNOWN"), BaseOverloaded.class));
     }

src/test/java/com/fasterxml/jackson/databind/ext/CglibFiltering5354Test.java

@@ -0,0 +1,52 @@
+package com.fasterxml.jackson.databind.ext;
+
+import static com.fasterxml.jackson.databind.testutil.DatabindTestUtil.newJsonMapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.hibernate.repackage.cglib.MockedHibernateCglibProxy;
+import org.junit.jupiter.api.Test;
+import org.springframework.cglib.proxy.MockedSpringCglibProxy;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import net.sf.cglib.MockedNetCglibProxy;
+
+// [databind#5354] Test for filtering out CGLIB-generated properties
+public class CglibFiltering5354Test
+{
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    @Test
+    public void testWriteWithSpringCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        MockedSpringCglibProxy mockedProxy = new MockedSpringCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(properties.keySet(), Collections.singleton("propertyName"));
+    }
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    @Test
+    public void testWriteWithHibernateCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        MockedHibernateCglibProxy mockedProxy = new MockedHibernateCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(properties.keySet(), Collections.singleton("propertyName"));
+    }
+
+    // https://github.com/FasterXML/jackson-databind/issues/5354
+    @Test
+    public void testWriteWithNetCglibProxyDoesNotIncludeCallbacksProperty() throws Exception
+    {
+        MockedNetCglibProxy mockedProxy = new MockedNetCglibProxy("hello");
+        String json = MAPPER.writeValueAsString(mockedProxy);
+        Map<?, ?> properties = MAPPER.readValue(json, Map.class);
+        assertEquals(properties.keySet(), Collections.singleton("propertyName"));
+    }
+
+}

src/test/java/com/fasterxml/jackson/databind/misc/IPhoneStyleProperty5335Test.java

@@ -0,0 +1,54 @@
+package com.fasterxml.jackson.databind.misc;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [databind#5335]
+public class IPhoneStyleProperty5335Test
+    extends DatabindTestUtil
+{
+    @JsonPropertyOrder({"aProp", "anotherProp"})
+    static class TestPojo {
+        private String aProp;
+        private String anotherProp;
+
+        public String getaProp() {
+            return 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() throws Exception
+    {
+      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);
+    }
+}

src/test/java/com/fasterxml/jackson/databind/ser/AnyGetterOrdering4388Test.java

@@ -47,7 +47,8 @@ static class PojoUnwrappedVersion1 extends BaseWithProperties {
     @JsonPropertyOrder({"entityId", "totalTests", "childEntities", "entityName", "products"})
     static class PojoUnwrappedVersion2 extends BaseWithProperties {
     }
-
+    
+    @JsonPropertyOrder({"child1", "child2"})
     static class Location {
         public int child1;
         public int child2;
@@ -60,6 +61,7 @@ static class IgnorePropertiesOnFieldPojo {
         public Map<String, Object> map = new HashMap<>();
     }
 
+    @JsonPropertyOrder({"a", "b"})
     static class IgnorePropertiesOnAnyGetterPojo {
         public int a = 1, b = 2;
         @JsonIgnoreProperties("b")

src/test/java/com/fasterxml/jackson/databind/ser/enums/EnumAsFormatObject4564Test.java

@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
-
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,9 +18,9 @@
 // [databind#4564] Fix Enum-asJSON-Object serialization with self as field.
 public class EnumAsFormatObject4564Test
 {
-
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     @JsonInclude(JsonInclude.Include.NON_NULL)
+    @JsonPropertyOrder({"label", "sublevel"})
     public enum Level {
         LEVEL1("level1"),
         LEVEL2("level2"),

src/test/java/com/fasterxml/jackson/databind/tofix/AnyGetterNameConflictSerialization5342Test.java

@@ -0,0 +1,81 @@
+package com.fasterxml.jackson.databind.tofix;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.*;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+// [databind#5342] JsonAnyGetter method serialization can override JsonProperty serialization on serialized name conflict
+public class AnyGetterNameConflictSerialization5342Test
+    extends DatabindTestUtil
+{
+    public static class Pojo5342 {
+        @JsonIgnore
+        private Map<String, Object> additionalProperties;
+        @JsonProperty(value = "additionalProperties")
+        private Map<String, Object> hidden;
+
+        @JsonAnySetter
+        private void additionalProperties(String key, Object value) {
+            if (additionalProperties == null) {
+                additionalProperties = new HashMap<>();
+            }
+            additionalProperties.put(key.replace("\\.", "."), value);
+        }
+
+        @JsonAnyGetter
+        public Map<String, Object> additionalProperties() {
+            return additionalProperties;
+        }
+
+        public Map<String, Object> hidden() {
+            return hidden;
+        }
+
+        public void hidden(Map<String, Object> additionalPropertiesProperty) {
+            this.hidden = additionalPropertiesProperty;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    @JacksonTestFailureExpected
+    @Test
+    public void anyGetter5342()
+        throws Exception
+    {
+        Pojo5342 pojo = new Pojo5342();
+        pojo.additionalProperties("foo", "bar");
+
+        Map<String, Object> hidden = new HashMap<>();
+        hidden.put("fizz", "buzz");
+        pojo.hidden(hidden);
+
+
+        String JSON = MAPPER.writeValueAsString(pojo);
+        // was in 2.18 : {"foo":"bar","additionalProperties": {"fizz":"buzz"}}
+        // now in 2.19 : {"foo":"bar"}... need FIX!
+        // any-getter
+        assertThat(JSON).contains("\"foo\":\"bar\"");
+        // hidden field
+        assertThat(JSON).contains("\"additionalProperties\":{\"fizz\":\"buzz\"}");
+
+        // Try deserializing back
+        Pojo5342 actual = MAPPER.readValue(JSON, Pojo5342.class);
+        assertNotNull(actual.additionalProperties());
+        assertEquals(1, actual.additionalProperties.size());
+        assertNotNull(actual.hidden());
+        assertEquals(1, actual.hidden().size());
+    }
+
+}

src/test/java/net/sf/cglib/Callback.java

@@ -0,0 +1,9 @@
+package net.sf.cglib;
+
+/**
+ * A mock object to test if a method is returning cglib's
+ * {@code Callback[] getCallbacks()} found on a cglib proxy object.
+ * @author Rob Winch
+ */
+public class Callback {
+}

src/test/java/net/sf/cglib/MockedNetCglibProxy.java

@@ -0,0 +1,22 @@
+package net.sf.cglib;
+
+/**
+ * A mock Proxy object used to test writing a cglib proxy object.
+ * @author Rob Winch
+ */
+public class MockedNetCglibProxy {
+
+    private final String propertyName;
+
+    public MockedNetCglibProxy(String propertyName) {
+        this.propertyName = propertyName;
+    }
+
+    public String getPropertyName() {
+        return this.propertyName;
+    }
+
+    public Callback[] getCallbacks() {
+        return new Callback[] { new Callback(), new Callback() };
+    }
+}