From d70f76a3626eb1b3786a5cfac4528a449b476583 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Mon, 23 May 2016 09:26:27 +0200
Subject: HONEYCOMB-61: Fix outstanding issues

Change-Id: I2dec6bbd8db656663029ad0f59da1b583c890565
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../src/main/java/io/fd/honeycomb/v3po/translate/util/JsonUtils.java  | 4 ++--
 .../honeycomb/v3po/translate/util/write/TransactionWriteContext.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'v3po/translate-utils')

diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/JsonUtils.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/JsonUtils.java
index be6ffa235..d9798d07d 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/JsonUtils.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/JsonUtils.java
@@ -41,7 +41,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
-public class JsonUtils {
+public final class JsonUtils {
 
     private JsonUtils() {}
 
@@ -80,7 +80,7 @@ public class JsonUtils {
         final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(builder);
 
         final JsonParserStream jsonParser = JsonParserStream.create(writer, schemaContext);
-        final JsonReader reader = new JsonReader(new InputStreamReader(stream));
+        final JsonReader reader = new JsonReader(new InputStreamReader(stream, Charsets.UTF_8));
         jsonParser.parse(reader);
 
         return builder.build();
diff --git a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/TransactionWriteContext.java b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/TransactionWriteContext.java
index 20bbf19e0..47498f594 100644
--- a/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/TransactionWriteContext.java
+++ b/v3po/translate-utils/src/main/java/io/fd/honeycomb/v3po/translate/util/write/TransactionWriteContext.java
@@ -43,7 +43,7 @@ public final class TransactionWriteContext implements WriteContext {
     private final DOMDataReadOnlyTransaction afterTx;
     private final ModificationCache ctx;
     private final BindingNormalizedNodeSerializer serializer;
-    private MappingContext mappingContext;
+    private final MappingContext mappingContext;
 
     public TransactionWriteContext(final BindingNormalizedNodeSerializer serializer,
                                    final DOMDataReadOnlyTransaction beforeTx,
-- 
cgit 1.2.3-korg