From eb86c7734da04d2424219163cc688ab293c53ec0 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 16 Jan 2015 10:25:29 +0100 Subject: [PATCH] Bug 868: Replaced use of toInstance() for build(). Change-Id: I9a4ca67c449c035dfe93c1692c779660ec910a00 Signed-off-by: Tony Tkacik --- .../arphandler/core/ProactiveFloodFlowWriter.java | 6 +++--- .../arphandler/inventory/InventoryReader.java | 6 +++--- .../arphandler/core/PacketDispatcherTest.java | 14 +++++++------- .../arphandler/flow/InitialFlowWriterTest.java | 2 +- .../arphandler/inventory/InventoryReaderTest.java | 2 +- .../l2switch/flow/FlowWriterServiceImplTest.java | 2 +- .../l2switch/flow/InitialFlowWriterTest.java | 2 +- .../l2switch/flow/InventoryReaderTest.java | 2 +- .../l2switch/flow/ReactiveFlowWriterTest.java | 2 +- .../l2switch/util/InstanceIdentifierUtilsTest.java | 6 +++--- .../topology/TopologyLinkDataChangeHandler.java | 2 +- .../loopremover/flow/InitialFlowWriterTest.java | 2 +- .../util/InstanceIdentifierUtilsTest.java | 6 +++--- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java b/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java index 0186ea78..889986aa 100644 --- a/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java +++ b/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/core/ProactiveFloodFlowWriter.java @@ -167,7 +167,7 @@ public class ProactiveFloodFlowWriter implements DataChangeListener, Opendayligh .child(Node.class) .child(NodeConnector.class) .augmentation(StpStatusAwareNodeConnector.class) - .toInstance(); + .build(); return dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, path, this, AsyncDataBroker.DataChangeScope.BASE); } @@ -229,7 +229,7 @@ public class ProactiveFloodFlowWriter implements DataChangeListener, Opendayligh InstanceIdentifier.InstanceIdentifierBuilder nodesInsIdBuilder = InstanceIdentifier.builder(Nodes.class); ReadOnlyTransaction readOnlyTransaction = dataBroker.newReadOnlyTransaction(); Optional dataObjectOptional = null; - dataObjectOptional = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, nodesInsIdBuilder.toInstance()).get(); + dataObjectOptional = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, nodesInsIdBuilder.build()).get(); if(dataObjectOptional.isPresent()) { nodes = (Nodes) dataObjectOptional.get(); } @@ -345,7 +345,7 @@ public class ProactiveFloodFlowWriter implements DataChangeListener, Opendayligh */ private Future> writeFlowToSwitch(NodeId nodeId, Flow flow) { InstanceIdentifier nodeInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, new NodeKey(nodeId)).toInstance(); + .child(Node.class, new NodeKey(nodeId)).build(); InstanceIdentifier tableInstanceId = nodeInstanceId.augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flowTableId)); InstanceIdentifier flowPath = tableInstanceId diff --git a/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java b/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java index 94f7eb68..c3936578 100644 --- a/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java +++ b/arphandler/implementation/src/main/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReader.java @@ -88,7 +88,7 @@ public class InventoryReader { try { Optional dataObjectOptional = null; - dataObjectOptional = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, nodesInsIdBuilder.toInstance()).get(); + dataObjectOptional = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, nodesInsIdBuilder.build()).get(); if(dataObjectOptional.isPresent()) nodes = (Nodes) dataObjectOptional.get(); } catch(InterruptedException e) { @@ -118,7 +118,7 @@ public class InventoryReader { } NodeConnectorRef ncRef = new NodeConnectorRef( InstanceIdentifier.builder(Nodes.class).child(Node.class, node.getKey()) - .child(NodeConnector.class, nodeConnector.getKey()).toInstance()); + .child(NodeConnector.class, nodeConnector.getKey()).build()); nodeConnectorRefs.add(ncRef); } } @@ -126,7 +126,7 @@ public class InventoryReader { switchNodeConnectors.put(node.getId().getValue(), nodeConnectorRefs); NodeConnectorRef ncRef = new NodeConnectorRef( InstanceIdentifier.builder(Nodes.class).child(Node.class, node.getKey()) - .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId(node.getId().getValue() + ":LOCAL"))).toInstance()); + .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId(node.getId().getValue() + ":LOCAL"))).build()); _logger.debug("Local port for node {} is {}", node.getKey(), ncRef); controllerSwitchConnectors.put(node.getId().getValue(), ncRef); } diff --git a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java index 0cf94096..25c82f7c 100644 --- a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java +++ b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/core/PacketDispatcherTest.java @@ -52,7 +52,7 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId1 = InstanceIdentifier.builder(Nodes.class) .child(Node.class) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("1"))) - .toInstance(); + .build(); packetDispatcher.sendPacketOut(null, new NodeConnectorRef(ncInsId1), new NodeConnectorRef(ncInsId1)); @@ -81,11 +81,11 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId1 = InstanceIdentifier.builder(Nodes.class) .child(Node.class) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("1"))) - .toInstance(); + .build(); InstanceIdentifier ncInsId2 = InstanceIdentifier.builder(Nodes.class) .child(Node.class) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("2"))) - .toInstance(); + .build(); nodeConnectors.add(new NodeConnectorRef(ncInsId1)); nodeConnectors.add(new NodeConnectorRef(ncInsId1)); nodeConnectors.add(new NodeConnectorRef(ncInsId2)); @@ -122,7 +122,7 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId("1"))) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("1"))) - .toInstance(); + .build(); HashMap controllerSwitchConnectors = Mockito.mock(HashMap.class); when(controllerSwitchConnectors.get(any(String.class))).thenReturn(null); when(inventoryReader.getControllerSwitchConnectors()).thenReturn(controllerSwitchConnectors); @@ -141,7 +141,7 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId1 = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId("1"))) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("1"))) - .toInstance(); + .build(); NodeConnectorRef ncRef1 = new NodeConnectorRef(ncInsId1); HashMap controllerSwitchConnectors = Mockito.mock(HashMap.class); when(controllerSwitchConnectors.get(any(String.class))).thenReturn(ncRef1); @@ -162,7 +162,7 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId1 = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId("1"))) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("1"))) - .toInstance(); + .build(); NodeConnectorRef ncRef1 = new NodeConnectorRef(ncInsId1); HashMap controllerSwitchConnectors = Mockito.mock(HashMap.class); when(controllerSwitchConnectors.get(any(String.class))).thenReturn(ncRef1); @@ -173,7 +173,7 @@ public class PacketDispatcherTest { InstanceIdentifier ncInsId2 = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId("2"))) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("2"))) - .toInstance(); + .build(); nodeConnectors.add(new NodeConnectorRef(ncInsId1)); nodeConnectors.add(new NodeConnectorRef(ncInsId1)); nodeConnectors.add(new NodeConnectorRef(ncInsId2)); diff --git a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java index 9164b91b..fc47ecc6 100644 --- a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java +++ b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/flow/InitialFlowWriterTest.java @@ -71,7 +71,7 @@ public class InitialFlowWriterTest { @Test public void onNodeUpdated_Valid() throws Exception { - InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).toInstance(); + InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).build(); NodeUpdated nodeUpdated = new NodeUpdatedBuilder().setNodeRef(new NodeRef(nodeInstanceIdentifier)).build(); initialFlowWriter.onNodeUpdated(nodeUpdated); Thread.sleep(250); diff --git a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java index 6c566d1d..45e4bb1a 100644 --- a/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java +++ b/arphandler/implementation/src/test/java/org/opendaylight/l2switch/arphandler/inventory/InventoryReaderTest.java @@ -91,7 +91,7 @@ public class InventoryReaderTest { when(dataBroker.newReadOnlyTransaction()).thenReturn(readOnlyTransaction); assertNotNull(inventoryReader.getNodeConnector( - InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId("openflow:1"))).toInstance(), + InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId("openflow:1"))).build(), new MacAddress("aa:bb:cc:dd:ee:ff"))); verify(readOnlyTransaction, times(1)).close(); } diff --git a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java index deb40996..3ec8d5bb 100644 --- a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java +++ b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/FlowWriterServiceImplTest.java @@ -47,7 +47,7 @@ public class FlowWriterServiceImplTest { nodeConnectorInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child( Node.class, new NodeKey(new NodeId("node-id"))).child( - NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("nodeconnector-id"))).toInstance(); + NodeConnector.class, new NodeConnectorKey(new NodeConnectorId("nodeconnector-id"))).build(); nodeConnectorRef = new NodeConnectorRef(nodeConnectorInstanceIdentifier); MacAddress sourceMac = new MacAddress("00:00:ac:f0:01:01"); diff --git a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java index 57ea2e69..f4301d5d 100644 --- a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java +++ b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InitialFlowWriterTest.java @@ -70,7 +70,7 @@ public class InitialFlowWriterTest { @Test public void onNodeUpdated_Valid() throws Exception { - InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).toInstance(); + InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).build(); NodeUpdated nodeUpdated = new NodeUpdatedBuilder().setNodeRef(new NodeRef(nodeInstanceIdentifier)).build(); initialFlowWriter.onNodeUpdated(nodeUpdated); Thread.sleep(250); diff --git a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java index aaee0688..ba8ad6aa 100644 --- a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java +++ b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/InventoryReaderTest.java @@ -68,7 +68,7 @@ public class InventoryReaderTest { public void getNodeConnectorTest() throws Exception{ nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child( - Node.class, new NodeKey(new NodeId("node-id"))).toInstance(); + Node.class, new NodeKey(new NodeId("node-id"))).build(); when(dataService.newReadOnlyTransaction()).thenReturn(readOnlyTransaction); when(readOnlyTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class))).thenReturn(checkedFuture); diff --git a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java index 4dd689f5..9c27151a 100644 --- a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java +++ b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/flow/ReactiveFlowWriterTest.java @@ -50,7 +50,7 @@ public class ReactiveFlowWriterTest { MockitoAnnotations.initMocks(this); reactiveFlowWriter = new ReactiveFlowWriter(inventoryReader, flowWriterService); - nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class).toInstance(); + nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class).build(); nodeConnectorRef = new NodeConnectorRef(nodeInstanceIdentifier); packetChainList = new ArrayList(); packetChainList.add(new PacketChainBuilder() diff --git a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java index 677ab859..d609503b 100644 --- a/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java +++ b/l2switch-main/implementation/src/test/java/org/opendaylight/l2switch/util/InstanceIdentifierUtilsTest.java @@ -33,13 +33,13 @@ public class InstanceIdentifierUtilsTest { @Test public void testGenerateNodeInstanceIdentifier() throws Exception { - NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).toInstance()); + NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build()); assertNotNull(InstanceIdentifierUtils.generateNodeInstanceIdentifier(ncRef)); } @Test public void testGenerateFlowTableInstanceIdentifier() throws Exception { - NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).toInstance()); + NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build()); InstanceIdentifier
tableInsId = InstanceIdentifierUtils.generateFlowTableInstanceIdentifier(ncRef, new TableKey(NUM_ID_1)); assertNotNull(tableInsId); assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class, TableKey.class).getId()); @@ -50,7 +50,7 @@ public class InstanceIdentifierUtilsTest { NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId(STR_ID_1))) .child(NodeConnector.class, new NodeConnectorKey(new NodeConnectorId(STR_ID_1))) - .toInstance()); + .build()); InstanceIdentifier flowInsId = InstanceIdentifierUtils.generateFlowInstanceIdentifier( ncRef, new TableKey(NUM_ID_1), diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java index 4756c36a..e60b065b 100644 --- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java +++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java @@ -97,7 +97,7 @@ public class TopologyLinkDataChangeHandler implements DataChangeListener { */ public ListenerRegistration registerAsDataChangeListener() { InstanceIdentifier linkInstance = InstanceIdentifier.builder(NetworkTopology.class) - .child(Topology.class, new TopologyKey(new TopologyId(topologyId))).child(Link.class).toInstance(); + .child(Topology.class, new TopologyKey(new TopologyId(topologyId))).child(Link.class).build(); return dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, linkInstance, this, AsyncDataBroker.DataChangeScope.BASE); } diff --git a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java index 9adf147b..205a0c3b 100644 --- a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java +++ b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/flow/InitialFlowWriterTest.java @@ -70,7 +70,7 @@ public class InitialFlowWriterTest { @Test public void onNodeUpdated_Valid() throws Exception { - InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).toInstance(); + InstanceIdentifier nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(new NodeId(""))).build(); NodeUpdated nodeUpdated = new NodeUpdatedBuilder().setNodeRef(new NodeRef(nodeInstanceIdentifier)).build(); initialFlowWriter.onNodeUpdated(nodeUpdated); Thread.sleep(250); diff --git a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java index a1e0ebf7..1a37166f 100644 --- a/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java +++ b/loopremover/implementation/src/test/java/org/opendaylight/l2switch/loopremover/util/InstanceIdentifierUtilsTest.java @@ -41,7 +41,7 @@ public class InstanceIdentifierUtilsTest { @Test public void testGetNodePath() throws Exception { - InstanceIdentifier ncInsId = InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).toInstance(); + InstanceIdentifier ncInsId = InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build(); assertNotNull(InstanceIdentifierUtils.getNodePath(ncInsId)); } @@ -66,13 +66,13 @@ public class InstanceIdentifierUtilsTest { @Test public void testGenerateNodeInstanceIdentifier() throws Exception { - NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).toInstance()); + NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build()); assertNotNull(InstanceIdentifierUtils.generateNodeInstanceIdentifier(ncRef)); } @Test public void testGenerateFlowTableInstanceIdentifier() throws Exception { - NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).toInstance()); + NodeConnectorRef ncRef = new NodeConnectorRef(InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build()); InstanceIdentifier
tableInsId = InstanceIdentifierUtils.generateFlowTableInstanceIdentifier(ncRef, new TableKey(NUM_ID_1)); assertNotNull(tableInsId); assertEquals(NUM_ID_1, tableInsId.firstKeyOf(Table.class, TableKey.class).getId()); -- 2.36.6