From 33751565694e2a90733073a9063fecf4cecb5a80 Mon Sep 17 00:00:00 2001 From: salyh Date: Fri, 11 Jul 2014 20:41:06 +0200 Subject: [PATCH 01/14] fixed parser creation in factories Signed-off-by: salyh --- .../main/java/org/apache/fleece/core/JsonParserFactoryImpl.java | 4 ++++ .../main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) 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 8e7916b..6195d83 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 @@ -119,6 +119,10 @@ public class JsonParserFactoryImpl implements JsonParserFactory, Serializable { public EscapedStringAwareJsonParser createInternalParser(final InputStream in) { return getDefaultJsonParserImpl(in); } + + public EscapedStringAwareJsonParser createInternalParser(final InputStream in, final Charset charset) { + return getDefaultJsonParserImpl(in, charset); + } public EscapedStringAwareJsonParser createInternalParser(final Reader reader) { return getDefaultJsonParserImpl(reader); diff --git a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java b/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java index 9fa2fa9..1d04f26 100644 --- a/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java +++ b/fleece-core/src/main/java/org/apache/fleece/core/JsonReaderFactoryImpl.java @@ -18,16 +18,17 @@ */ package org.apache.fleece.core; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.Reader; import java.io.Serializable; import java.nio.charset.Charset; import java.util.Collections; import java.util.Map; +import javax.json.JsonReader; +import javax.json.JsonReaderFactory; + +@SuppressWarnings("unused") public class JsonReaderFactoryImpl implements JsonReaderFactory, Serializable { private final Map config; private final JsonParserFactoryImpl parserFactory; @@ -49,7 +50,7 @@ public class JsonReaderFactoryImpl implements JsonReaderFactory, Serializable { @Override public JsonReader createReader(final InputStream in, final Charset charset) { - return createReader(new InputStreamReader(in, charset)); + return new JsonReaderImpl(parserFactory.createInternalParser(in, charset)); } @Override -- 1.8.5.2 (Apple Git-48)