Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #3375

This commit is contained in:
Justin Bertram 2020-12-09 10:55:09 -06:00
parent 8216961d91 2b585508cc
commit 4162effe14
4 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/QueueConfiguration.java
View File

@ -716,7 +716,7 @@ public class QueueConfiguration implements Serializable {
* @return the {@code QueueConfiguration} created from the JSON-formatted input {@code String}
*/
public static QueueConfiguration fromJSON(String jsonString) {
JsonObject json = JsonLoader.createReader(new StringReader(jsonString)).readObject();
JsonObject json = JsonLoader.readObject(new StringReader(jsonString));
// name is the only required value
if (!json.keySet().contains(NAME)) {

70
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/JsonLoader.java
View File

@ -17,25 +17,15 @@
package org.apache.activemq.artemis.utils;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonBuilderFactory;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonReader;
import javax.json.JsonReaderFactory;
import javax.json.JsonWriter;
import javax.json.JsonWriterFactory;
import javax.json.spi.JsonProvider;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
import javax.json.stream.JsonParser;
import javax.json.stream.JsonParserFactory;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Map;
/**
* This is to make sure we use the proper classLoader to load JSon libraries.
@ -65,52 +55,16 @@ public class JsonLoader {
}
public static JsonParser createParser(Reader reader) {
return provider.createParser(reader);
public static JsonObject readObject(Reader reader) {
try (JsonReader jsonReader = provider.createReader(reader)) {
return jsonReader.readObject();
}
}
public static JsonParser createParser(InputStream in) {
return provider.createParser(in);
}
public static JsonGenerator createGenerator(Writer writer) {
return provider.createGenerator(writer);
}
public static JsonGenerator createGenerator(OutputStream out) {
return provider.createGenerator(out);
}
public static JsonParserFactory createParserFactory(Map<String, ?> config) {
return provider.createParserFactory(config);
}
public static JsonGeneratorFactory createGeneratorFactory(Map<String, ?> config) {
return provider.createGeneratorFactory(config);
}
public static JsonWriter createWriter(Writer writer) {
return provider.createWriter(writer);
}
public static JsonWriter createWriter(OutputStream out) {
return provider.createWriter(out);
}
public static JsonReader createReader(Reader reader) {
return provider.createReader(reader);
}
public static JsonReader createReader(InputStream in) {
return provider.createReader(in);
}
public static JsonReaderFactory createReaderFactory(Map<String, ?> config) {
return provider.createReaderFactory(config);
}
public static JsonWriterFactory createWriterFactory(Map<String, ?> config) {
return provider.createWriterFactory(config);
public static JsonArray readArray(Reader reader) {
try (JsonReader jsonReader = provider.createReader(reader)) {
return jsonReader.readArray();
}
}
public static JsonArrayBuilder createArrayBuilder() {
@ -121,8 +75,4 @@ public class JsonLoader {
return provider.createObjectBuilder();
}
public static JsonBuilderFactory createBuilderFactory(Map<String, ?> config) {
return provider.createBuilderFactory(config);
}
}

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JsonUtil.java
View File

@ -274,11 +274,11 @@ public final class JsonUtil {
}
public static JsonArray readJsonArray(String jsonString) {
return JsonLoader.createReader(new StringReader(jsonString)).readArray();
return JsonLoader.readArray(new StringReader(jsonString));
}
public static JsonObject readJsonObject(String jsonString) {
return JsonLoader.createReader(new StringReader(jsonString)).readObject();
return JsonLoader.readObject(new StringReader(jsonString));
}
public static Map<String, String> readJsonProperties(String jsonString) {

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
View File

@ -402,7 +402,7 @@ public class AddressInfo {
}
public static AddressInfo fromJSON(String jsonString) {
JsonObject json = JsonLoader.createReader(new StringReader(jsonString)).readObject();
JsonObject json = JsonLoader.readObject(new StringReader(jsonString));
AddressInfo result = new AddressInfo();