fix some deprecated warnings

- org.openroadm.network.topology.rev181130.Node1 getNodeType is
  deprecated but not in Node1Builder
- org.jgrapht.alg.shortestpath.KShortestPaths replaced in favor of
  KShortestSimplePaths
- writeOrModifyOrDeleteServiceList deprecated method should not raise
  any warnings when called by Junit tests -> @SuppressWarnings decorator
- fix org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream
  create method
- fix org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory
  createSimple and createLazy methods

Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I12fc958dfb5d513bdddd288e527f9284eb00dcc9

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java b/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java
index 8e992b707c93da3825fc04e324a241e49a85aca3..74a6a1c64e7d35cb7c0b3ed8e10937866b1fe73d 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java
@@ -27,6 +27,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
+import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
@@ -103,7 +104,8 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter {
             ConvertType<T> convertType) {
         Writer writer = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(writer);
-        JSONCodecFactory jsonCodecFactory = JSONCodecFactory.createLazy(getSchemaContext());
+        JSONCodecFactory jsonCodecFactory =
+            JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.createLazy(getSchemaContext());
         NormalizedNodeStreamWriter create =
             JSONNormalizedNodeStreamWriter.createExclusiveWriter(jsonCodecFactory,
             (org.opendaylight.yangtools.yang.model.api.DataNodeContainer)null, null, jsonWriter);
@@ -133,7 +135,8 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter {
             JsonReader reader) {
         NormalizedNodeResult result = new NormalizedNodeResult();
         try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-            JsonParserStream jsonParser = JsonParserStream.create(streamWriter, getSchemaContext(),
+            JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
+                JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(getSchemaContext()),
                 getSchemaContext())) {
             jsonParser.parse(reader);
         } catch (IOException e) {

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java
index 4aa3131b88cabc311fc42dfbde472cd86a8d1e8a..a039bfe68721d7fb2e3ff15c4a42cf95bfecf44b 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyResult.java
@@ -60,6 +60,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
+import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
@@ -231,7 +232,9 @@ public class GnpyResult {
         NormalizedNodeResult result = new NormalizedNodeResult();
         SchemaContext schemaContext = getSchemaContext(objectClass);
         try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
-                JsonParserStream jsonParser = JsonParserStream.create(streamWriter, schemaContext, schemaContext);) {
+                JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
+                    JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(schemaContext),
+                    schemaContext);) {
             LOG.debug("GNPy: the path to the reader {}", reader.getPath());
             LOG.debug("GNPy: the reader {}", reader.toString());
             LOG.debug("GNPy: the jsonParser class {} // jsonParser to string {}", jsonParser.getClass(),

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java
index 212985aa303285cab46527b3394da5fdfa8f8465..3910c996c503b8bfa891082160b0d3e2b2cf122d 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/ServiceDataStoreOperationsImpl.java
@@ -39,7 +39,7 @@ import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory;
+import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
 import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.codec.gson.JsonWriterFactory;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@@ -112,8 +112,9 @@ public class ServiceDataStoreOperationsImpl implements ServiceDataStoreOperation
              * JsonWriterFactory.createJsonWriter(writer)
              */
             domWriter = JSONNormalizedNodeStreamWriter.createExclusiveWriter(
-                    JSONCodecFactory.createSimple(schemaContext), scPath.getParent(),
-                    scPath.getLastComponent().getNamespace(), JsonWriterFactory.createJsonWriter(writer, 2));
+                JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.createSimple(schemaContext),
+                scPath.getParent(), scPath.getLastComponent().getNamespace(),
+                JsonWriterFactory.createJsonWriter(writer, 2));
             // The write part
             final BindingStreamEventWriter bindingWriter = codecRegistry.newWriter(id, domWriter);
             codecRegistry.getSerializer(id.getTargetType()).serialize(object, bindingWriter);

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
index 711cbcebe2d165e0d468a7b20fb1a4b3f7bd494c..484da76953d8b1503a35b5b233f3bb45c07aabba 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.jgrapht.GraphPath;
-import org.jgrapht.alg.shortestpath.KShortestPaths;
+import org.jgrapht.alg.shortestpath.KShortestSimplePaths;
 import org.jgrapht.alg.shortestpath.PathValidator;
 import org.jgrapht.graph.DefaultDirectedWeightedGraph;
 import org.opendaylight.transportpce.common.ResponseCodes;
@@ -136,10 +136,10 @@ public class PceGraph {
         }
 
         // KShortestPaths on weightedGraph
-        KShortestPaths<String, PceGraphEdge> swp =
-            new KShortestPaths<String, PceGraphEdge>(weightedGraph, kpathsToBring, mhopsPerPath, wpv);
+        KShortestSimplePaths<String, PceGraphEdge> swp =
+            new KShortestSimplePaths<String, PceGraphEdge>(weightedGraph, mhopsPerPath, wpv);
 
-        allWPaths = swp.getPaths(apceNode.getNodeId().getValue(), zpceNode.getNodeId().getValue());
+        allWPaths = swp.getPaths(apceNode.getNodeId().getValue(), zpceNode.getNodeId().getValue(), kpathsToBring);
 
         if (allWPaths.isEmpty()) {
             LOG.info(" In runKgraphs : algorithm didn't find any path");

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
index 760c1971c33ef0eddeac01d4ea7e72923d1d9931..4e654a745fee5f7321673a6bd67423f4d2e55e92 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java
@@ -191,7 +191,7 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength
 
             Node1Builder node1Builder = new Node1Builder(node);
 
-            switch (node.getNodeType()) {
+            switch (node1Builder.getNodeType()) {
                 case DEGREE:
                     DegreeAttributes degreeAttributes = node.getDegreeAttributes();
                     DegreeAttributesBuilder degreeAttributesBuilder;
@@ -250,8 +250,9 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength
             if (nodeOpt.isPresent()) {
                 node = nodeOpt.get();
             } else {
-                LOG.error("Unable to get node {} from topology {}! Skipping addition of available wavelength for this"
-                        + "node.", nodeId, NetworkUtils.OVERLAY_NETWORK_ID);
+                LOG.error(
+                    "Unable to get node {} from topology {}! Skipping addition of available wavelength for this node.",
+                         nodeId, NetworkUtils.OVERLAY_NETWORK_ID);
                 continue;
             }
 

diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
index 4c285024e2de54987ab3b886ffb08da2c6f27639..55a11a8caa056650a862ed96a17f6a5d9ce2c39e 100644 (file)
--- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
+++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/service/ServiceDataStoreOperationsImplTest.java
@@ -32,7 +32,8 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.ResponseParametersBuilder;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev171016.response.parameters.sp.response.parameters.PathDescriptionBuilder;
 
-
+//writeOrModifyOrDeleteServiceList deprecated method should not raise warnings in tests
+@SuppressWarnings("deprecation")
 public class ServiceDataStoreOperationsImplTest extends AbstractTest {
 
     private ServiceDataStoreOperationsImpl serviceDataStoreOperations;