Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for WFCORE-6424, Generic command argument value issue with List containing Object #5574

Merged
merged 1 commit into from
Jul 7, 2023
Merged

Fix for WFCORE-6424, Generic command argument value issue with List containing Object #5574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion cli/src/main/java/org/jboss/as/cli/parsing/arguments/ArgumentValueCallbackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ public void enteredState(ParsingContext ctx) throws CommandFormatException {
currentState.enteredValue();
pushCurrentState();
}
currentState = new ListValueState();
if (ctx.getCharacter() == '{') {
currentState = new ObjectValueState();
} else {
currentState = new ListValueState();
}
} else if(ListItemSeparatorState.ID.equals(stateId)) {
currentState.itemSeparator();
} else if(NameValueSeparatorState.ID.equals(stateId)) {
Expand Down
37 changes: 37 additions & 0 deletions cli/src/test/java/org/jboss/as/cli/parsing/test/ArgumentValueConverterTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,43 @@ public void testPropertyList_SimpleCommaSeparatedInBrackets() throws Exception {
assertEquals("d", prop.getValue().asString());
}

@Test
public void testList_Object() throws Exception {
final ModelNode value = parseList("[{a1=vala1,a2=[{a3=vala3}]},{b1=valb1,b2=[{b3=valb3}]}]");
assertNotNull(value);
assertEquals(ModelType.LIST, value.getType());
final List<ModelNode> list = value.asList();
assertEquals(2, list.size());

ModelNode obj1 = list.get(0);
assertEquals(ModelType.OBJECT, obj1.getType());
assertNotNull(obj1);
assertEquals("vala1", obj1.get("a1").asString());
ModelNode obj2 = obj1.get("a2");
assertNotNull(obj2);
assertEquals(ModelType.LIST, obj2.getType());
final List<ModelNode> list2 = obj2.asList();
assertEquals(1, list2.size());
ModelNode obj3 = list2.get(0);
assertNotNull(obj3);
assertEquals(ModelType.OBJECT, obj3.getType());
assertEquals("vala3", obj3.get("a3").asString());

ModelNode obj4 = list.get(1);
assertEquals(ModelType.OBJECT, obj4.getType());
assertNotNull(obj4);
assertEquals("valb1", obj4.get("b1").asString());
ModelNode obj5 = obj4.get("b2");
assertNotNull(obj5);
assertEquals(ModelType.LIST, obj5.getType());
final List<ModelNode> list4 = obj5.asList();
assertEquals(1, list4.size());
ModelNode obj6 = list4.get(0);
assertNotNull(obj6);
assertEquals(ModelType.OBJECT, obj6.getType());
assertEquals("valb3", obj6.get("b3").asString());
}

@Test
public void testObject_DMR() throws Exception {
final ModelNode value = parseObject("{\"a\"=>\"b\",\"c\"=>\"d\"}");
Expand Down