From 4ffe60da9b0625a9399fcedc60019a1d68656ae8 Mon Sep 17 00:00:00 2001 From: manuedelf Date: Tue, 3 Nov 2020 10:02:44 +0100 Subject: [PATCH 1/1] Precise Charsets in FileReader() methods This is strongly advised and will be enforced after Silicon migration and its switch to maven-modernizer-plugin. JIRA: TRNSPRTPCE-345 Signed-off-by: guillaume.lambert Change-Id: I8f432106cee8a117979bd40e2b889d563ae44fb3 --- .../networkmodel/util/OpenRoadmOtnTopologyTest.java | 3 ++- .../transportpce/pce/gnpy/GnpyUtilitiesImplTest.java | 9 ++++++--- .../transportpce/pce/utils/PceTestUtils.java | 7 +++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java index ab68a02d9..70f03b6c4 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java @@ -23,6 +23,7 @@ import com.google.gson.stream.JsonReader; import java.io.FileReader; import java.io.IOException; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -76,7 +77,7 @@ public class OpenRoadmOtnTopologyTest { private Nodes portMappingBad; public OpenRoadmOtnTopologyTest() { - try (Reader reader = new FileReader("src/test/resources/portMapping.json"); + try (Reader reader = new FileReader("src/test/resources/portMapping.json", StandardCharsets.UTF_8); JsonReader portMappingReader = new JsonReader(reader)) { Network portMapping = (Network) JsonUtil.getInstance().getDataObjectFromJson(portMappingReader, QName.create("http://org/opendaylight/transportpce/portmapping", "2020-08-27", "network")); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java index 42c463488..90f395608 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java @@ -17,6 +17,7 @@ import java.io.FileReader; import java.io.IOException; import java.io.Reader; import java.net.URI; +import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.concurrent.ExecutionException; import org.glassfish.grizzly.http.server.HttpServer; @@ -65,21 +66,23 @@ public class GnpyUtilitiesImplTest extends AbstractTest { private NetworkTransactionImpl networkTransaction; private static HttpServer httpServer; - public GnpyUtilitiesImplTest() { + public GnpyUtilitiesImplTest() throws IOException { networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.getDataBroker())); JsonReader networkReader = null; JsonReader topoReader = null; try { // load openroadm-network - Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json"); + Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json", + StandardCharsets.UTF_8); networkReader = new JsonReader(gnpyNetwork); Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID); // load openroadm-topology - Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json"); + Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json", + StandardCharsets.UTF_8); topoReader = new JsonReader(gnpyTopo); networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java index 2df1601f7..140e546ac 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java @@ -12,6 +12,7 @@ import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -79,9 +80,11 @@ public final class PceTestUtils { try ( // load openroadm-network - Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json"); + Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json", + StandardCharsets.UTF_8); // load openroadm-topology - Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json"); + Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json", + StandardCharsets.UTF_8); JsonReader networkReader = new JsonReader(gnpyNetwork); JsonReader topoReader = new JsonReader(gnpyTopo); ) { -- 2.36.6