From c5fc25e73679127ad29a5196410f24b50dcc8f7d Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 13 Aug 2019 16:06:50 +0200 Subject: [PATCH] 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 Change-Id: I12fc958dfb5d513bdddd288e527f9284eb00dcc9 --- .../common/converter/JSONDataObjectConverter.java | 7 +++++-- .../opendaylight/transportpce/pce/gnpy/GnpyResult.java | 5 ++++- .../pce/gnpy/ServiceDataStoreOperationsImpl.java | 7 ++++--- .../org/opendaylight/transportpce/pce/graph/PceGraph.java | 8 ++++---- .../renderer/NetworkModelWavelengthServiceImpl.java | 7 ++++--- .../service/ServiceDataStoreOperationsImplTest.java | 3 ++- 6 files changed, 23 insertions(+), 14 deletions(-) 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 8e992b707..74a6a1c64 100644 --- 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 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 4aa3131b8..a039bfe68 100644 --- 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 212985aa3..3910c996c 100644 --- 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 711cbcebe..484da7695 100644 --- 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 swp = - new KShortestPaths(weightedGraph, kpathsToBring, mhopsPerPath, wpv); + KShortestSimplePaths swp = + new KShortestSimplePaths(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 760c1971c..4e654a745 100644 --- 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 4c285024e..55a11a8ca 100644 --- 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; -- 2.36.6