Prefix boolean bean properties with "is_" only for methods that start…

… with "is"
tomj74 · Nov 30, 2018 · 527877f · 527877f
1 parent 2ba8b12
commit 527877f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/com/x5/util/ObjectDataMap.java b/src/main/java/com/x5/util/ObjectDataMap.java
@@ -472,7 +472,7 @@ public Getter(PropertyDescriptor property, Method getter)
 
             String paramName = property.getName();
             paramName = splitCamelCase(paramName);
-            if (this.valueClass.toString().equalsIgnoreCase("boolean")) {
+            if (getter.getName().startsWith("is")) {
                 paramName = "is_"+paramName;
             }
             this.name = paramName;
@@ -575,7 +575,7 @@ public Map<String,Object> mapifyBean(Object bean)
                         // converts getBookTitle() to book_title
                         String paramName = property.getName();
                         paramName = splitCamelCase(paramName);
-                        if (paramValue instanceof Boolean) {
+                        if (getter.getName().startsWith("is")) {
                             paramName = "is_"+paramName;
                         }
 

diff --git a/src/test/java/com/x5/template/ChunkTest.java b/src/test/java/com/x5/template/ChunkTest.java
@@ -817,6 +817,19 @@ public void snakeCaseTest()
         assertEquals("snake2_xml_case", ObjectDataMap.splitCamelCase("Snake2XMLCase"));
     }
 
+    @Test
+    public void beanBooleanTest()
+    {
+        Theme theme = new Theme();
+        Chunk c = theme.makeChunk();
+        c.append("{$x.is_active|ondefined(Active):Inactive}");
+        c.append(" {$x.has_lemons|ondefined(Lemon-Ready):Lemonless}");
+        ThingBean bean = new ThingBean();
+        c.set("x", bean);
+        bean.setActive(true);
+        assertEquals("Active Lemonless", c.toString());
+    }
+
     @Test
     public void circularPOJOTest()
     {
@@ -1058,6 +1071,7 @@ public static class ThingBean implements java.io.Serializable, Cloneable
         private double pi = Math.PI;
         private Double e = new Double(Math.E);
         private boolean isActive;
+        private boolean hasLemons;
         private ThingBean boss;
         private ThingBean[] children;
 
@@ -1103,6 +1117,11 @@ public boolean isActive()
             return isActive;
         }
 
+        public Boolean getHasLemons()
+        {
+            return hasLemons;
+        }
+
         public ThingBean getBoss()
         {
             return boss;