Final tweaks wrt #2951

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -9,8 +9,9 @@ Project: jackson-databind
 #2461: Nested `@JsonUnwrapped` property names not correctly handled
  (reported by @plovell)
  (fix contributed by @SandeepGaur2016)
-#2951: Allow inverting `@JsonProperty(access=)` so it can work differently
-  on server side and client side
+#2951: Allow inverting `@JsonProperty(access=)` with
+  `MapperFeature.INVERSE_READ_WRITE_ACCESS` to work differently on
+   server and client side
  (requested by @qianlong)
  (contributed by Geoffrey G)
 #4674: Allow setting global enum naming strategy similar to property naming strategy

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

@@ -854,12 +854,22 @@ public List<PropertyName> findAliases() {
     }
 
     public JsonProperty.Access findAccess() {
-        return fromMemberAnnotationsExcept(new WithMember<JsonProperty.Access>() {
+        JsonProperty.Access acc = fromMemberAnnotationsExcept(new WithMember<JsonProperty.Access>() {
             @Override
             public JsonProperty.Access withMember(AnnotatedMember member) {
                 return _annotationIntrospector.findPropertyAccess(member);
             }
         }, JsonProperty.Access.AUTO);
+
+        // [databind#2951] add feature to inverse access logic
+        if (_config.isEnabled(MapperFeature.INVERSE_READ_WRITE_ACCESS)) {
+            if (acc == JsonProperty.Access.READ_ONLY) {
+                acc = JsonProperty.Access.WRITE_ONLY;
+            } else if (acc == JsonProperty.Access.WRITE_ONLY) {
+                acc = JsonProperty.Access.READ_ONLY;
+            }
+        }
+        return acc;
     }
 
     /*
@@ -947,19 +957,6 @@ public JsonProperty.Access removeNonVisible(boolean inferMutators,
             acc = JsonProperty.Access.AUTO;
         }
 
-        // [databind#2951] add feature to inverse access logic
-        if (_config.isEnabled(MapperFeature.INVERSE_READ_WRITE_ACCESS)) {
-            switch (acc) {
-            case READ_ONLY:
-                acc = JsonProperty.Access.WRITE_ONLY;
-                break;
-            case WRITE_ONLY:
-                acc = JsonProperty.Access.READ_ONLY;
-                break;
-            default:
-            }
-        }
-
         switch (acc) {
         case READ_ONLY:
             // [databind#2719]: Need to add ignorals, first, keeping in mind

src/test/java/com/fasterxml/jackson/databind/deser/filter/ReadOrWriteOnlyTest.java

@@ -36,15 +36,6 @@ public int getY() {
         }
     }
 
-    // for [databind#2951], add feature to inverse access logic
-    static class ReadAWriteB {
-        @JsonProperty(access=JsonProperty.Access.READ_ONLY)
-        public int a = 1;
-
-        @JsonProperty(access=JsonProperty.Access.WRITE_ONLY)
-        public int b = 2;
-    }
-
     public static class Pojo935
     {
         private String firstName = "Foo";
@@ -140,6 +131,15 @@ public void setWorks(String works) {
         }
     }
 
+    // for [databind#2951], add feature to inverse access logic
+    static class ReadAWriteB {
+        @JsonProperty(access=JsonProperty.Access.READ_ONLY)
+        public int a = 1;
+
+        @JsonProperty(access=JsonProperty.Access.WRITE_ONLY)
+        public int b = 2;
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -161,22 +161,6 @@ public void testReadOnlyAndWriteOnly() throws Exception
         assertEquals(6, result.y);
     }
 
-    // [databind#2951] add feature to inverse access logic
-    @Test
-    public void testInverseReadOnlyAndWriteOnly() throws Exception {
-        ObjectMapper mapper = JsonMapper.builder()
-                .enable(MapperFeature.INVERSE_READ_WRITE_ACCESS)
-                .build();
-
-        String json = mapper.writeValueAsString(new ReadAWriteB());
-        assertEquals("{\"b\":2}", json);
-
-        ReadAWriteB result = mapper.readValue("{\"a\":5, \"b\":6}", ReadAWriteB.class);
-        assertNotNull(result);
-        assertEquals(5, result.a);
-        assertEquals(2, result.b);
-    }
-
     @Test
     public void testReadOnly935() throws Exception
     {
@@ -236,4 +220,20 @@ public void testIssue2779() throws Exception
         Bean2779 newBean = MAPPER.readValue(json, Bean2779.class);
         assertNotNull(newBean);
     }
+
+    // [databind#2951] add feature to inverse access logic
+    @Test
+    public void testInverseReadOnlyAndWriteOnly() throws Exception {
+        ObjectMapper mapper = JsonMapper.builder()
+                .enable(MapperFeature.INVERSE_READ_WRITE_ACCESS)
+                .build();
+
+        String json = mapper.writeValueAsString(new ReadAWriteB());
+        assertEquals("{\"b\":2}", json);
+
+        ReadAWriteB result = mapper.readValue("{\"a\":5, \"b\":6}", ReadAWriteB.class);
+        assertNotNull(result);
+        assertEquals(5, result.a);
+        assertEquals(2, result.b);
+    }
 }