Issue #112 Hack to avoid detecting getter with one parameter as setter

nmorel · May 14, 2017 · 3768687 · 3768687
1 parent 4583249
commit 3768687
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/gwt-jackson/src/main/java/com/github/nmorel/gwtjackson/rebind/property/PropertyParser.java b/gwt-jackson/src/main/java/com/github/nmorel/gwtjackson/rebind/property/PropertyParser.java
@@ -145,7 +145,7 @@ private static void parseMethods( TreeLogger logger, JClassType type, Map<String
 
             if ( method.getParameters().length == 0 ) {
                 // might be a getter
-                String fieldName = extractFieldNameFromGetterSetterMethodName( method.getName() );
+                String fieldName = extractFieldNameFromGetterSetterMethodName( method.getName(), true );
                 PropertyAccessorsBuilder property = propertiesMap.get( fieldName );
                 if ( null == property ) {
                     property = new PropertyAccessorsBuilder( fieldName );
@@ -154,7 +154,7 @@ private static void parseMethods( TreeLogger logger, JClassType type, Map<String
                 property.addGetter( method, mixin );
             } else if ( method.getParameters().length == 1 || (method.getParameters().length == 2 && method.isAnnotationPresent( JsonAnySetter.class )) ) {
                 // might be a setter
-                String fieldName = extractFieldNameFromGetterSetterMethodName( method.getName() );
+                String fieldName = extractFieldNameFromGetterSetterMethodName( method.getName(), false );
                 PropertyAccessorsBuilder property = propertiesMap.get( fieldName );
                 if ( null == property ) {
                     property = new PropertyAccessorsBuilder( fieldName );
@@ -165,11 +165,11 @@ private static void parseMethods( TreeLogger logger, JClassType type, Map<String
         }
     }
 
-    private static String extractFieldNameFromGetterSetterMethodName( String methodName ) {
+    private static String extractFieldNameFromGetterSetterMethodName( String methodName, boolean getter ) {
         String fieldName;
-        if ( methodName.startsWith( "is" ) && methodName.length() > 2 ) {
+        if ( getter && methodName.startsWith( "is" ) && methodName.length() > 2 ) {
             fieldName = methodName.substring( 2 );
-        } else if ( (methodName.startsWith( "get" ) || methodName.startsWith( "set" )) && methodName.length() > 3 ) {
+        } else if ( ((getter && methodName.startsWith( "get" )) || (!getter && methodName.startsWith( "set" ))) && methodName.length() > 3 ) {
             fieldName = methodName.substring( 3 );
         } else {
             fieldName = methodName;

diff --git a/...ackson/src/test/java/com/github/nmorel/gwtjackson/shared/mapper/PropertyNamingTester.java b/...ackson/src/test/java/com/github/nmorel/gwtjackson/shared/mapper/PropertyNamingTester.java
@@ -16,6 +16,9 @@
 
 package com.github.nmorel.gwtjackson.shared.mapper;
 
+import java.util.Arrays;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.github.nmorel.gwtjackson.shared.AbstractTester;
 import com.github.nmorel.gwtjackson.shared.ObjectMapperTester;
@@ -27,10 +30,13 @@
  */
 public final class PropertyNamingTester extends AbstractTester {
 
-    @JsonPropertyOrder(alphabetic = true)
+    @JsonPropertyOrder( alphabetic = true )
     public static class PropertyNamingBean {
+
         private String simpleName;
-        private String HTML;
+
+        private List<String> HTML;
+
         private String HTMLParser;
 
         public String getSimpleName() {
@@ -41,14 +47,18 @@ public void setSimpleName( String simpleName ) {
             this.simpleName = simpleName;
         }
 
-        public String getHTML() {
+        public List<String> getHTML() {
             return HTML;
         }
 
-        public void setHTML( String HTML ) {
+        public void setHTML( List<String> HTML ) {
             this.HTML = HTML;
         }
 
+        public List<String> getHTML( String filter ) {
+            return HTML;
+        }
+
         public String getHTMLParser() {
             return HTMLParser;
         }
@@ -68,15 +78,15 @@ public void testValue( ObjectMapperTester<PropertyNamingBean> mapper ) {
 
         PropertyNamingBean bean = new PropertyNamingBean();
         bean.setSimpleName( "simple" );
-        bean.setHTML( "html" );
+        bean.setHTML( Arrays.asList("html") );
         bean.setHTMLParser( "htmlparser" );
 
         String json = mapper.write( bean );
-        assertEquals( "{\"html\":\"html\",\"htmlparser\":\"htmlparser\",\"simpleName\":\"simple\"}", json );
+        assertEquals( "{\"html\":[\"html\"],\"htmlparser\":\"htmlparser\",\"simpleName\":\"simple\"}", json );
 
         bean = mapper.read( json );
         assertEquals( "simple", bean.getSimpleName() );
-        assertEquals( "html", bean.getHTML() );
+        assertEquals( Arrays.asList("html"), bean.getHTML() );
         assertEquals( "htmlparser", bean.getHTMLParser() );
     }
 }