You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2015/01/04 22:15:41 UTC
incubator-johnzon git commit: fixing config warnings
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 4d4ac2ee6 -> 21215668c
fixing config warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/21215668
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/21215668
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/21215668
Branch: refs/heads/master
Commit: 21215668cc3f6db86eba79c10951dccde47dea51
Parents: 4d4ac2e
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Jan 4 22:15:28 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Jan 4 22:15:28 2015 +0100
----------------------------------------------------------------------
.../johnzon/core/JsonGeneratorFactoryImpl.java | 15 ++++++++-------
.../apache/johnzon/core/JsonParserFactoryImpl.java | 12 +++++++-----
.../apache/johnzon/core/JsonReaderFactoryImpl.java | 16 ++++++++++++----
.../apache/johnzon/core/JsonWriterFactoryImpl.java | 11 +++++++----
4 files changed, 34 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/21215668/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
index bdc19fb..332fa33 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorFactoryImpl.java
@@ -22,6 +22,7 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
@@ -31,15 +32,15 @@ import java.util.concurrent.ConcurrentMap;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
+import static java.util.Arrays.asList;
+
public class JsonGeneratorFactoryImpl implements JsonGeneratorFactory, Serializable {
public static final String BUFFER_LENGTH = "org.apache.johnzon.default-char-buffer-generator";
public static final int DEFAULT_BUFFER_LENGTH = Integer.getInteger(BUFFER_LENGTH, 1024); //TODO check default string length/buffer size
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
- private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
-
- JsonGenerator.PRETTY_PRINTING, BUFFER_LENGTH, JsonParserFactoryImpl.BUFFER_STRATEGY
-
- };
+ private static final Collection<String> SUPPORTED_CONFIG_KEYS = asList(
+ JsonGenerator.PRETTY_PRINTING, BUFFER_LENGTH, JsonParserFactoryImpl.BUFFER_STRATEGY
+ );
//key caching currently disabled
private final ConcurrentMap<String, String> cache = null;//new ConcurrentHashMap<String, String>();
private final boolean pretty;
@@ -49,8 +50,8 @@ public class JsonGeneratorFactoryImpl implements JsonGeneratorFactory, Serializa
if(config != null) {
- for (String configKey : SUPPORTED_CONFIG_KEYS) {
- if(config.containsKey(configKey)) {
+ for (String configKey : config.keySet()) {
+ if(SUPPORTED_CONFIG_KEYS.contains(configKey)) {
internalConfig.put(configKey, config.get(configKey));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/21215668/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
index 3da67ff..6ec69ce 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonParserFactoryImpl.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.Serializable;
import java.nio.charset.Charset;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
@@ -33,6 +34,8 @@ import javax.json.JsonObject;
import javax.json.stream.JsonParser;
import javax.json.stream.JsonParserFactory;
+import static java.util.Arrays.asList;
+
class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
private static final Logger LOGGER = Logger.getLogger(JsonParserFactoryImpl.class.getName());
@@ -44,9 +47,9 @@ class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
public static final boolean DEFAULT_SUPPORTS_COMMENT = false;
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
- private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
+ private static final Collection<String> SUPPORTED_CONFIG_KEYS = asList(
BUFFER_STRATEGY, MAX_STRING_LENGTH, BUFFER_LENGTH, SUPPORTS_COMMENTS
- };
+ );
private final int maxSize;
private final BufferStrategy.BufferProvider<char[]> bufferProvider;
@@ -55,9 +58,8 @@ class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
JsonParserFactoryImpl(final Map<String, ?> config) {
if(config != null) {
-
- for (String configKey : SUPPORTED_CONFIG_KEYS) {
- if(config.containsKey(configKey)) {
+ for (String configKey : config.keySet()) {
+ if(SUPPORTED_CONFIG_KEYS.contains(configKey)) {
internalConfig.put(configKey, config.get(configKey));
} else {
LOGGER.warning(configKey + " is not supported by " + getClass().getName());
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/21215668/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
index 770f171..f79e23d 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonReaderFactoryImpl.java
@@ -22,28 +22,36 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.Serializable;
import java.nio.charset.Charset;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Logger;
import javax.json.JsonReader;
import javax.json.JsonReaderFactory;
+import static java.util.Arrays.asList;
+
class JsonReaderFactoryImpl implements JsonReaderFactory, Serializable {
+ private static final Logger LOGGER = Logger.getLogger(JsonReaderFactoryImpl.class.getName());
+
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
- private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
+ private static final Collection<String> SUPPORTED_CONFIG_KEYS = asList(
JsonParserFactoryImpl.BUFFER_STRATEGY, JsonParserFactoryImpl.MAX_STRING_LENGTH,
JsonParserFactoryImpl.BUFFER_LENGTH, JsonParserFactoryImpl.SUPPORTS_COMMENTS
- };
+ );
private final JsonParserFactoryImpl parserFactory;
JsonReaderFactoryImpl(final Map<String, ?> config) {
if(config != null) {
- for (String configKey : SUPPORTED_CONFIG_KEYS) {
- if(config.containsKey(configKey)) {
+ for (String configKey : config.keySet()) {
+ if(SUPPORTED_CONFIG_KEYS.contains(configKey)) {
internalConfig.put(configKey, config.get(configKey));
+ } else {
+ LOGGER.warning(configKey + " not supported by " + getClass().getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/21215668/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
index 6b82992..92c9df8 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonWriterFactoryImpl.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -33,21 +34,23 @@ import javax.json.JsonWriterFactory;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
+import static java.util.Arrays.asList;
+
class JsonWriterFactoryImpl implements JsonWriterFactory, Serializable {
private static final Logger LOGGER = Logger.getLogger(JsonWriterFactoryImpl.class.getName());
private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
private final Map<String, Object> internalConfig = new HashMap<String, Object>();
- private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
+ private static final Collection<String> SUPPORTED_CONFIG_KEYS = asList(
JsonGenerator.PRETTY_PRINTING
- };
+ );
private final JsonGeneratorFactory factory;
JsonWriterFactoryImpl(final Map<String, ?> config) {
if (config != null) {
- for (final String configKey : SUPPORTED_CONFIG_KEYS) {
- if (config.containsKey(configKey)) {
+ for (final String configKey : config.keySet()) {
+ if (SUPPORTED_CONFIG_KEYS.contains(configKey)) {
internalConfig.put(configKey, config.get(configKey));
} else {
LOGGER.warning(configKey + " not supported by " + getClass().getName());