Minor post-merge cleanup

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1178,6 +1178,10 @@ Baptiste Pernet (sp4ce@github)
     of `@JsonIgnoreProperties`)
   (2.12.0)
 
+Dominik Krebhan (dominikrebhan@github)
+  * Contributed #1458: `@JsonAnyGetter` should be allowed on a field
+  (2.12.0)
+ 
 Patrick Jungermann (pjungermann@github)
   * Requested #1852: Allow case insensitive deserialization of String value into
   `boolean`/`Boolean` (esp for Excel)

release-notes/VERSION-2.x

@@ -7,6 +7,8 @@ Project: jackson-databind
 
 2.12.0-rc2 (not yet released)
 
+#1458: `@JsonAnyGetter` should be allowed on a field
+ (contributed by Dominik K)
 #2775: Disabling `FAIL_ON_INVALID_SUBTYPE` breaks polymorphic deserialization of Enums
  (reported by holgerknoche@github)
 #2878: Revert change initially made to fix #2805: change in signature

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

@@ -214,7 +214,18 @@ public AnnotatedMember getJsonValueAccessor()
     }
 
     /**
-     * @since 2.12
+     * Alias for {@link #getAnyGetterMethod()}.
+     *
+     * @deprecated Since 2.12 use separate {@link #getAnyGetterMethod()} and
+     *     {@link #getAnyGetterField()}.
+     */
+    @Deprecated // since 2.12
+    public AnnotatedMember getAnyGetter() {
+        return getAnyGetterMethod();
+    }
+
+    /**
+     * @since 2.12 (before only had "getAnyGetter()")
      */
     public AnnotatedMember getAnyGetterField()
     {
@@ -231,6 +242,9 @@ public AnnotatedMember getAnyGetterField()
         return null;
     }
 
+    /**
+     * @since 2.12 (before only had "getAnyGetter()")
+     */
     public AnnotatedMember getAnyGetterMethod()
     {
         if (!_collected) {
@@ -721,7 +735,7 @@ protected void _addSetterMethod(Map<String, POJOPropertyBuilder> props,
         }
         // 27-Dec-2019, tatu: [databind#2527] may need to rename according to field
         implName = _checkRenameByField(implName);
-        boolean ignore = ai != null && ai.hasIgnoreMarker(m);
+        boolean ignore = (ai != null) && ai.hasIgnoreMarker(m);
         _property(props, implName).addSetter(m, pn, nameExplicit, visible, ignore);
     }
 

src/test/java/com/fasterxml/jackson/databind/access/TestAnyGetterAccess.java

@@ -34,22 +34,6 @@ public void set(String name, String value) {
         }
     }
 
-    static class DynaFieldBean {
-        public int id;
-
-        @JsonAnyGetter
-        @JsonAnySetter
-        protected HashMap<String,String> other = new HashMap<String,String>();
-
-        public Map<String,String> any() {
-            return other;
-        }
-
-        public void set(String name, String value) {
-            other.put(name, value);
-        }
-    }
-
     static class PrivateThing
     {
         @JsonAnyGetter
@@ -81,18 +65,6 @@ public void testDynaBean() throws Exception
         assertEquals("Joe", result.other.get("name"));
     }
 
-    public void testDynaFieldBean() throws Exception
-    {
-        DynaFieldBean b = new DynaFieldBean();
-        b.id = 123;
-        b.set("name", "Billy");
-        assertEquals("{\"id\":123,\"name\":\"Billy\"}", MAPPER.writeValueAsString(b));
-
-        DynaFieldBean result = MAPPER.readValue("{\"id\":2,\"name\":\"Joe\"}", DynaFieldBean.class);
-        assertEquals(2, result.id);
-        assertEquals("Joe", result.other.get("name"));
-    }
-
     public void testPrivate() throws Exception
     {
         String json = MAPPER.writeValueAsString(new PrivateThing());

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

@@ -163,13 +163,43 @@ public Map<String, String> getProperties() {
     @JsonFilter("Bean2592")
     static class Bean2592WithFilter extends Bean2592NoAnnotations {}
 
+    // [databind#1458]: Allow `@JsonAnyGetter` on fields too
+    static class DynaFieldBean {
+        public int id;
+
+        @JsonAnyGetter
+        @JsonAnySetter
+        protected HashMap<String,String> other = new HashMap<String,String>();
+
+        public Map<String,String> any() {
+            return other;
+        }
+
+        public void set(String name, String value) {
+            other.put(name, value);
+        }
+    }
+
+    // [databind#1458]: Allow `@JsonAnyGetter` on fields too
+    public void testDynaFieldBean() throws Exception
+    {
+        DynaFieldBean b = new DynaFieldBean();
+        b.id = 123;
+        b.set("name", "Billy");
+        assertEquals("{\"id\":123,\"name\":\"Billy\"}", MAPPER.writeValueAsString(b));
+
+        DynaFieldBean result = MAPPER.readValue("{\"id\":2,\"name\":\"Joe\"}", DynaFieldBean.class);
+        assertEquals(2, result.id);
+        assertEquals("Joe", result.other.get("name"));
+    }
+
     /*
     /**********************************************************
     /* Test methods
     /**********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testSimpleAnyBean() throws Exception
     {