You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/08/01 16:08:59 UTC
[1/2] activemq-artemis git commit: ARTEMIS-565 JSON fixes
Repository: activemq-artemis
Updated Branches:
refs/heads/master f44e87f43 -> 57f79cae0
ARTEMIS-565 JSON fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7917f4d2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7917f4d2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7917f4d2
Branch: refs/heads/master
Commit: 7917f4d2f2c5066d7e5ba7c94f8cb4ec1685cfec
Parents: f44e87f
Author: jbertram <jb...@apache.org>
Authored: Mon Aug 1 10:07:50 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Mon Aug 1 10:21:31 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/api/core/JsonUtil.java | 37 +++++++++++++++++---
.../management/ManagementHelperTest.java | 4 +--
2 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7917f4d2/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java
index 62bb871..0343a64 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java
@@ -126,6 +126,21 @@ public final class JsonUtil {
else if (innerVal instanceof JsonString) {
innerVal = ((JsonString)innerVal).getString();
}
+ else if (innerVal == JsonValue.FALSE) {
+ innerVal = Boolean.FALSE;
+ }
+ else if (innerVal == JsonValue.TRUE) {
+ innerVal = Boolean.TRUE;
+ }
+ else if (innerVal instanceof JsonNumber) {
+ JsonNumber jsonNumber = (JsonNumber)innerVal;
+ if (jsonNumber.isIntegral()) {
+ innerVal = jsonNumber.longValue();
+ }
+ else {
+ innerVal = jsonNumber.doubleValue();
+ }
+ }
else if (innerVal instanceof JsonObject) {
Map<String, Object> innerMap = new HashMap<>();
JsonObject o = (JsonObject) innerVal;
@@ -135,10 +150,6 @@ public final class JsonUtil {
}
innerVal = innerMap;
}
- else if (innerVal instanceof JsonNumber) {
- JsonNumber jsonNumber = (JsonNumber)innerVal;
- innerVal = jsonNumber.longValue();
- }
if (CompositeData.class.getName().equals(key)) {
Object[] data = (Object[]) innerVal;
CompositeData[] cds = new CompositeData[data.length];
@@ -155,6 +166,24 @@ public final class JsonUtil {
array[i] = map;
}
+ else if (val instanceof JsonString) {
+ array[i] = ((JsonString)val).getString();
+ }
+ else if (val == JsonValue.FALSE) {
+ array[i] = Boolean.FALSE;
+ }
+ else if (val == JsonValue.TRUE) {
+ array[i] = Boolean.TRUE;
+ }
+ else if (val instanceof JsonNumber) {
+ JsonNumber jsonNumber = (JsonNumber)val;
+ if (jsonNumber.isIntegral()) {
+ array[i] = jsonNumber.longValue();
+ }
+ else {
+ array[i] = jsonNumber.doubleValue();
+ }
+ }
else {
if (val == JsonValue.NULL) {
array[i] = null;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7917f4d2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index 9fb95e7..8cc0f99 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -69,7 +69,7 @@ public class ManagementHelperTest extends Assert {
String resource = RandomUtil.randomString();
String operationName = RandomUtil.randomString();
- int i = RandomUtil.randomInt();
+ long i = RandomUtil.randomInt();
String s = RandomUtil.randomString();
double d = RandomUtil.randomDouble();
boolean b = RandomUtil.randomBoolean();
@@ -192,7 +192,7 @@ public class ManagementHelperTest extends Assert {
ManagementHelperTest.log.info("val1 type is " + Arrays.toString(val1));
String key2 = RandomUtil.randomString();
- Integer[] val2 = new Integer[]{1, 2, 3, 4, 5};
+ Long[] val2 = new Long[]{1L, 2L, 3L, 4L, 5L};
ManagementHelperTest.log.info("val2 type is " + Arrays.toString(val2));
[2/2] activemq-artemis git commit: This closes #692
Posted by cl...@apache.org.
This closes #692
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/57f79cae
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/57f79cae
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/57f79cae
Branch: refs/heads/master
Commit: 57f79cae0abe009d31e80e6640e2f7b2b6738874
Parents: f44e87f 7917f4d
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 1 12:08:47 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 1 12:08:47 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/api/core/JsonUtil.java | 37 +++++++++++++++++---
.../management/ManagementHelperTest.java | 4 +--
2 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------