Fix #2118 and #2283

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1115,6 +1115,16 @@ Nate Bauernfeind (nbauernfeind@github)
   * Reported #2091: `ReferenceType` does not expose valid containedType
   (2.12.0)
 
+Xiang Zhang (zhangyangyu@github)
+  * Reported #2118: `JsonProperty.Access.READ_ONLY` does not work with "getter-as-setter"
+    Collections
+  (2.12.0)
+
+Yona Appletree (Yona-Appletree@github)
+  * Reported #2283: `JsonProperty.Access.READ_ONLY` fails with collections when a
+    property name is specified
+  (2.12.0)
+
 David Bidorff (bidorffOL@github)
   * Reported, contributed fix for #2719: `FAIL_ON_IGNORED_PROPERTIES` does not throw
     on `READONLY` properties with an explicit name

release-notes/VERSION-2.x

@@ -15,6 +15,10 @@ Project: jackson-databind
  (reported by Incara@github)
 #2091: `ReferenceType` does not expose valid containedType
  (reported by Nate B)
+#2118: `JsonProperty.Access.READ_ONLY` does not work with "getter-as-setter" `Collection`s
+ (reported by Xiang Z)
+#2283: `JsonProperty.Access.READ_ONLY` fails with collections when a property name is specified
+ (reported by Yona A)
 #2675: Support use of `Void` valued properties (`MapperFeature.ALLOW_VOID_VALUED_PROPERTIES`)
 #2683: Explicitly fail (de)serialization of `java.time.*` types in absence of
   registered custom (de)serializers

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

@@ -5,7 +5,6 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.fasterxml.jackson.databind.*;
 
@@ -872,12 +871,20 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
                     old.addAll(prop);
                 }
                 // replace the creatorProperty too, if there is one
-                _updateCreatorProperty(prop, _creatorProperties);
-                // [databind#2001]: New name of property was ignored previously? Remove from ignored
-                // 01-May-2018, tatu: I have a feeling this will need to be revisited at some point,
-                //   to avoid removing some types of removals, possibly. But will do for now.
-                if (_ignoredPropertyNames != null) {
-                    _ignoredPropertyNames.remove(name);
+                if (_updateCreatorProperty(prop, _creatorProperties)) {
+                    // [databind#2001]: New name of property was ignored previously? Remove from ignored
+                    // 01-May-2018, tatu: I have a feeling this will need to be revisited at some point,
+                    //   to avoid removing some types of removals, possibly. But will do for now.
+
+                    // 16-May-2020, tatu: ... and so the day came, [databind#2118] failed
+                    //    when explicit rename added to ignorals (for READ_ONLY) was suddenly
+                    //    removed from ignoral list. So, added a guard statement above so that
+                    //    ignoral is ONLY removed if there was matching creator property.
+                    //
+                    //    Chances are this is not the last tweak we need but... that bridge then etc
+                    if (_ignoredPropertyNames != null) {
+                        _ignoredPropertyNames.remove(name);
+                    }
                 }
             }
         }
@@ -1174,16 +1181,17 @@ private PropertyNamingStrategy _findNamingStrategy()
                     _config.canOverrideAccessModifiers());
     }
 
-    protected void _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
+    protected boolean _updateCreatorProperty(POJOPropertyBuilder prop, List<POJOPropertyBuilder> creatorProperties) {
 
         if (creatorProperties != null) {
             final String intName = prop.getInternalName();
             for (int i = 0, len = creatorProperties.size(); i < len; ++i) {
                 if (creatorProperties.get(i).getInternalName().equals(intName)) {
                     creatorProperties.set(i, prop);
-                    break;
+                    return true;
                 }
             }
         }
+        return false;
     }
 }

src/test/java/com/fasterxml/jackson/databind/deser/ReadOnlyDeser2719Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/ReadOnlyDeserFailOnUnknown2719Test.java

@@ -4,7 +4,7 @@
 
 import com.fasterxml.jackson.databind.*;
 
-public class ReadOnlyDeser2719Test extends BaseMapTest
+public class ReadOnlyDeserFailOnUnknown2719Test extends BaseMapTest
 {
     // [databind#2719]
     static class UserWithReadOnly {

src/test/java/com/fasterxml/jackson/failing/PropertyAccessReadOnly2118Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/ReadOnlyListDeser2118Test.java

@@ -1,17 +1,16 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.deser;
 
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
 
 import com.fasterxml.jackson.databind.*;
 
-public class PropertyAccessReadOnly2118Test extends BaseMapTest
+public class ReadOnlyListDeser2118Test extends BaseMapTest
 {
     // [databind#2118]
     static class SecurityGroup {
-
-        private List<SecurityGroupRule> securityGroupRules;
+        List<SecurityGroupRule> securityGroupRules;
 
         public SecurityGroup() {
             this.securityGroupRules = new ArrayList<>();
@@ -40,15 +39,21 @@ public String getId() {
         public void setId(String id) {
             this.id = id;
         }
+
+        @Override
+        public String toString() {
+            return "{SecurityGroupRule '"+id+"'}";
+        }
     }
 
+    private final ObjectMapper mapper = newJsonMapper();
+    
     // [databind#2118]
     public void testAccessReadOnly() throws Exception {
-        String data ="{\"security_group_rules\": [{\"id\": \"id1\"}, {\"id\": \"id2\"}, {\"id\": \"id3\"}, {\"id\": \"id4\"}]}";
-        ObjectMapper mapper = new ObjectMapper();
-// This would work around the issue:        
+        String data ="{\"security_group_rules\": [{\"id\": \"id1\"}]}";
+// This would work around the issue:
 //        mapper.disable(MapperFeature.USE_GETTERS_AS_SETTERS);
         SecurityGroup sg = mapper.readValue(data, SecurityGroup.class);
-        System.out.println(mapper.writeValueAsString(sg));
+        assertEquals(Collections.emptyList(), sg.securityGroupRules);
     }
 }

src/test/java/com/fasterxml/jackson/failing/ReadOnlyList2283Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/ReadOnlyListDeser2283Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.deser;
 
 import java.util.*;
 
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.databind.*;
 
 // [databind#2283]: ignore read-only Lists even if "getter-as-setter" enabled
-public class ReadOnlyList2283Test
+public class ReadOnlyListDeser2283Test
     extends BaseMapTest
 {
     static class RenamedToSameOnGetter {