From d0335a9bd7590c349ac92023f4b65e69c65de030 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Thu, 27 Oct 2016 13:37:17 +0200
Subject: [PATCH] Use UTF-8 as the standard output

Do not rely on environment-specific encoding, but always
use UTF-8 as the target encoding.

Change-Id: I540fed7611ec66ae2aaeec3b86e21af7376208b9
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 .../nettyutil/handler/NetconfMessageToXMLEncoder.java     | 3 ++-
 .../controller/sal/restconf/impl/test/TestUtils.java      | 8 +++++---
 .../netconf/sal/rest/doc/impl/ApiDocServiceImpl.java      | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java
index 52d621dd08..608f199829 100644
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java
@@ -16,6 +16,7 @@ import io.netty.handler.codec.MessageToByteEncoder;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
@@ -52,7 +53,7 @@ public class NetconfMessageToXMLEncoder extends MessageToByteEncoder<NetconfMess
 
             // Using custom BufferedWriter that does not provide newLine method as performance improvement
             // see javadoc for BufferedWriter
-            StreamResult result = new StreamResult(new BufferedWriter(new OutputStreamWriter(os)));
+            StreamResult result = new StreamResult(new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8)));
             DOMSource source = new DOMSource(msg.getDocument());
             ThreadLocalTransformers.getPrettyTransformer().transform(source, result);
         }
diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
index 23c18f18f5..38fc0bba13 100644
--- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
+++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java
@@ -19,6 +19,7 @@ import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.sql.Date;
 import java.text.ParseException;
 import java.util.HashMap;
@@ -114,10 +115,11 @@ public final class TestUtils {
             transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
             transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
 
-            transformer.transform(new DOMSource(doc), new StreamResult(new OutputStreamWriter(out, "UTF-8")));
+            transformer.transform(new DOMSource(doc), new StreamResult(new OutputStreamWriter(out,
+                StandardCharsets.UTF_8)));
             final byte[] charData = out.toByteArray();
-            return new String(charData, "UTF-8");
-        } catch (IOException | TransformerException e) {
+            return new String(charData, StandardCharsets.UTF_8);
+        } catch (TransformerException e) {
             final String msg = "Error during transformation of Document into String";
             LOG.error(msg, e);
             return msg;
diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
index dba66b416e..026296baba 100644
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java
@@ -9,6 +9,7 @@ package org.opendaylight.netconf.sal.rest.doc.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.Map.Entry;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
@@ -75,7 +76,7 @@ public class ApiDocServiceImpl implements ApiDocService {
     @Override
     public synchronized Response getListOfMounts(final UriInfo uriInfo) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        try (OutputStreamWriter streamWriter = new OutputStreamWriter(baos)) {
+        try (OutputStreamWriter streamWriter = new OutputStreamWriter(baos, StandardCharsets.UTF_8)) {
             final JSONWriter writer = new JSONWriter(streamWriter);
             writer.array();
             for (final Entry<String, Long> entry : MountPointSwagger.getInstance()
-- 
2.36.6