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/09/26 17:32:26 UTC
[1/2] activemq-artemis git commit: ARTEMIS-754 Fix JsonUtil.addTo*()
null add
Repository: activemq-artemis
Updated Branches:
refs/heads/master 5f6aee118 -> 70199f3a1
ARTEMIS-754 Fix JsonUtil.addTo*() null add
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bd5103c4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bd5103c4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bd5103c4
Branch: refs/heads/master
Commit: bd5103c48e68f6eeec2315ae47d4a9cbb1026f9e
Parents: 5f6aee1
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sun Sep 25 23:43:19 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 26 13:28:16 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/api/core/JsonUtil.java | 6 +++
.../activemq/artemis/api/core/JsonUtilTest.java | 56 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bd5103c4/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 a3da33b..6c47a28 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
@@ -231,6 +231,9 @@ public final class JsonUtil {
else if (param instanceof SimpleString) {
jsonObjectBuilder.add(key, param.toString());
}
+ else if (param == null) {
+ jsonObjectBuilder.addNull(key);
+ }
else {
throw ActiveMQClientMessageBundle.BUNDLE.invalidManagementParam(param.getClass().getName());
}
@@ -262,6 +265,9 @@ public final class JsonUtil {
else if (param instanceof Byte) {
jsonArrayBuilder.add(((Byte) param).shortValue());
}
+ else if (param == null) {
+ jsonArrayBuilder.addNull();
+ }
else {
throw ActiveMQClientMessageBundle.BUNDLE.invalidManagementParam(param.getClass().getName());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bd5103c4/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/JsonUtilTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/JsonUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/JsonUtilTest.java
new file mode 100644
index 0000000..180ca6c
--- /dev/null
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/api/core/JsonUtilTest.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.api.core;
+
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+
+import org.apache.activemq.artemis.utils.JsonLoader;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JsonUtilTest {
+
+ @Test
+ public void testAddToObject() {
+ JsonObjectBuilder jsonObjectBuilder = JsonLoader.createObjectBuilder();
+
+ JsonUtil.addToObject("not-null", "not-null", jsonObjectBuilder);
+ JsonUtil.addToObject("null", null, jsonObjectBuilder);
+
+ JsonObject jsonObject = jsonObjectBuilder.build();
+
+ Assert.assertTrue(jsonObject.containsKey("not-null"));
+ Assert.assertTrue(jsonObject.containsKey("null"));
+ Assert.assertEquals(2, jsonObject.size());
+ }
+
+ @Test
+ public void testAddToArray() {
+ JsonArrayBuilder jsonArrayBuilder = JsonLoader.createArrayBuilder();
+
+ JsonUtil.addToArray("hello", jsonArrayBuilder);
+ JsonUtil.addToArray(null, jsonArrayBuilder);
+
+ JsonArray jsonArray = jsonArrayBuilder.build();
+
+ Assert.assertEquals(2, jsonArray.size());
+ }
+}
[2/2] activemq-artemis git commit: This closes #799
Posted by cl...@apache.org.
This closes #799
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/70199f3a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/70199f3a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/70199f3a
Branch: refs/heads/master
Commit: 70199f3a1d17286297053355d01e4bfcf689a3c3
Parents: 5f6aee1 bd5103c
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 26 13:28:41 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 26 13:28:41 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/api/core/JsonUtil.java | 6 +++
.../activemq/artemis/api/core/JsonUtilTest.java | 56 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------