Merge pull request #2529 from jfdenise/WFCORE-2936

Fix for WFCORE-2936. Handle empty string in complex object
wildfly · Jun 14, 2017 · 2d977c8 · 2d977c8
2 parents 1a52675 + bad7fbf
commit 2d977c8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueCallbackHandler.java b/cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueCallbackHandler.java
@@ -125,6 +125,7 @@ public void leavingState(ParsingContext ctx) throws CommandFormatException {
             }
         } else if(QuotesState.ID.equals(stateId)) {
             flag ^= QUOTES;
+            currentState.quoted();
         } else if(EscapeCharacterState.ID.equals(stateId)) {
             flag ^= ESCAPE;
         }
@@ -169,6 +170,9 @@ interface ValueState {
         boolean isOnSeparator();
 
         void enteredValue();
+
+        default void quoted() {
+        }
     }
 
     class BytesState implements ValueState {
@@ -259,6 +263,7 @@ class DefaultValueState implements ValueState {
         protected boolean onSeparator;
 
         protected ModelNode child;
+        private boolean quoted;
 
         @Override
         public boolean isOnSeparator() {
@@ -348,6 +353,9 @@ private ModelNode getStringValue() {
             final ModelNode value = new ModelNode();
             if(buf != null) {
                 value.set(getTrimmedString());
+            } else if (quoted) {
+                // An empty String, just composed of 2 quotes.
+                value.set("");
             }
             return value;
         }
@@ -364,6 +372,11 @@ protected String getTrimmedString() {
             }
             return buf.toString();
         }
+
+        @Override
+        public void quoted() {
+            quoted = true;
+        }
     }
 
     class ListValueState implements ValueState {

diff --git a/cli/src/test/java/org/jboss/as/cli/parsing/test/ArgumentValueConverterTestCase.java b/cli/src/test/java/org/jboss/as/cli/parsing/test/ArgumentValueConverterTestCase.java
@@ -256,6 +256,16 @@ public void testObject_TextValue() throws Exception {
         assertEquals("text", value.asString());
     }
 
+    @Test
+    public void testObject_TextEmptyValue() throws Exception {
+        final ModelNode obj = parseObject("{x=\"\"}");
+        assertNotNull(obj);
+        assertEquals(ModelType.OBJECT, obj.getType());
+        ModelNode val = obj.get("x");
+        assertEquals(ModelType.STRING, val.getType());
+        assertEquals("", val.asString());
+    }
+
     protected ModelNode parseObject(String value) throws CommandFormatException {
         return ArgumentValueConverter.DEFAULT.fromString(ctx, value);
     }