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 2014/07/30 18:39:13 UTC
[2/2] git commit: FLEECE-10 FLEECE-11 performance enhancements from
Hendrik Saly, thanks a lot!
FLEECE-10 FLEECE-11 performance enhancements from Hendrik Saly, thanks a lot!
Project: http://git-wip-us.apache.org/repos/asf/incubator-fleece/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fleece/commit/192c774a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fleece/tree/192c774a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fleece/diff/192c774a
Branch: refs/heads/master
Commit: 192c774a8a3e89655faa5a9498cf28d05ce3dd82
Parents: 675ec9d
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Wed Jul 30 18:38:58 2014 +0200
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Wed Jul 30 18:38:58 2014 +0200
----------------------------------------------------------------------
.../core/EscapedStringAwareJsonParser.java | 25 -
.../fleece/core/JsonArrayBuilderImpl.java | 85 ++-
.../org/apache/fleece/core/JsonArrayImpl.java | 102 +--
.../fleece/core/JsonBuilderFactoryImpl.java | 26 +-
.../java/org/apache/fleece/core/JsonChars.java | 6 +-
.../org/apache/fleece/core/JsonDoubleImpl.java | 12 +-
.../apache/fleece/core/JsonGeneratorFacade.java | 186 -----
.../fleece/core/JsonGeneratorFactoryImpl.java | 89 ++-
.../apache/fleece/core/JsonGeneratorImpl.java | 734 ++++++++++++++++---
.../apache/fleece/core/JsonInMemoryParser.java | 93 +--
.../apache/fleece/core/JsonLocationImpl.java | 8 +-
.../org/apache/fleece/core/JsonLongImpl.java | 7 +-
.../org/apache/fleece/core/JsonNumberImpl.java | 19 +-
.../fleece/core/JsonObjectBuilderImpl.java | 63 +-
.../org/apache/fleece/core/JsonObjectImpl.java | 61 +-
.../fleece/core/JsonParserFactoryImpl.java | 62 +-
.../fleece/core/JsonPrettyGeneratorImpl.java | 306 ++++++--
.../apache/fleece/core/JsonProviderImpl.java | 31 +-
.../fleece/core/JsonReaderFactoryImpl.java | 26 +-
.../org/apache/fleece/core/JsonReaderImpl.java | 239 ++----
.../apache/fleece/core/JsonReaderListener.java | 43 --
.../fleece/core/JsonReaderListenerFactory.java | 25 -
.../fleece/core/JsonStreamParserImpl.java | 20 +-
.../org/apache/fleece/core/JsonStringImpl.java | 28 +-
.../fleece/core/JsonWriterFactoryImpl.java | 38 +-
.../org/apache/fleece/core/JsonWriterImpl.java | 32 +-
.../core/RFC4627AwareInputStreamReader.java | 30 +-
.../java/org/apache/fleece/core/Strings.java | 13 +-
.../apache/fleece/core/JsonArrayImplTest.java | 33 +-
.../fleece/core/JsonGeneratorImplTest.java | 126 ++++
.../apache/fleece/core/JsonObjectImplTest.java | 9 +-
.../org/apache/fleece/core/JsonParserTest.java | 63 +-
.../apache/fleece/core/JsonReaderImplTest.java | 15 +
.../apache/fleece/core/JsonWriterImplTest.java | 7 +-
.../org/apache/fleece/core/LocationTest.java | 49 +-
.../java/org/apache/fleece/mapper/Mapper.java | 12 +-
.../org/apache/fleece/mapper/MapperTest.java | 150 +++-
37 files changed, 1865 insertions(+), 1008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/EscapedStringAwareJsonParser.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/EscapedStringAwareJsonParser.java b/fleece-core/src/main/java/org/apache/fleece/core/EscapedStringAwareJsonParser.java
deleted file mode 100644
index 56cb7a5..0000000
--- a/fleece-core/src/main/java/org/apache/fleece/core/EscapedStringAwareJsonParser.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.fleece.core;
-
-import javax.json.stream.JsonParser;
-
-public interface EscapedStringAwareJsonParser extends JsonParser {
- String getEscapedString();
-}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
index d5620fd..a92eede 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayBuilderImpl.java
@@ -18,114 +18,113 @@
*/
package org.apache.fleece.core;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObjectBuilder;
import javax.json.JsonValue;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-public class JsonArrayBuilderImpl implements JsonArrayBuilder, Serializable {
- private final JsonArrayImpl array = new JsonArrayImpl();
+class JsonArrayBuilderImpl implements JsonArrayBuilder, Serializable {
+ private List<JsonValue> tmpList;
@Override
public JsonArrayBuilder add(final JsonValue value) {
- if (value == null) {
- throw npe();
- }
- array.addInternal(value);
+ addValue(value);
return this;
}
@Override
public JsonArrayBuilder add(final String value) {
- if (value == null) {
- throw npe();
- }
- array.addInternal(new JsonStringImpl(value));
+ addValue(new JsonStringImpl(value));
return this;
}
@Override
public JsonArrayBuilder add(final BigDecimal value) {
- if (value == null) {
- throw npe();
- }
- array.addInternal(new JsonNumberImpl(value));
+ addValue(new JsonNumberImpl(value));
return this;
}
@Override
public JsonArrayBuilder add(final BigInteger value) {
- if (value == null) {
- throw npe();
- }
- array.addInternal(new JsonNumberImpl(new BigDecimal(value)));
+ addValue(new JsonNumberImpl(new BigDecimal(value)));
return this;
}
@Override
public JsonArrayBuilder add(final int value) {
- array.addInternal(new JsonLongImpl(value));
+ addValue(new JsonLongImpl(value));
return this;
}
@Override
public JsonArrayBuilder add(final long value) {
- array.addInternal(new JsonLongImpl(value));
+ addValue(new JsonLongImpl(value));
return this;
}
@Override
public JsonArrayBuilder add(final double value) {
- final Double valueObject = Double.valueOf(value);
- if (valueObject.isInfinite()) {
- throw new NumberFormatException("value must not be infinite");
- }
- if (valueObject.isNaN()) {
- throw new NumberFormatException("value must not be NaN");
- }
- array.addInternal(new JsonDoubleImpl(value));
+ addValue(new JsonDoubleImpl(value));
return this;
}
@Override
public JsonArrayBuilder add(final boolean value) {
- array.addInternal(value ? JsonValue.TRUE : JsonValue.FALSE);
+ addValue(value ? JsonValue.TRUE : JsonValue.FALSE);
return this;
}
@Override
public JsonArrayBuilder addNull() {
- array.addInternal(JsonValue.NULL);
+ addValue(JsonValue.NULL);
return this;
}
@Override
public JsonArrayBuilder add(final JsonObjectBuilder builder) {
- if (builder == null) {
- throw new NullPointerException("builder must not be null");
- }
- array.addInternal(builder.build());
+ addValue(builder.build());
return this;
}
@Override
public JsonArrayBuilder add(final JsonArrayBuilder builder) {
- if (builder == null) {
- throw new NullPointerException("builder must not be null");
- }
- array.addInternal(builder.build());
+ addValue(builder.build());
return this;
}
+
+ private void addValue(JsonValue value){
+ if (value == null) {
+ throw npe();
+ }
+
+ if(tmpList==null){
+ tmpList=new ArrayList<JsonValue>();
+ }
+
+ tmpList.add(value);
+ }
@Override
public JsonArray build() {
- return array;
+
+ if(tmpList == null) {
+ return new JsonArrayImpl(Collections.EMPTY_LIST);
+ } else {
+ List<JsonValue> dump = (Collections.unmodifiableList(tmpList));
+ tmpList=null;
+ return new JsonArrayImpl(dump);
+ }
+
}
private static NullPointerException npe() {
- throw new NullPointerException("value must not be null");
+ throw new NullPointerException("value/builder must not be null");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
index afb6b63..fa1e230 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonArrayImpl.java
@@ -18,26 +18,36 @@
*/
package org.apache.fleece.core;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.Iterator;
+import java.util.List;
+
import javax.json.JsonArray;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.JsonString;
import javax.json.JsonValue;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-public class JsonArrayImpl extends LinkedList<JsonValue> implements JsonArray, Serializable {
+class JsonArrayImpl extends AbstractList<JsonValue> implements JsonArray, Serializable {
private Integer hashCode = null;
+ private final List<JsonValue> unmodifieableBackingList;
+
+ JsonArrayImpl(List<JsonValue> backingList) {
+ super();
+ this.unmodifieableBackingList = backingList;
+ }
+
+
private <T> T value(final int idx, final Class<T> type) {
- if (idx > size()) {
- throw new IndexOutOfBoundsException(idx + "/" + size());
+ if (idx > unmodifieableBackingList.size()) {
+ throw new IndexOutOfBoundsException(idx + "/" + unmodifieableBackingList.size());
}
- return type.cast(get(idx));
+ return type.cast(unmodifieableBackingList.get(idx));
}
+
+
@Override
public JsonObject getJsonObject(final int index) {
@@ -61,7 +71,7 @@ public class JsonArrayImpl extends LinkedList<JsonValue> implements JsonArray, S
@Override
public <T extends JsonValue> List<T> getValuesAs(final Class<T> clazz) {
- return (List<T>) this;
+ return (List<T>) unmodifieableBackingList;
}
@Override
@@ -119,12 +129,12 @@ public class JsonArrayImpl extends LinkedList<JsonValue> implements JsonArray, S
@Override
public String toString() {
final StringBuilder builder = new StringBuilder("[");
- final Iterator<JsonValue> it = iterator();
+ final Iterator<JsonValue> it = unmodifieableBackingList.iterator();
boolean hasNext = it.hasNext();
while (hasNext) {
final JsonValue jsonValue = it.next();
if (JsonString.class.isInstance(jsonValue)) {
- builder.append(JsonChars.QUOTE).append(jsonValue.toString()).append(JsonChars.QUOTE);
+ builder.append(jsonValue.toString());
} else {
builder.append(jsonValue != JsonValue.NULL ? jsonValue.toString() : JsonChars.NULL);
}
@@ -138,69 +148,27 @@ public class JsonArrayImpl extends LinkedList<JsonValue> implements JsonArray, S
@Override
public boolean equals(final Object obj) {
- return JsonArray.class.isInstance(obj) && super.equals(obj);
- }
-
- //make protected if class is supposed to be subclassed
- //make package private otherwise
- protected void addInternal(final JsonValue value) {
- super.add(value);
- }
-
- @Override
- public boolean add(final JsonValue element) {
- throw immutable();
- }
-
- @Override
- public boolean addAll(final int index, final Collection<? extends JsonValue> c) {
- throw immutable();
- }
-
- @Override
- public boolean remove(final Object o) {
- throw immutable();
- }
-
- @Override
- public JsonValue remove(final int index) {
- throw immutable();
- }
-
- @Override
- public void add(final int index, final JsonValue element) {
- throw immutable();
- }
-
- @Override
- public void clear() {
- throw immutable();
+ return JsonArrayImpl.class.isInstance(obj) && unmodifieableBackingList.equals(JsonArrayImpl.class.cast(obj).unmodifieableBackingList);
}
+
@Override
- public boolean retainAll(final Collection<?> c) {
- throw immutable();
- }
-
- @Override
- public boolean removeAll(final Collection<?> c) {
- throw immutable();
+ public int hashCode() {
+ Integer h=hashCode;
+ if (h == null) {
+ h = unmodifieableBackingList.hashCode();
+ h=hashCode;
+ }
+ return h;
}
@Override
- public JsonValue set(final int index, final JsonValue element) {
- throw immutable();
- }
-
- private static UnsupportedOperationException immutable() {
- throw new UnsupportedOperationException("JsonArray is immutable. You can create another one thanks to JsonArrayBuilder");
+ public JsonValue get(int index) {
+ return unmodifieableBackingList.get(index);
}
@Override
- public int hashCode() {
- if (hashCode == null) {
- hashCode = super.hashCode();
- }
- return hashCode;
+ public int size() {
+ return unmodifieableBackingList.size();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
index 5e59640..76b0455 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonBuilderFactoryImpl.java
@@ -18,18 +18,30 @@
*/
package org.apache.fleece.core;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.json.JsonArrayBuilder;
import javax.json.JsonBuilderFactory;
import javax.json.JsonObjectBuilder;
-import java.util.Collections;
-import java.util.Map;
+class JsonBuilderFactoryImpl implements JsonBuilderFactory {
+ private final Map<String, Object> internalConfig = new HashMap<String, Object>();
+ private static final String[] SUPPORTED_CONFIG_KEYS = new String[] {
+ //nothing yet
+
+ };
-public class JsonBuilderFactoryImpl implements JsonBuilderFactory {
- private final Map<String, ?> config;
+ JsonBuilderFactoryImpl(final Map<String, ?> config) {
+ if (config != null) {
- public JsonBuilderFactoryImpl(final Map<String, ?> config) {
- this.config = config;
+ for (final String configKey : SUPPORTED_CONFIG_KEYS) {
+ if (config.containsKey(configKey)) {
+ internalConfig.put(configKey, config.get(configKey));
+ }
+ }
+ }
}
@Override
@@ -44,6 +56,6 @@ public class JsonBuilderFactoryImpl implements JsonBuilderFactory {
@Override
public Map<String, ?> getConfigInUse() {
- return Collections.unmodifiableMap(config);
+ return Collections.unmodifiableMap(internalConfig);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
index 3a92c9b..b135886 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonChars.java
@@ -27,8 +27,8 @@ public interface JsonChars {
char END_OBJECT_CHAR = '}';
char START_ARRAY_CHAR = '[';
char END_ARRAY_CHAR = ']';
- char QUOTE = '"';
- char COMMA = ',';
+ char QUOTE_CHAR = '"';
+ char COMMA_CHAR = ',';
char KEY_SEPARATOR = ':';
char EOL = '\n';
@@ -61,7 +61,7 @@ public interface JsonChars {
char FORMFEED = '\f';
char CR = '\r';
- String NULL = "null";
+ String NULL = "null".intern();
static final byte START_ARRAY = (byte) Event.START_ARRAY.ordinal();
static final byte START_OBJECT = (byte) Event.START_OBJECT.ordinal();
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
index 5b63d41..4ff90f9 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonDoubleImpl.java
@@ -18,14 +18,20 @@
*/
package org.apache.fleece.core;
-import javax.json.JsonNumber;
import java.math.BigDecimal;
import java.math.BigInteger;
-public class JsonDoubleImpl implements JsonNumber {
+import javax.json.JsonNumber;
+
+final class JsonDoubleImpl implements JsonNumber {
private final double value;
- public JsonDoubleImpl(final double value) {
+ JsonDoubleImpl(final double value) {
+
+ if(Double.isInfinite(value) || Double.isNaN(value)) {
+ throw new NumberFormatException("double value must to be NaN or Infinite");
+ }
+
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFacade.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFacade.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFacade.java
deleted file mode 100644
index bf1245a..0000000
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFacade.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * 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.fleece.core;
-
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerator;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-// basically a proxy but java.lang.reflect.Proxy would be too slow for JSon
-//
-// just a facade allowing to reuse the same pointer (instance)
-// without using a fluent API
-public class JsonGeneratorFacade implements JsonGenerator, Serializable {
- private JsonGenerator delegate;
-
- public JsonGeneratorFacade(final JsonGenerator delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public JsonGenerator writeStartObject() {
- delegate = delegate.writeStartObject();
- return this;
- }
-
- @Override
- public JsonGenerator writeStartObject(final String name) {
- delegate = delegate.writeStartObject(name);
- return this;
- }
-
- @Override
- public JsonGenerator writeStartArray() {
- delegate = delegate.writeStartArray();
- return this;
- }
-
- @Override
- public JsonGenerator writeStartArray(final String name) {
- delegate = delegate.writeStartArray(name);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final JsonValue value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final String value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final BigInteger value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final BigDecimal value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final int value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final long value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final double value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String name, final boolean value) {
- delegate = delegate.write(name, value);
- return this;
- }
-
- @Override
- public JsonGenerator writeNull(final String name) {
- delegate = delegate.writeNull(name);
- return this;
- }
-
- @Override
- public JsonGenerator writeEnd() {
- delegate = delegate.writeEnd();
- return this;
- }
-
- @Override
- public JsonGenerator write(final JsonValue value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final String value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final BigDecimal value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final BigInteger value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final int value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final long value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final double value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator write(final boolean value) {
- delegate = delegate.write(value);
- return this;
- }
-
- @Override
- public JsonGenerator writeNull() {
- delegate = delegate.writeNull();
- return this;
- }
-
- @Override
- public void close() {
- delegate.close();
-
- }
-
- @Override
- public void flush() {
- delegate.flush();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
index a320a14..573ca70 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorFactoryImpl.java
@@ -18,53 +18,104 @@
*/
package org.apache.fleece.core;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
-
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
import java.nio.charset.Charset;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-public class JsonGeneratorFactoryImpl implements JsonGeneratorFactory, Serializable {
- private final Map<String, ?> config;
- private final ConcurrentMap<String, String> cache = new ConcurrentHashMap<String, String>();
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonGeneratorFactory;
+
+public class JsonGeneratorFactoryImpl implements JsonGeneratorFactory, Serializable {
+ public static final String BUFFER_LENGTH = "org.apache.fleece.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
+
+ };
+ //key caching currently disabled
+ private final ConcurrentMap<String, String> cache = null;//new ConcurrentHashMap<String, String>();
private final boolean pretty;
+ private final BufferStrategy.BufferProvider<char[]> bufferProvider;
public JsonGeneratorFactoryImpl(final Map<String, ?> config) {
- this.config = config;
- this.pretty = Boolean.TRUE.equals(config.get(JsonGenerator.PRETTY_PRINTING)) || "true".equals(config.get(JsonGenerator.PRETTY_PRINTING));
+
+ if(config != null) {
+
+ for (String configKey : SUPPORTED_CONFIG_KEYS) {
+ if(config.containsKey(configKey)) {
+ internalConfig.put(configKey, config.get(configKey));
+ }
+ }
+ }
+
+ if(internalConfig.containsKey(JsonGenerator.PRETTY_PRINTING)) {
+ this.pretty = Boolean.TRUE.equals(internalConfig.get(JsonGenerator.PRETTY_PRINTING)) || "true".equals(internalConfig.get(JsonGenerator.PRETTY_PRINTING));
+ } else {
+ this.pretty = false;
+ }
+
+ final int bufferSize = getInt(BUFFER_LENGTH);
+ if (bufferSize <= 0) {
+ throw new IllegalArgumentException("buffer length must be greater than zero");
+ }
+
+ this.bufferProvider = getBufferProvider().newCharProvider(bufferSize);
+ }
+
+ private BufferStrategy getBufferProvider() {
+ final Object name = internalConfig.get(JsonParserFactoryImpl.BUFFER_STRATEGY);
+ if (name != null) {
+ return BufferStrategy.valueOf(name.toString().toUpperCase(Locale.ENGLISH));
+ }
+ return BufferStrategy.QUEUE;
}
- @Override
- public JsonGenerator createGenerator(final Writer writer) {
- return new JsonGeneratorFacade(newJsonGeneratorImpl(writer));
+ private int getInt(final String key) {
+ final Object maxStringSize = internalConfig.get(key);
+ if (maxStringSize == null) {
+ return DEFAULT_BUFFER_LENGTH;
+ } else if (Number.class.isInstance(maxStringSize)) {
+ return Number.class.cast(maxStringSize).intValue();
+ }
+ return Integer.parseInt(maxStringSize.toString());
}
- private JsonGenerator newJsonGeneratorImpl(final Writer writer) {
+ @Override
+ public JsonGenerator createGenerator(final Writer writer) {
if (pretty) {
- return new JsonPrettyGeneratorImpl(writer, cache);
+ return new JsonPrettyGeneratorImpl(writer, bufferProvider, cache);
}
- return new JsonGeneratorImpl<JsonGeneratorImpl<?>>(writer, cache);
+ return new JsonGeneratorImpl(writer, bufferProvider, cache);
}
+
+
@Override
public JsonGenerator createGenerator(final OutputStream out) {
- return createGenerator(new OutputStreamWriter(out));
+ if (pretty) {
+ return new JsonPrettyGeneratorImpl(out, bufferProvider, cache);
+ }
+ return new JsonGeneratorImpl(out, bufferProvider, cache);
}
@Override
public JsonGenerator createGenerator(final OutputStream out, final Charset charset) {
- return createGenerator(new OutputStreamWriter(out, charset));
+ if (pretty) {
+ return new JsonPrettyGeneratorImpl(out,charset, bufferProvider, cache);
+ }
+ return new JsonGeneratorImpl(out,charset, bufferProvider, cache);
}
@Override
public Map<String, ?> getConfigInUse() {
- return Collections.unmodifiableMap(config);
+ return Collections.unmodifiableMap(internalConfig);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
index 7a77a11..a1d0a53 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonGeneratorImpl.java
@@ -18,144 +18,371 @@
*/
package org.apache.fleece.core;
-import javax.json.JsonString;
-import javax.json.JsonValue;
-import javax.json.stream.JsonGenerationException;
-import javax.json.stream.JsonGenerator;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import java.io.Serializable;
import java.io.Writer;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.util.Iterator;
+import java.util.Map;
import java.util.concurrent.ConcurrentMap;
-public class JsonGeneratorImpl<P extends JsonGeneratorImpl<?>> implements JsonGenerator, JsonChars, Serializable {
- protected static final String START_ARRAY = "[";
- protected static final String END_ARRAY = "]";
- protected static final String END_OBJECT = "}";
- protected static final String START_OBJECT = "{";
- protected static final String NULL = "null";
- protected static final String NULL_KEY = "null:";
+import javax.json.JsonArray;
+import javax.json.JsonException;
+import javax.json.JsonNumber;
+import javax.json.JsonObject;
+import javax.json.JsonString;
+import javax.json.JsonStructure;
+import javax.json.JsonValue;
+import javax.json.stream.JsonGenerationException;
+import javax.json.stream.JsonGenerator;
- protected final Writer writer;
- protected final P parent;
- protected final boolean array;
- protected final ConcurrentMap<String, String> cache;
+class JsonGeneratorImpl implements JsonGenerator, JsonChars, Serializable {
+ private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
+ private final Writer writer;
+ private final BufferStrategy.BufferProvider<char[]> bufferProvider;
+ private final char[] buffer;
+ private int bufferPos = 0;
+ //private final ConcurrentMap<String, String> cache;
protected boolean needComma = false;
- public JsonGeneratorImpl(final Writer writer, final ConcurrentMap<String, String> cache) {
- this(writer, null, false, cache);
+ private StructureElement currentStructureElement = null;
+ private boolean valid = false;
+ protected int depth = 0;
+
+ //minimal stack implementation
+ private static final class StructureElement {
+ final StructureElement previous;
+ final boolean isArray;
+
+ StructureElement(final StructureElement previous, final boolean isArray) {
+ super();
+ this.previous = previous;
+ this.isArray = isArray;
+ }
}
- public JsonGeneratorImpl(final Writer writer, final P parent, final boolean array,
- final ConcurrentMap<String, String> cache) {
+ JsonGeneratorImpl(final Writer writer, final BufferStrategy.BufferProvider<char[]> bufferProvider,
+ final ConcurrentMap<String, String> cache) {
this.writer = writer;
- this.parent = parent;
- this.array = array;
- this.cache = cache;
+ //this.cache = cache;
+ this.buffer = bufferProvider.newBuffer();
+ this.bufferProvider = bufferProvider;
+ }
+
+ JsonGeneratorImpl(final OutputStream out, final BufferStrategy.BufferProvider<char[]> bufferProvider,
+ final ConcurrentMap<String, String> cache) {
+ this(new OutputStreamWriter(out, UTF8_CHARSET), bufferProvider, cache);
}
- private void addCommaIfNeeded() {
+ JsonGeneratorImpl(final OutputStream out, final Charset encoding, final BufferStrategy.BufferProvider<char[]> bufferProvider,
+ final ConcurrentMap<String, String> cache) {
+ this(new OutputStreamWriter(out, encoding), bufferProvider, cache);
+ }
+
+ protected void addCommaIfNeeded() {
if (needComma) {
- try {
- writer.write(',');
- } catch (final IOException e) {
- throw new JsonGenerationException(e.getMessage(), e);
- }
+ justWrite(COMMA_CHAR);
needComma = false;
}
- }
- protected JsonGenerator newJsonGenerator(final Writer writer, final P parent, final boolean array) {
- return new JsonGeneratorImpl<P>(writer, parent, array, cache);
}
- // we cache key only since they are generally fixed
- private String key(final String name) {
- if (name == null) {
- return NULL_KEY;
- }
- String k = cache.get(name);
+ //caching currently disabled
+ //two problems:
+ // 1) not easy to get the escaped value efficiently wen its streamed and the buffer is full and needs to be flushed
+ // 2) we have to use a kind of bounded threadsafe map to let the cache not grow indefinitely
+ private void writeCachedOrEscape(final String name) {
+ /* String k = cache.get(name);
+
if (k == null) {
- k = '"' + Strings.escape(name) + "\":";
- cache.putIfAbsent(name, k);
+
+ justWrite(QUOTE_CHAR);
+ int start = bufferPos;
+ writeEscaped0(name);
+ int end = bufferPos;
+ String escaped= get from buffer
+ ---
+ //FIXME if buffer is flushed this will not work here
+ cache.putIfAbsent(name, escaped);
+ justWrite(QUOTE_CHAR);
+ justWrite(KEY_SEPARATOR);
+ }else*/
+ {
+ justWrite(QUOTE_CHAR);
+ writeEscaped0(name);
+ justWrite(QUOTE_CHAR);
+ justWrite(KEY_SEPARATOR);
}
- return k;
+
}
@Override
public JsonGenerator writeStartObject() {
- noCheckWriteAndForceComma(START_OBJECT);
- return newJsonGenerator(writer, (P) this, false);
+
+ if (currentStructureElement == null && valid) {
+ throw new JsonGenerationException("Method must not be called more than once in no context");
+ }
+
+ if (currentStructureElement != null && !currentStructureElement.isArray) {
+ throw new JsonGenerationException("Method must not be called within an object context");
+ }
+
+ //push upon the stack
+ if (currentStructureElement == null) {
+ currentStructureElement = new StructureElement(null, false);
+ } else {
+ final StructureElement localStructureElement = new StructureElement(currentStructureElement, false);
+ currentStructureElement = localStructureElement;
+ }
+
+ if (!valid) {
+ valid = true;
+ }
+
+ noCheckWrite(START_OBJECT_CHAR);
+ depth++;
+ return this;
}
@Override
public JsonGenerator writeStartObject(final String name) {
- noCheckWriteAndForceComma(key(name) + START_OBJECT);
- return newJsonGenerator(writer, (P) this, false);
+ if (currentStructureElement == null || currentStructureElement.isArray) {
+ throw new JsonGenerationException("Method must not be called within an array context");
+ }
+
+ //push upon the stack
+ if (currentStructureElement == null) {
+ currentStructureElement = new StructureElement(null, false);
+ } else {
+ final StructureElement localStructureElement = new StructureElement(currentStructureElement, false);
+ currentStructureElement = localStructureElement;
+ }
+
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWrite(START_OBJECT_CHAR);
+ depth++;
+ return this;
}
@Override
public JsonGenerator writeStartArray() {
- noCheckWriteAndForceComma(START_ARRAY);
- return newJsonGenerator(writer, (P) this, true);
+ if (currentStructureElement == null && valid) {
+ throw new JsonGenerationException("Method must not be called more than once in no context");
+ }
+
+ if (currentStructureElement != null && !currentStructureElement.isArray) {
+ throw new JsonGenerationException("Method must not be called within an object context");
+ }
+
+ //push upon the stack
+ if (currentStructureElement == null) {
+ currentStructureElement = new StructureElement(null, true);
+ } else {
+ final StructureElement localStructureElement = new StructureElement(currentStructureElement, true);
+ currentStructureElement = localStructureElement;
+ }
+
+ if (!valid) {
+ valid = true;
+ }
+
+ noCheckWrite(START_ARRAY_CHAR);
+ depth++;
+ return this;
}
@Override
public JsonGenerator writeStartArray(final String name) {
- noCheckWriteAndForceComma(key(name) + START_ARRAY);
- return newJsonGenerator(writer, (P) this, true);
+ if (currentStructureElement == null || currentStructureElement.isArray) {
+ throw new JsonGenerationException("Method must not be called within an array context");
+ }
+
+ //push upon the stack
+ if (currentStructureElement == null) {
+ currentStructureElement = new StructureElement(null, true);
+ } else {
+ final StructureElement localStructureElement = new StructureElement(currentStructureElement, true);
+ currentStructureElement = localStructureElement;
+ }
+
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWrite(START_ARRAY_CHAR);
+ depth++;
+ return this;
+ }
+
+ private void writeJsonValue(final String name, final JsonValue value) {
+ if (currentStructureElement != null) {
+ checkObject();
+ }
+ //TODO check null handling
+ switch (value.getValueType()) {
+ case ARRAY:
+ writeStartArray(name);
+ final JsonArray array = JsonArray.class.cast(value);
+ final Iterator<JsonValue> ait = array.iterator();
+ while (ait.hasNext()) {
+ write(ait.next());
+ }
+ writeEnd();
+
+ break;
+ case OBJECT:
+ writeStartObject(name);
+ final JsonObject object = JsonObject.class.cast(value);
+ final Iterator<Map.Entry<String, JsonValue>> oit = object.entrySet().iterator();
+ while (oit.hasNext()) {
+ final Map.Entry<String, JsonValue> keyval = oit.next();
+ write(keyval.getKey(), keyval.getValue());
+ }
+ writeEnd();
+
+ break;
+ case STRING:
+ write(name, JsonString.class.cast(value).getString());
+ break;
+ case NUMBER:
+ //TODO optimize
+ final JsonNumber number = JsonNumber.class.cast(value);
+ if (number.isIntegral()) {
+ write(name, number.longValueExact());
+ } else {
+ write(name, number.bigDecimalValue());
+ }
+ break;
+ case TRUE:
+ write(name, true);
+ break;
+ case FALSE:
+ write(name, false);
+ break;
+ case NULL:
+ writeNull(name);
+ break;
+ default:
+ throw new JsonGenerationException("Unknown JsonValue type");
+ }
+ }
+
+ private void writeJsonValue(final JsonValue value) {
+ if (currentStructureElement != null) {
+ checkArray();
+ }
+ //TODO check null handling
+ switch (value.getValueType()) {
+ case ARRAY:
+ writeStartArray();
+ final JsonArray array = JsonArray.class.cast(value);
+ final Iterator<JsonValue> ait = array.iterator();
+ while (ait.hasNext()) {
+ write(ait.next());
+ }
+ writeEnd();
+
+ break;
+ case OBJECT:
+ writeStartObject();
+ final JsonObject object = JsonObject.class.cast(value);
+ final Iterator<Map.Entry<String, JsonValue>> oit = object.entrySet().iterator();
+ while (oit.hasNext()) {
+ final Map.Entry<String, JsonValue> keyval = oit.next();
+ write(keyval.getKey(), keyval.getValue());
+ }
+ writeEnd();
+
+ break;
+ case STRING:
+ write(JsonString.class.cast(value).getString());
+ break;
+ case NUMBER:
+ //TODO optimize
+ final JsonNumber number = JsonNumber.class.cast(value);
+ if (number.isIntegral()) {
+ write(number.longValueExact());
+ } else {
+ write(number.bigDecimalValue());
+ }
+ break;
+ case TRUE:
+ write(true);
+ break;
+ case FALSE:
+ write(false);
+ break;
+ case NULL:
+ writeNull();
+ break;
+ default:
+ throw new JsonGenerationException("Unknown JsonValue type");
+ }
}
@Override
public JsonGenerator write(final String name, final JsonValue value) {
- if (JsonString.class.isInstance(value)) {
- return write(name, value == null ? null : value.toString());
- }
- checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(value == null ? NULL : value.toString());
+ writeJsonValue(name, value);
return this;
}
+
@Override
public JsonGenerator write(final String name, final String value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(value == null ? NULL : "\"" + Strings.escape(value) + "\"");
+
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+
+ addCommaIfNeeded();
+ justWrite(QUOTE_CHAR);
+ writeEscaped0(value);
+ justWrite(QUOTE_CHAR);
+ needComma = true;
return this;
}
@Override
public JsonGenerator write(final String name, final BigInteger value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(value == null ? NULL : value.toString());
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWriteAndForceComma(String.valueOf(value));
return this;
}
@Override
public JsonGenerator write(final String name, final BigDecimal value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(value == null ? NULL : value.toString());
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWriteAndForceComma(String.valueOf(value));
return this;
}
@Override
public JsonGenerator write(final String name, final int value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(String.valueOf(value));
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ addCommaIfNeeded();
+ writeInt0(value);
+ needComma = true;
return this;
}
@Override
public JsonGenerator write(final String name, final long value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(String.valueOf(value));
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ addCommaIfNeeded();
+ writeLong0(value);
+ needComma = true;
return this;
}
@@ -163,47 +390,67 @@ public class JsonGeneratorImpl<P extends JsonGeneratorImpl<?>> implements JsonGe
public JsonGenerator write(final String name, final double value) {
checkObject();
checkDoubleRange(value);
- noCheckWriteAndForceComma(key(name));
- justWrite(String.valueOf(value));
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWriteAndForceComma(String.valueOf(value));
return this;
}
@Override
public JsonGenerator write(final String name, final boolean value) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(String.valueOf(value));
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWriteAndForceComma(String.valueOf(value));
return this;
}
@Override
public JsonGenerator writeNull(final String name) {
checkObject();
- noCheckWriteAndForceComma(key(name));
- justWrite(NULL);
+ addCommaIfNeeded();
+ writeCachedOrEscape(name);
+ noCheckWriteAndForceComma(NULL);
return this;
}
@Override
public JsonGenerator writeEnd() {
- needComma = false;
- noCheckWriteAndForceComma(array ? END_ARRAY : END_OBJECT);
- return parent != null ? parent : this;
+ if (currentStructureElement == null) {
+ throw new JsonGenerationException("Method must not be called in no context");
+ }
+
+ writeEnd(currentStructureElement.isArray ? END_ARRAY_CHAR : END_OBJECT_CHAR);
+
+ //pop from stack
+ currentStructureElement = currentStructureElement.previous;
+ depth--;
+
+ return this;
}
@Override
public JsonGenerator write(final JsonValue value) {
- noCheckWriteAndForceComma(String.valueOf(value));
+ writeJsonValue(value);
+
+ if (JsonStructure.class.isInstance(value)) {
+ valid = true;
+ }
return this;
}
@Override
public JsonGenerator write(final String value) {
checkArray();
- noCheckWriteAndForceComma(QUOTE+Strings.escape(value)+QUOTE);
+ addCommaIfNeeded();
+ justWrite(QUOTE_CHAR);
+ writeEscaped0(value);
+ justWrite(QUOTE_CHAR);
+ needComma = true;
return this;
}
+
@Override
public JsonGenerator write(final BigDecimal value) {
checkArray();
@@ -223,7 +470,8 @@ public class JsonGeneratorImpl<P extends JsonGeneratorImpl<?>> implements JsonGe
@Override
public JsonGenerator write(final int value) {
checkArray();
- noCheckWrite(Integer.toString(value));
+ addCommaIfNeeded();
+ writeInt0(value);
needComma = true;
return this;
}
@@ -231,7 +479,8 @@ public class JsonGeneratorImpl<P extends JsonGeneratorImpl<?>> implements JsonGe
@Override
public JsonGenerator write(final long value) {
checkArray();
- noCheckWrite(Long.toString(value));
+ addCommaIfNeeded();
+ writeLong0(value);
needComma = true;
return this;
}
@@ -263,56 +512,359 @@ public class JsonGeneratorImpl<P extends JsonGeneratorImpl<?>> implements JsonGe
@Override
public void close() {
+
try {
- writer.close();
- } catch (final IOException e) {
- throw new JsonGenerationException(e.getMessage(), e);
+ if (currentStructureElement != null || !valid) {
+
+ throw new JsonGenerationException("Invalid json " + currentStructureElement + " " + valid);
+ }
+ } finally {
+
+ flushBuffer();
+
+ try {
+ writer.close();
+ } catch (final IOException e) {
+ throw new JsonException(e.getMessage(), e);
+ }
+
+ bufferProvider.release(buffer);
}
}
@Override
public void flush() {
+
+ flushBuffer();
+
try {
writer.flush();
} catch (final IOException e) {
- throw new JsonGenerationException(e.getMessage(), e);
+ throw new JsonException(e.getMessage(), e);
}
}
- protected JsonGenerator noCheckWriteAndForceComma(final String value) {
+ private JsonGenerator noCheckWriteAndForceComma(final String value) {
noCheckWrite(value);
needComma = true;
return this;
}
- private void noCheckWrite(String value) {
+ protected JsonGenerator writeEnd(final char value) {
+ justWrite(value);
+ needComma = true;
+ return this;
+ }
+
+ protected void noCheckWrite(final String value) {
addCommaIfNeeded();
justWrite(value);
}
- private void justWrite(final String value) {
- try {
- writer.write(value);
- } catch (final IOException e) {
- throw new JsonGenerationException(e.getMessage(), e);
+ protected void noCheckWrite(final char value) {
+ addCommaIfNeeded();
+ justWrite(value);
+ }
+
+ private void flushBuffer() {
+
+ if (bufferPos > 0) {
+
+ try {
+ writer.write(buffer, 0, bufferPos);
+ bufferPos = 0;
+ } catch (final IOException e) {
+ throw new JsonException(e.getMessage(), e);
+ }
+
+ }
+ }
+
+ private void writeEscaped0(final String value) {
+ int len = 0;
+ if (value == null || (len = value.length()) == 0) {
+ return;
+ }
+
+ for (int i = 0; i < value.length(); i++) {
+ char c = value.charAt(i);
+
+ while (c != ESCAPE_CHAR && c != QUOTE_CHAR && c >= SPACE) {
+
+ //read fast
+ justWrite(c);
+
+ if (i >= len - 1) {
+ return;
+ }
+
+ i++;
+ c = value.charAt(i);
+ }
+
+ switch (c) {
+ case QUOTE_CHAR:
+ case ESCAPE_CHAR:
+ justWrite(ESCAPE_CHAR);
+ justWrite(c);
+ break;
+ default:
+ if (c < SPACE) {
+ switch (c) {
+ case EOL:
+ justWrite("\\n");
+ break;
+ case '\r':
+ justWrite("\\r");
+ break;
+ case '\t':
+ justWrite("\\t");
+ break;
+ case '\b':
+ justWrite("\\b");
+ break;
+ case '\f':
+ justWrite("\\f");
+ break;
+ default:
+ justWrite(toUnicode(c));
+ }
+ } else if ((c >= '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) {
+ justWrite(toUnicode(c));
+ } else {
+ justWrite(c);
+ }
+ }
+ }
+
+ }
+
+ private static final String UNICODE_PREFIX = "\\u";
+ private static final String UNICODE_PREFIX_HELPER = "000";
+
+ private static String toUnicode(final char c) {
+
+ final String hex = UNICODE_PREFIX_HELPER + Integer.toHexString(c);
+ final String s = UNICODE_PREFIX + hex.substring(hex.length() - 4);
+
+ return s;
+ }
+
+ protected void justWrite(final char[] chars) {
+
+ if (bufferPos + chars.length >= buffer.length) {
+
+ int start = 0;
+ int len = buffer.length - bufferPos;
+
+ while (true) {
+ int end = start + len;
+ if (end > chars.length) {
+ end = chars.length;
+ }
+
+ System.arraycopy(chars, start, buffer, bufferPos, end - start);
+
+ bufferPos += (end - start);
+ start += (len);
+
+ if (start >= chars.length) {
+ return;
+ }
+
+ if (bufferPos >= buffer.length) {
+ flushBuffer();
+ len = buffer.length;
+ }
+
+ }
+
+ } else {
+ //fits completely into the buffer
+ System.arraycopy(chars, 0, buffer, bufferPos, chars.length);
+ bufferPos += chars.length;
}
+
}
+ protected void justWrite(final String value) {
+ final int valueLength = value.length();
+
+ if (bufferPos + valueLength >= buffer.length) {
+
+ int start = 0;
+ int len = buffer.length - bufferPos;
+
+ while (true) {
+ int end = start + len;
+ if (end > valueLength) {
+ end = valueLength;
+ }
+
+ value.getChars(start, end, buffer, bufferPos);
+
+ bufferPos += (end - start);
+ start += (len);
+
+ if (start >= valueLength) {
+ return;
+ }
+
+ if (bufferPos >= buffer.length) {
+ flushBuffer();
+ len = buffer.length;
+ }
+
+ }
+
+ } else {
+ //fits completely into the buffer
+ value.getChars(0, valueLength, buffer, bufferPos);
+ bufferPos += valueLength;
+ }
+
+ }
+
+ protected void justWrite(final char value) {
+
+ if (bufferPos >= buffer.length) {
+ flushBuffer();
+ }
+
+ buffer[bufferPos++] = value;
+
+ }
+
private void checkObject() {
- if (array) {
+ if (currentStructureElement == null || currentStructureElement.isArray) {
throw new JsonGenerationException("write(name, param) is only valid in objects");
}
}
private void checkArray() {
- if (!array) {
+ if (currentStructureElement == null || !currentStructureElement.isArray) {
throw new JsonGenerationException("write(param) is only valid in arrays");
}
}
private static void checkDoubleRange(final double value) {
if (Double.isInfinite(value) || Double.isNaN(value)) {
- throw new NumberFormatException("double can't be infinite and NaN");
+ throw new NumberFormatException("double can't be infinite or NaN");
+ }
+ }
+
+
+ //unopitimized, see below
+ private void writeLong0(final long i) {
+
+ justWrite(String.valueOf(i));
+ }
+
+ //unopitimized, see below
+ private void writeInt0(final int i) {
+
+ justWrite(String.valueOf(i));
+ }
+
+ //optimized number optimizations
+/*
+ private void writeLong0(final long i) {
+ if (i == Long.MIN_VALUE) {
+ justWrite("-9223372036854775808");
+ return;
+ }
+ final int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
+ final char[] buf = new char[size];
+ getChars(i, size, buf);
+ justWrite(buf);
+ }
+
+ private void writeInt0(final int i) {
+ if (i == Integer.MIN_VALUE) {
+ justWrite("-2147483648");
+ return;
+ }
+ final int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i);
+ final char[] buf = new char[size];
+ getChars(i, size, buf);
+ justWrite(buf);
+ }
+
+ private final static char[] DIGIT_TENS = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '1', '1', '1', '1', '1',
+ '1', '1', '2', '2', '2', '2', '2', '2', '2', '2', '2', '2', '3', '3', '3', '3', '3', '3', '3', '3', '3', '3', '4', '4', '4',
+ '4', '4', '4', '4', '4', '4', '4', '5', '5', '5', '5', '5', '5', '5', '5', '5', '5', '6', '6', '6', '6', '6', '6', '6', '6',
+ '6', '6', '7', '7', '7', '7', '7', '7', '7', '7', '7', '7', '8', '8', '8', '8', '8', '8', '8', '8', '8', '8', '9', '9', '9',
+ '9', '9', '9', '9', '9', '9', '9', };
+
+ private final static char[] DIGIT_ONES = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2',
+ '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '1', '2',
+ '3', '4', '5', '6', '7', '8', '9', };
+
+ private final static char[] DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+ 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+
+ // Requires positive x
+ private static int stringSize(final long x) {
+ long p = 10;
+ for (int i = 1; i < 19; i++) {
+ if (x < p) {
+ return i;
+ }
+ p = 10 * p;
+ }
+ return 19;
+ }
+
+ private static void getChars(long i, final int index, final char[] buf) {
+ long q;
+ int r;
+ int charPos = index;
+ char sign = 0;
+
+ if (i < 0) {
+ sign = '-';
+ i = -i;
+ }
+
+ // Get 2 digits/iteration using longs until quotient fits into an int
+ while (i > Integer.MAX_VALUE) {
+ q = i / 100;
+ // really: r = i - (q * 100);
+ r = (int) (i - ((q << 6) + (q << 5) + (q << 2)));
+ i = q;
+ buf[--charPos] = DIGIT_ONES[r];
+ buf[--charPos] = DIGIT_TENS[r];
+ }
+
+ // Get 2 digits/iteration using ints
+ int q2;
+ int i2 = (int) i;
+ while (i2 >= 65536) {
+ q2 = i2 / 100;
+ // really: r = i2 - (q * 100);
+ r = i2 - ((q2 << 6) + (q2 << 5) + (q2 << 2));
+ i2 = q2;
+ buf[--charPos] = DIGIT_ONES[r];
+ buf[--charPos] = DIGIT_TENS[r];
+ }
+
+ // Fall thru to fast mode for smaller numbers
+ // assert(i2 <= 65536, i2);
+ for (;;) {
+ q2 = (i2 * 52429) >>> (16 + 3);
+ r = i2 - ((q2 << 3) + (q2 << 1)); // r = i2-(q2*10) ...
+ buf[--charPos] = DIGITS[r];
+ i2 = q2;
+ if (i2 == 0) {
+ break;
+ }
+ }
+ if (sign != 0) {
+ buf[--charPos] = sign;
}
}
+*/
+
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
index 76f01d6..7a12fec 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonInMemoryParser.java
@@ -18,72 +18,84 @@
*/
package org.apache.fleece.core;
+import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
import javax.json.JsonArray;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.JsonString;
import javax.json.JsonValue;
import javax.json.stream.JsonLocation;
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import javax.json.stream.JsonParser;
// we don't use visitor pattern to ensure we work with other impl of JsonObject and JsonArray
-public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
+class JsonInMemoryParser implements JsonParser {
private final Iterator<Entry> iterator;
private Entry next = null;
- public JsonInMemoryParser(final JsonObject object) {
+ JsonInMemoryParser(final JsonObject object) {
final List<Entry> events = new LinkedList<Entry>();
generateObjectEvents(events, object);
iterator = events.iterator();
}
- public JsonInMemoryParser(final JsonArray array) {
+ JsonInMemoryParser(final JsonArray array) {
final List<Entry> events = new LinkedList<Entry>();
generateArrayEvents(events, array);
iterator = events.iterator();
}
private static void generateObjectEvents(final List<Entry> events, final JsonObject object) {
- events.add(new Entry(Event.START_OBJECT, object));
+ events.add(new Entry(Event.START_OBJECT, null));
for (final Map.Entry<String, JsonValue> entry : object.entrySet()) {
events.add(new Entry(Event.KEY_NAME, new JsonStringImpl(entry.getKey())));
final JsonValue value = entry.getValue();
addValueEvents(events, value);
}
- events.add(new Entry(Event.END_OBJECT, object));
+ events.add(new Entry(Event.END_OBJECT, null));
}
private static void generateArrayEvents(final List<Entry> events, final JsonArray array) {
- events.add(new Entry(Event.START_ARRAY, array));
+ events.add(new Entry(Event.START_ARRAY, null));
for (final JsonValue value : array) {
addValueEvents(events, value);
}
- events.add(new Entry(Event.END_ARRAY, array));
+ events.add(new Entry(Event.END_ARRAY, null));
}
private static void addValueEvents(final List<Entry> events, final JsonValue value) {
- if (JsonArray.class.isInstance(value)) {
- generateArrayEvents(events, JsonArray.class.cast(value));
- } else if (JsonObject.class.isInstance(value)) {
- generateObjectEvents(events, JsonObject.class.cast(value));
- } else if (JsonString.class.isInstance(value)) {
- events.add(new Entry(Event.VALUE_STRING, JsonValue.class.cast(value)));
- } else if (JsonNumber.class.isInstance(value)) {
- events.add(new Entry(Event.VALUE_NUMBER, JsonValue.class.cast(value)));
- } else if (value == JsonValue.TRUE) {
- events.add(new Entry(Event.VALUE_TRUE, value));
- } else if (value == JsonValue.FALSE) {
- events.add(new Entry(Event.VALUE_FALSE, value));
- } else if (value == JsonValue.NULL) {
- events.add(new Entry(Event.VALUE_NULL, value));
- } else {
- throw new IllegalArgumentException(value + " not supported");
+
+ switch(value.getValueType()) {
+ case ARRAY:
+ generateArrayEvents(events, JsonArray.class.cast(value));
+ break;
+ case OBJECT:
+ generateObjectEvents(events, JsonObject.class.cast(value));
+ break;
+ case NUMBER:
+ events.add(new Entry(Event.VALUE_NUMBER, value));
+ break;
+ case STRING:
+ events.add(new Entry(Event.VALUE_STRING, value));
+ break;
+ case FALSE:
+ events.add(new Entry(Event.VALUE_FALSE, null));
+ break;
+ case NULL:
+ events.add(new Entry(Event.VALUE_NULL, null));
+ break;
+ case TRUE:
+ events.add(new Entry(Event.VALUE_TRUE, null));
+ break;
+ default: throw new IllegalArgumentException(value + " not supported");
+
}
+
}
@Override
@@ -99,15 +111,15 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
@Override
public String getString() {
- if (JsonObject.class.isInstance(next.value) || JsonArray.class.isInstance(next.value)) {
+ if (next.event != Event.KEY_NAME && next.event != Event.VALUE_STRING) {
throw new IllegalStateException("String is for numbers and strings");
}
- return getEscapedString();
+ return JsonString.class.cast(next.value).getString();
}
@Override
public boolean isIntegralNumber() {
- if (!JsonNumber.class.isInstance(next.value)) {
+ if (next.event != Event.VALUE_NUMBER) {
throw new IllegalStateException("isIntegralNumber is for numbers");
}
return JsonNumber.class.cast(next.value).isIntegral();
@@ -115,7 +127,7 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
@Override
public int getInt() {
- if (!JsonNumber.class.isInstance(next.value)) {
+ if (next.event != Event.VALUE_NUMBER) {
throw new IllegalStateException("getInt is for numbers");
}
return JsonNumber.class.cast(next.value).intValue();
@@ -123,7 +135,7 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
@Override
public long getLong() {
- if (!JsonNumber.class.isInstance(next.value)) {
+ if (next.event != Event.VALUE_NUMBER) {
throw new IllegalStateException("getLong is for numbers");
}
return JsonNumber.class.cast(next.value).longValue();
@@ -131,7 +143,7 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
@Override
public BigDecimal getBigDecimal() {
- if (!JsonNumber.class.isInstance(next.value)) {
+ if (next.event != Event.VALUE_NUMBER) {
throw new IllegalStateException("getBigDecimal is for numbers");
}
return JsonNumber.class.cast(next.value).bigDecimalValue();
@@ -139,12 +151,7 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
@Override
public JsonLocation getLocation() { // no location for in memory parsers
- return new JsonLocationImpl(-1, -1, -1);
- }
-
- @Override
- public String getEscapedString() {
- return JsonValue.class.cast(next.value).toString();
+ return JsonLocationImpl.UNKNOW_LOCATION;
}
@Override
@@ -153,10 +160,10 @@ public class JsonInMemoryParser implements EscapedStringAwareJsonParser {
}
private static class Entry {
- private final Event event;
- private final JsonValue value;
+ final Event event;
+ final JsonValue value;
- private Entry(final Event event, final JsonValue value) {
+ Entry(final Event event, final JsonValue value) {
this.event = event;
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
index c1c094e..5c36d58 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonLocationImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.fleece.core;
-import javax.json.stream.JsonLocation;
-
import java.io.Serializable;
-public class JsonLocationImpl implements JsonLocation, Serializable {
+import javax.json.stream.JsonLocation;
+
+final class JsonLocationImpl implements JsonLocation, Serializable {
public static final JsonLocation UNKNOW_LOCATION = new JsonLocationImpl(-1, -1, -1);
@@ -30,7 +30,7 @@ public class JsonLocationImpl implements JsonLocation, Serializable {
private final long columnNumber;
private final long streamOffset;
- public JsonLocationImpl(final long lineNumber, final long columnNumber, final long streamOffset) {
+ JsonLocationImpl(final long lineNumber, final long columnNumber, final long streamOffset) {
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
this.streamOffset = streamOffset;
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
index b15a8b3..9928a42 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonLongImpl.java
@@ -18,14 +18,15 @@
*/
package org.apache.fleece.core;
-import javax.json.JsonNumber;
import java.math.BigDecimal;
import java.math.BigInteger;
-public class JsonLongImpl implements JsonNumber {
+import javax.json.JsonNumber;
+
+final class JsonLongImpl implements JsonNumber {
private final long value;
- public JsonLongImpl(final long value) {
+ JsonLongImpl(final long value) {
this.value = value;
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
index c992a9f..f1b388a 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonNumberImpl.java
@@ -18,15 +18,20 @@
*/
package org.apache.fleece.core;
-import javax.json.JsonNumber;
import java.math.BigDecimal;
import java.math.BigInteger;
-public class JsonNumberImpl implements JsonNumber {
+import javax.json.JsonNumber;
+
+final class JsonNumberImpl implements JsonNumber {
private final BigDecimal value;
private Integer hashCode = null;
- public JsonNumberImpl(final BigDecimal decimal) {
+ JsonNumberImpl(final BigDecimal decimal) {
+ if(decimal == null) {
+ throw new NullPointerException("decimal must not be null");
+ }
+
this.value = decimal;
}
@@ -87,10 +92,12 @@ public class JsonNumberImpl implements JsonNumber {
@Override
public int hashCode() {
- if (hashCode == null) {
- hashCode = value.hashCode();
+ Integer h=hashCode;
+ if (h == null) {
+ h = value.hashCode();
+ hashCode=h;
}
- return hashCode;
+ return h;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
index f76c26e..a61c9a3 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectBuilderImpl.java
@@ -18,85 +18,114 @@
*/
package org.apache.fleece.core;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import javax.json.JsonArrayBuilder;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import javax.json.JsonValue;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-public class JsonObjectBuilderImpl implements JsonObjectBuilder, Serializable {
- private final JsonObjectImpl delegate = new JsonObjectImpl();
+class JsonObjectBuilderImpl implements JsonObjectBuilder, Serializable {
+ private Map<String, JsonValue> tmpMap;
@Override
public JsonObjectBuilder add(final String name, final JsonValue value) {
- delegate.putInternal(name, value);
+ putValue(name, value);
return this;
}
@Override
public JsonObjectBuilder add(final String name, final String value) {
- delegate.putInternal(name, new JsonStringImpl(value));
+ putValue(name, new JsonStringImpl(value));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final BigInteger value) {
- delegate.putInternal(name, new JsonNumberImpl(new BigDecimal(value)));
+ putValue(name, new JsonNumberImpl(new BigDecimal(value)));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final BigDecimal value) {
- delegate.putInternal(name, new JsonNumberImpl(value));
+ putValue(name, new JsonNumberImpl(value));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final int value) {
- delegate.putInternal(name, new JsonLongImpl(value));
+ putValue(name, new JsonLongImpl(value));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final long value) {
- delegate.putInternal(name, new JsonLongImpl(value));
+ putValue(name, new JsonLongImpl(value));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final double value) {
- delegate.putInternal(name, new JsonDoubleImpl(value));
+ putValue(name, new JsonDoubleImpl(value));
return this;
}
@Override
public JsonObjectBuilder add(final String name, final boolean value) {
- delegate.putInternal(name, value ? JsonValue.TRUE : JsonValue.FALSE);
+ putValue(name, value ? JsonValue.TRUE : JsonValue.FALSE);
return this;
}
@Override
public JsonObjectBuilder addNull(final String name) {
- delegate.putInternal(name, JsonValue.NULL);
+ putValue(name, JsonValue.NULL);
return this;
}
@Override
public JsonObjectBuilder add(final String name, final JsonObjectBuilder builder) {
- delegate.putInternal(name, builder.build());
+ putValue(name, builder.build());
return this;
}
@Override
public JsonObjectBuilder add(final String name, final JsonArrayBuilder builder) {
- delegate.putInternal(name, builder.build());
+ putValue(name, builder.build());
return this;
}
+
+ private void putValue(String name, JsonValue value){
+ if(name == null || value == null) {
+ throw npe();
+ }
+
+ if(tmpMap==null){
+ tmpMap=new LinkedHashMap<String, JsonValue>();
+ }
+
+ tmpMap.put(name, value);
+ }
+
+ private static NullPointerException npe() {
+ return new NullPointerException("name or value/builder must not be null");
+ }
@Override
public JsonObject build() {
- return delegate;
+
+ if(tmpMap==null) {
+ return new JsonObjectImpl(Collections.EMPTY_MAP);
+ } else {
+ Map<String, JsonValue> dump = (Collections.unmodifiableMap(tmpMap));
+ tmpMap=null;
+ return new JsonObjectImpl(dump);
+ }
+
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
index c08f523..a71e42c 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonObjectImpl.java
@@ -18,26 +18,35 @@
*/
package org.apache.fleece.core;
+import java.io.Serializable;
+import java.util.AbstractMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
import javax.json.JsonArray;
import javax.json.JsonNumber;
import javax.json.JsonObject;
import javax.json.JsonString;
import javax.json.JsonValue;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-public class JsonObjectImpl extends LinkedHashMap<String, JsonValue> implements JsonObject, Serializable {
+public final class JsonObjectImpl extends AbstractMap<String, JsonValue> implements JsonObject, Serializable {
private Integer hashCode = null;
+ private final Map<String, JsonValue> unmodifieableBackingMap;
private <T> T value(final String name, final Class<T> clazz) {
- final Object v = get(name);
+ final Object v = unmodifieableBackingMap.get(name);
if (v != null) {
return clazz.cast(v);
}
throw new NullPointerException("no mapping for " + name);
}
+
+ public JsonObjectImpl(Map<String, JsonValue> backingMap) {
+ super();
+ this.unmodifieableBackingMap = backingMap;
+ }
+
@Override
public JsonArray getJsonArray(final String name) {
@@ -115,7 +124,7 @@ public class JsonObjectImpl extends LinkedHashMap<String, JsonValue> implements
@Override
public String toString() {
final StringBuilder builder = new StringBuilder("{");
- final Iterator<Map.Entry<String, JsonValue>> it = entrySet().iterator();
+ final Iterator<Map.Entry<String, JsonValue>> it = unmodifieableBackingMap.entrySet().iterator();
boolean hasNext = it.hasNext();
while (hasNext) {
final Map.Entry<String, JsonValue> entry = it.next();
@@ -124,7 +133,7 @@ public class JsonObjectImpl extends LinkedHashMap<String, JsonValue> implements
final JsonValue value = entry.getValue();
if (JsonString.class.isInstance(value)) {
- builder.append(JsonChars.QUOTE).append(value.toString()).append(JsonChars.QUOTE);
+ builder.append(value.toString());
} else {
builder.append(value != JsonValue.NULL ? value.toString() : JsonChars.NULL);
}
@@ -139,42 +148,20 @@ public class JsonObjectImpl extends LinkedHashMap<String, JsonValue> implements
@Override
public boolean equals(final Object obj) {
- return JsonObject.class.isInstance(obj) && super.equals(obj);
+ return JsonObjectImpl.class.isInstance(obj) && unmodifieableBackingMap.equals(JsonObjectImpl.class.cast(obj).unmodifieableBackingMap);
}
- @Override
- public void clear() {
- throw immutable();
- }
-
- @Override
- public JsonValue put(String key, JsonValue value) {
- throw immutable();
- }
-
- @Override
- public void putAll(Map<? extends String, ? extends JsonValue> jsonObject) {
- throw immutable();
- }
-
- @Override
- public JsonValue remove(Object key) {
- throw immutable();
- }
-
- private static UnsupportedOperationException immutable() {
- throw new UnsupportedOperationException("JsonObject is immutable. You can create another one thanks to JsonObjectBuilder");
- }
-
- public void putInternal(final String name, final JsonValue value) {
- super.put(name, value);
- }
@Override
public int hashCode() {
if (hashCode == null) {
- hashCode = super.hashCode();
+ hashCode = unmodifieableBackingMap.hashCode();
}
return hashCode;
}
+
+ @Override
+ public Set<java.util.Map.Entry<String, JsonValue>> entrySet() {
+ return unmodifieableBackingMap.entrySet();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-fleece/blob/192c774a/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
----------------------------------------------------------------------
diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
index 505542e..f43ceee 100644
--- a/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
+++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonParserFactoryImpl.java
@@ -18,31 +18,49 @@
*/
package org.apache.fleece.core;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.stream.JsonParser;
-import javax.json.stream.JsonParserFactory;
import java.io.InputStream;
import java.io.Reader;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-public class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.stream.JsonParser;
+import javax.json.stream.JsonParserFactory;
+
+class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
public static final String BUFFER_STRATEGY = "org.apache.fleece.buffer-strategy";
public static final String MAX_STRING_LENGTH = "org.apache.fleece.max-string-length";
public static final String BUFFER_LENGTH = "org.apache.fleece.default-char-buffer";
- public static final int DEFAULT_MAX_SIZE = Integer.getInteger(MAX_STRING_LENGTH, 8192*32);
-
- private final Map<String, ?> config;
+ public static final int DEFAULT_MAX_SIZE = Integer.getInteger(MAX_STRING_LENGTH, 8192*32); //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[] {
+
+ BUFFER_STRATEGY, MAX_STRING_LENGTH, BUFFER_LENGTH
+
+ };
+
private final int maxSize;
private final BufferStrategy.BufferProvider<char[]> bufferProvider;
private final BufferStrategy.BufferProvider<char[]> valueBufferProvider;
- public JsonParserFactoryImpl(final Map<String, ?> config) {
- this.config = config;
+ JsonParserFactoryImpl(final Map<String, ?> config) {
+
+
+ if(config != null) {
+
+ for (String configKey : SUPPORTED_CONFIG_KEYS) {
+ if(config.containsKey(configKey)) {
+ internalConfig.put(configKey, config.get(configKey));
+ }
+ }
+ }
+
final int bufferSize = getInt(BUFFER_LENGTH);
if (bufferSize <= 0) {
@@ -55,10 +73,7 @@ public class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
}
private BufferStrategy getBufferProvider() {
- if(config==null) {
- return BufferStrategy.QUEUE;
- }
- final Object name = config.get(BUFFER_STRATEGY);
+ final Object name = internalConfig.get(BUFFER_STRATEGY);
if (name != null) {
return BufferStrategy.valueOf(name.toString().toUpperCase(Locale.ENGLISH));
}
@@ -66,10 +81,7 @@ public class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
}
private int getInt(final String key) {
- if(config==null) {
- return DEFAULT_MAX_SIZE;
- }
- final Object maxStringSize = config.get(key);
+ final Object maxStringSize = internalConfig.get(key);
if (maxStringSize == null) {
return DEFAULT_MAX_SIZE;
} else if (Number.class.isInstance(maxStringSize)) {
@@ -78,17 +90,17 @@ public class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
return Integer.parseInt(maxStringSize.toString());
}
- private EscapedStringAwareJsonParser getDefaultJsonParserImpl(final InputStream in) {
+ private JsonParser getDefaultJsonParserImpl(final InputStream in) {
//UTF Auto detection RFC 4627
return new JsonStreamParserImpl(in, maxSize, bufferProvider, valueBufferProvider);
}
- private EscapedStringAwareJsonParser getDefaultJsonParserImpl(final InputStream in, final Charset charset) {
+ private JsonParser getDefaultJsonParserImpl(final InputStream in, final Charset charset) {
//use provided charset
return new JsonStreamParserImpl(in, charset, maxSize, bufferProvider, valueBufferProvider);
}
- private EscapedStringAwareJsonParser getDefaultJsonParserImpl(final Reader in) {
+ private JsonParser getDefaultJsonParserImpl(final Reader in) {
//no charset necessary
return new JsonStreamParserImpl(in, maxSize, bufferProvider, valueBufferProvider);
}
@@ -120,18 +132,18 @@ public class JsonParserFactoryImpl implements JsonParserFactory, Serializable {
@Override
public Map<String, ?> getConfigInUse() {
- return Collections.unmodifiableMap(config);
+ return Collections.unmodifiableMap(internalConfig);
}
- public EscapedStringAwareJsonParser createInternalParser(final InputStream in) {
+ public JsonParser createInternalParser(final InputStream in) {
return getDefaultJsonParserImpl(in);
}
- public EscapedStringAwareJsonParser createInternalParser(final InputStream in, final Charset charset) {
+ public JsonParser createInternalParser(final InputStream in, final Charset charset) {
return getDefaultJsonParserImpl(in, charset);
}
- public EscapedStringAwareJsonParser createInternalParser(final Reader reader) {
+ public JsonParser createInternalParser(final Reader reader) {
return getDefaultJsonParserImpl(reader);
}
}