FORGE-1967: UIInput/UISelectOne.hasValue() and hasDefaultValue() shou…

…ld return false if an empty string
forge · Aug 2, 2014 · d7c73c0 · d7c73c0
1 parent 4b38afc
commit d7c73c0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UIInputImpl.java
@@ -18,6 +18,7 @@
 import org.jboss.forge.addon.ui.input.ValueChangeListener;
 import org.jboss.forge.addon.ui.util.InputComponents;
 import org.jboss.forge.furnace.util.Callables;
+import org.jboss.forge.furnace.util.Strings;
 
 /**
  * Implementation of a {@link UIInput} object
@@ -109,12 +110,21 @@ public String toString()
    @Override
    public boolean hasDefaultValue()
    {
-      return Callables.call(defaultValue) != null;
+      VALUETYPE defaultValueValue = Callables.call(defaultValue);
+      if (defaultValueValue instanceof String)
+      {
+         return !Strings.isNullOrEmpty((String) defaultValueValue);
+      }
+      return defaultValueValue != null;
    }
 
    @Override
    public boolean hasValue()
    {
+      if (value instanceof String)
+      {
+         return !Strings.isNullOrEmpty((String) value);
+      }
       return value != null;
    }
 }
diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectOneImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/input/UISelectOneImpl.java
@@ -13,6 +13,7 @@
 import org.jboss.forge.addon.ui.input.ValueChangeListener;
 import org.jboss.forge.addon.ui.util.InputComponents;
 import org.jboss.forge.furnace.util.Callables;
+import org.jboss.forge.furnace.util.Strings;
 
 /**
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -65,12 +66,21 @@ public VALUETYPE getValue()
    @Override
    public boolean hasDefaultValue()
    {
-      return Callables.call(defaultValue) != null;
+      VALUETYPE defaultValueValue = Callables.call(defaultValue);
+      if (defaultValueValue instanceof String)
+      {
+         return !Strings.isNullOrEmpty((String) defaultValueValue);
+      }
+      return defaultValueValue != null;
    }
 
    @Override
    public boolean hasValue()
    {
+      if (value instanceof String)
+      {
+         return !Strings.isNullOrEmpty((String) value);
+      }
       return value != null;
    }
 

diff --git a/ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputDefaultValueTest.java b/ui/tests/src/test/java/org/jboss/forge/addon/ui/impl/UIInputDefaultValueTest.java
@@ -57,6 +57,9 @@ public static ForgeArchive getDeployment()
    @WithAttributes(label = "")
    private UIInput<String> stringNoDefault;
 
+   @Inject
+   private UIInput<String> stringValue;
+
    @Test
    public void testBooleanInputWithDefaultValue()
    {
@@ -88,4 +91,13 @@ public void testStringInputNoDefaultValue()
       Assert.assertFalse(stringNoDefault.hasValue());
       Assert.assertNull(stringNoDefault.getValue());
    }
+
+   @Test
+   public void testStringEmptyInputNoDefaultValue()
+   {
+      stringValue.setValue("");
+      Assert.assertFalse(stringValue.hasValue());
+      stringValue.setDefaultValue("");
+      Assert.assertFalse(stringValue.hasDefaultValue());
+   }
 }