From: guillaume.lambert Date: Mon, 9 Dec 2019 15:50:39 +0000 (+0100) Subject: fix mdsal WriteOperations deprecated warnings X-Git-Tag: 1.0.0~55 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=791363064da49cc631aae713ec1cd86db98c4fde;ds=sidebyside fix mdsal WriteOperations deprecated warnings Caution: the warning in Junit renderer TransactionUtils was only annotated since it cannot be modified without compromising most of the renderer Junit test suite. Signed-off-by: guillaume.lambert Change-Id: I189ea9c6368936e0eae15bb9c542ad60575d9c2d --- diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java index 9278dd131..bf12558fa 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/TransactionUtils.java @@ -72,7 +72,7 @@ public final class TransactionUtils { public static boolean writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier, DataObject object) { ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction(); - transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object, true); + transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object); transaction.commit();// submit(Timeouts.DATASTORE_WRITE, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT).get(); return true; } @@ -115,73 +115,104 @@ public final class TransactionUtils { public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network .rev180226.networks.Network getOverLayNetwork() { - NodeBuilder node1Builder = new NodeBuilder(); - node1Builder.setNodeId(new NodeId("node 1")); - node1Builder.withKey(new NodeKey(new NodeId("node 1"))); List supportingNodes1 = new ArrayList<>(); - supportingNodes1.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 1")) - .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build()); - node1Builder.setSupportingNode(supportingNodes1); + supportingNodes1 + .add(new SupportingNodeBuilder() + .setNodeRef(new NodeId("node 1")) + .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) + .build()); + NodeBuilder node1Builder = new NodeBuilder() + .setNodeId(new NodeId("node 1")) + .withKey(new NodeKey(new NodeId("node 1"))) + .setSupportingNode(supportingNodes1); List nodes = new ArrayList<>(); nodes.add(node1Builder.build()); - NodeBuilder node2Builder = new NodeBuilder(); - node2Builder.setNodeId(new NodeId("node 2")); - node2Builder.withKey(new NodeKey(new NodeId("node 2"))); List supportingNodes = new ArrayList<>(); - supportingNodes.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 2")) - .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build()); - node2Builder.setSupportingNode(supportingNodes); + supportingNodes + .add(new SupportingNodeBuilder() + .setNodeRef(new NodeId("node 2")) + .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) + .build()); + NodeBuilder node2Builder = new NodeBuilder() + .setNodeId(new NodeId("node 2")) + .withKey(new NodeKey(new NodeId("node 2"))) + .setSupportingNode(supportingNodes); nodes.add(node2Builder.build()); - NodeBuilder node3Builder = new NodeBuilder(); - node3Builder.setNodeId(new NodeId("node 3")); - node3Builder.withKey(new NodeKey(new NodeId("node 3"))); List supportingNodes3 = new ArrayList<>(); - supportingNodes3.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 3")) - .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build()); - node3Builder.setSupportingNode(supportingNodes3); + supportingNodes3 + .add(new SupportingNodeBuilder() + .setNodeRef(new NodeId("node 3")) + .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) + .build()); + NodeBuilder node3Builder = new NodeBuilder() + .setNodeId(new NodeId("node 3")) + .withKey(new NodeKey(new NodeId("node 3"))) + .setSupportingNode(supportingNodes3); nodes.add(node3Builder.build()); - NodeBuilder node4Builder = new NodeBuilder(); - node4Builder.setNodeId(new NodeId("node 4")); - node4Builder.withKey(new NodeKey(new NodeId("node 4"))); List supportingNodes4 = new ArrayList<>(); - supportingNodes4.add(new SupportingNodeBuilder().setNodeRef(new NodeId("node 4")) - .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)).build()); - node4Builder.setSupportingNode(supportingNodes4); + supportingNodes4 + .add(new SupportingNodeBuilder() + .setNodeRef(new NodeId("node 4")) + .setNetworkRef(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID)) + .build()); + NodeBuilder node4Builder = new NodeBuilder() + .setNodeId(new NodeId("node 4")) + .withKey(new NodeKey(new NodeId("node 4"))) + .setSupportingNode(supportingNodes4); nodes.add(node4Builder.build()); - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 - .networks.NetworkBuilder networkBuilder = - new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network - .rev180226.networks.NetworkBuilder(); - networkBuilder.setNode(nodes); - networkBuilder.setNetworkId(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226 - .networks.Network network = networkBuilder.build(); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkBuilder + networkBuilder = + new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks + .NetworkBuilder() + .setNode(nodes) + .setNetworkId(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network network = + networkBuilder.build(); Optional.of(network); return network; } public static Network1 getNetwork() { List supportingLinks = new ArrayList<>(); - SupportingLink supportingLink1 = new SupportingLinkBuilder().setLinkRef("ref1") - .setNetworkRef(new NetworkId("net1")).build(); - SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef("ref2") - .setNetworkRef(new NetworkId("net2")).build(); + SupportingLink supportingLink1 = new SupportingLinkBuilder() + .setLinkRef("ref1") + .setNetworkRef(new NetworkId("net1")) + .build(); + SupportingLink supportingLink2 = new SupportingLinkBuilder() + .setLinkRef("ref2") + .setNetworkRef(new NetworkId("net2")) + .build(); supportingLinks.add(supportingLink1); supportingLinks.add(supportingLink2); List links = new ArrayList<>(); - Link link1 = new LinkBuilder().setLinkId(new LinkId("link 1")) - .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 1")) - .setDestTp("dest tp").build()) - .setSource(new SourceBuilder().setSourceNode(new NodeId("node 2")) - .setSourceTp("src tp").build()) - .setSupportingLink(supportingLinks).build(); + Link link1 = new LinkBuilder() + .setLinkId(new LinkId("link 1")) + .setDestination( + new DestinationBuilder() + .setDestNode(new NodeId("node 1")) + .setDestTp("dest tp").build()) + .setSource( + new SourceBuilder() + .setSourceNode(new NodeId("node 2")) + .setSourceTp("src tp") + .build()) + .setSupportingLink(supportingLinks) + .build(); - Link link2 = new LinkBuilder().setLinkId(new LinkId("link 2")) - .setDestination(new DestinationBuilder().setDestNode(new NodeId("node 3")) - .setDestTp("dest tp").build()) - .setSource(new SourceBuilder().setSourceNode(new NodeId("node 4")) - .setSourceTp("src tp").build()) - .setSupportingLink(supportingLinks).build(); + Link link2 = new LinkBuilder() + .setLinkId(new LinkId("link 2")) + .setDestination( + new DestinationBuilder() + .setDestNode(new NodeId("node 3")) + .setDestTp("dest tp") + .build()) + .setSource( + new SourceBuilder() + .setSourceNode(new NodeId("node 4")) + .setSourceTp("src tp") + .build()) + .setSupportingLink(supportingLinks) + .build(); links.add(link1); links.add(link2); Network1 network = new Network1Builder().setLink(links).build(); 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 eac16aa45..fdafa24f5 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java @@ -232,7 +232,7 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength // TODO skip for now continue; } - nodeWriteTx.put(LogicalDatastoreType.CONFIGURATION, createNode1IID(nodeId), node1Builder.build(), true); + nodeWriteTx.put(LogicalDatastoreType.CONFIGURATION, createNode1IID(nodeId), node1Builder.build()); } try { nodeWriteTx.commit().get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS); @@ -547,7 +547,7 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength continue; } addUsedWlTx.put(LogicalDatastoreType.CONFIGURATION, createTerminationPoint1IIDBuilder(idPair.getNodeID(), - idPair.getTpID()).build(), tp1Builder.build(), true); + idPair.getTpID()).build(), tp1Builder.build()); } try { addUsedWlTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java index 11d443be7..6b68bf1c7 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/TransactionUtils.java @@ -24,6 +24,8 @@ public final class TransactionUtils { } + @SuppressWarnings("deprecation") + // deviceTx.put needs the "true" boolean parameter at the end in order to not compromise the Junit test suite public static boolean writeTransaction(DeviceTransactionManager deviceTransactionManager, String nodeId, LogicalDatastoreType logicalDatastoreType,