modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java | 9 +++++ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 17 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
New commits: commit aed0881f6c23e7015c7c8665074d2c444acad189 Author: Heiko W. Rupp hwr@redhat.com Date: Tue Jun 28 21:59:52 2011 +0200
Support the new "rolled-back" element in the JSON response from the AS.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java index a5583b7..63c5262 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java @@ -40,6 +40,8 @@ public class Result { private /*List<Map<String, String>>*/Object failureDescription; @JsonIgnore private boolean success = false; + @JsonProperty("rolled-back") + private boolean rolledBack = false;
public Result() {
@@ -83,4 +85,11 @@ public class Result { this.failureDescription = failureDescription; }
+ public boolean isRolledBack() { + return rolledBack; + } + + public void setRolledBack(boolean rolledBack) { + this.rolledBack = rolledBack; + } } diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java index 53ac89e..b36a03b 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java @@ -185,7 +185,7 @@ public class OperationJsonTest {
public void arrayResult1() throws Exception {
- String resultString = "{"outcome":"success","result":["standard-sockets","messaging-sockets"],"compensating-operation":null}"; + String resultString = "{"outcome":"success","result":["standard-sockets","messaging-sockets"],"compensating-operation":null, "rolled-back" : false}";
ObjectMapper mapper = new ObjectMapper(); Result result = mapper.readValue(resultString,Result.class); @@ -197,6 +197,21 @@ public class OperationJsonTest { assert stringList.size()==2; assert stringList.get(0).equals("standard-sockets"); assert stringList.get(1).equals("messaging-sockets"); + assert !result.isRolledBack(); + + } + + public void rolledBack() throws Exception { + + String resultString = "{"outcome":"failed", "rolled-back" : true}"; + + ObjectMapper mapper = new ObjectMapper(); + Result result = mapper.readValue(resultString,Result.class); + + assert result != null; + assert result.getOutcome().equals("failed"); + assert !result.isSuccess(); + assert result.isRolledBack();
}