Merge changes Iee0b74c7,Ibe1f0b89,I1140eec7

* changes:
  Make OpenRoadmOtnTopology class static Maps final
  Improve networkmodel util OpenRoadmOtnTopology 2/2
  Improve networkmodel util OpenRoadmOtnTopology 1/2

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/JsonStringConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/JsonStringConverter.java
index 617e81665afec3de4b6eb2eeb1e6351364bff7e5..7f7680b5fa4bdd55cdffa2c1ef9a08b813a91637 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/JsonStringConverter.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/JsonStringConverter.java
@@ -37,9 +37,8 @@ import org.slf4j.LoggerFactory;
 
 public class JsonStringConverter<T extends DataObject> {
     private static final Logger LOG = LoggerFactory.getLogger(JsonStringConverter.class);
-    private static final JsonParser PARSER = new JsonParser();
-    private BindingDOMCodecServices bindingDOMCodecServices;
 
+    private BindingDOMCodecServices bindingDOMCodecServices;
 
     public JsonStringConverter(BindingDOMCodecServices bindingDOMCodecServices) {
         this.bindingDOMCodecServices = bindingDOMCodecServices;
@@ -73,7 +72,7 @@ public class JsonStringConverter<T extends DataObject> {
                 nodeWriter.write(bindingDOMCodecServices.toNormalizedNode(id, dataObject).getValue());
                 nodeWriter.flush();
             }
-            JsonObject asJsonObject = PARSER.parse(writer.toString()).getAsJsonObject();
+            JsonObject asJsonObject = JsonParser.parseString(writer.toString()).getAsJsonObject();
             return new Gson().toJson(asJsonObject);
         } catch (IOException e) {
             LOG.error("Cannot convert object {} to string ", dataObject);