Clean up a bunch of generic-type warnings

Change-Id: I4818ef747c83533fde46f961433a506a414f04a8
Signed-off-by: Donald Hunter <donaldh@cisco.com>

diff --git a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/MdsalUtils.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/MdsalUtils.java
index 7cc80b70f3da7facf7d5237f14c9ab24e7f2456e..48a24f8dcae91a794c9fae535ab7d436e8007682 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/MdsalUtils.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/common/util/MdsalUtils.java
@@ -42,7 +42,7 @@ public class MdsalUtils {
     }
 
     public static Optional<TerminationPoint> readTerminationPoint(DataBroker dataBroker, LogicalDatastoreType store, TopologyId topologyId, NodeId nodeId, TpId tpId) {
-        InstanceIdentifier tpIid = InstanceIdentifier.builder(NetworkTopology.class)
+        InstanceIdentifier<TerminationPoint> tpIid = InstanceIdentifier.builder(NetworkTopology.class)
                 .child(Topology.class, new TopologyKey(topologyId))
                 .child(Node.class, new NodeKey(nodeId))
                 .child(TerminationPoint.class, new TerminationPointKey(tpId))

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
index 47c293f2e03cdad2dee7c0843aa8bc3161f4f072..acdb9fa15430d0059dbae753005c85f7ce0c8de7 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandler.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  */
 public class AbstractNodeHandler implements DataTreeChangeListener<Topology> {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractNodeHandler.class);
-    private static final InstanceIdentifier NRP_TOPOLOGY_SYSTEM_IID = InstanceIdentifier
+    private static final InstanceIdentifier<Topology> NRP_TOPOLOGY_SYSTEM_IID = InstanceIdentifier
             .create(Context.class)
             .augmentation(Context1.class)
             .child(Topology.class, new TopologyKey(new Uuid(TapiConstants.PRESTO_SYSTEM_TOPO)));
@@ -121,11 +121,11 @@ public class AbstractNodeHandler implements DataTreeChangeListener<Topology> {
         });
     }
 
-    private boolean isNep(DataObjectModification dataObjectModificationNep) {
+    private boolean isNep(DataObjectModification<?> dataObjectModificationNep) {
         return OwnedNodeEdgePoint.class.isAssignableFrom(dataObjectModificationNep.getDataType());
     }
 
-    private boolean checkIfDeleted(DataObjectModification dataObjectModificationNep) {
+    private boolean checkIfDeleted(DataObjectModification<?> dataObjectModificationNep) {
         OwnedNodeEdgePoint before = (OwnedNodeEdgePoint) dataObjectModificationNep.getDataBefore();
         OwnedNodeEdgePoint after = (OwnedNodeEdgePoint) dataObjectModificationNep.getDataAfter();
 
@@ -141,7 +141,7 @@ public class AbstractNodeHandler implements DataTreeChangeListener<Topology> {
         return false;
     }
 
-    private boolean checkIfUpdated(DataObjectModification dataObjectModificationNep) {
+    private boolean checkIfUpdated(DataObjectModification<?> dataObjectModificationNep) {
         OwnedNodeEdgePoint before = (OwnedNodeEdgePoint) dataObjectModificationNep.getDataBefore();
         OwnedNodeEdgePoint after = (OwnedNodeEdgePoint) dataObjectModificationNep.getDataAfter();
         if (after == null) {

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java
index 2f8e52d0e27f8751e6896ddf120c00ddfbb2e899..db5e07944998ca10b28abda1596cd353474f68f3 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorHelper.java
@@ -159,7 +159,7 @@ class OvsActivatorHelper {
     }
 
     public static void validateExternalVLANs(List<EndPoint> endPoints) throws ResourceNotAvailableException {
-        Set<Optional> vlans = endPoints.stream().map(ep -> {
+        Set<Optional<?>> vlans = endPoints.stream().map(ep -> {
             try {
                 return new OvsActivatorHelper(ep).getCeVlanId();
             } catch (ResourceNotAvailableException e) {

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
index 94b9d5c748168b8b39840b84ec904e1dc9b154b7..4e7d52824219ff7c00aa59c627d75700e4b49494 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/DataObjectModificationQualifier.java
@@ -32,11 +32,11 @@ public class DataObjectModificationQualifier {
 
     private Function<Node,Boolean> isOvs = node -> capabilitiesService.node(node).isSupporting(AND, OVSDB);
 
-    protected void checkNodes(List<DataObjectModification> nodes,
+    protected void checkNodes(List<DataObjectModification<? extends DataObject>> nodes,
                               Map<TerminationPoint,String> toAddMap,
                               Map<TerminationPoint,String> toUpdateMap, Map<TerminationPoint,String> toDeleteMap) {
         Node n;
-        for (DataObjectModification node: nodes) {
+        for (DataObjectModification<?> node: nodes) {
             switch (node.getModificationType()) {
                 //new ovs node
                 case WRITE :
@@ -66,7 +66,7 @@ public class DataObjectModificationQualifier {
         }
     }
 
-    private void checkTerminationPoints(DataObjectModification node,
+    private void checkTerminationPoints(DataObjectModification<?> node,
                                         Map<TerminationPoint,String> toAddMap,
                                         Map<TerminationPoint,String> toUpdateMap,
                                         Map<TerminationPoint,String> toDeleteMap) {
@@ -75,10 +75,10 @@ public class DataObjectModificationQualifier {
             return ;
         }
         String bridgeName = n.augmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue();
-        Collection<DataObjectModification<? extends DataObject>> modifiedChildren = node.getModifiedChildren();
+        Collection<? extends DataObjectModification<? extends DataObject>> modifiedChildren = node.getModifiedChildren();
 
         TerminationPoint terminationPoint;
-        for (DataObjectModification tp: modifiedChildren) {
+        for (DataObjectModification<?> tp: modifiedChildren) {
             if (!tp.getDataType().equals(TerminationPoint.class)) {
                 continue;
             }

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java
index 0c1e0daa22ee7efbbeda108ea76434a292eae54b..29132651b3b191e9f128c9f40313203695cc380f 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandler.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.unimgr.mef.nrp.ovs.tapi;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
@@ -18,7 +21,6 @@ import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.google.common.util.concurrent.MoreExecutors;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
@@ -32,7 +34,11 @@ import org.opendaylight.unimgr.mef.nrp.common.ResourceNotAvailableException;
 import org.opendaylight.unimgr.mef.nrp.common.TapiUtils;
 import org.opendaylight.unimgr.mef.nrp.ovs.transaction.TopologyTransaction;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
-import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.*;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.LayerProtocolName;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.LifecycleState;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.PortDirection;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.PortRole;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Uuid;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.tapi.context.ServiceInterfacePoint;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.tapi.context.ServiceInterfacePointBuilder;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.node.OwnedNodeEdgePoint;
@@ -49,10 +55,15 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+
 /**
  * TopologyDataHandler listens to ovsdb topology and propagate significant changes to presto ext topology.
  *
@@ -159,7 +170,7 @@ public class TopologyDataHandler implements DataTreeChangeListener<Node> {
         final Map<TerminationPoint,String> toDeleteMap = new HashMap<>();
         final Map<TerminationPoint,String> toUpdateMap = new HashMap<>();
 
-        List<DataObjectModification> nodes = collection.stream()
+        List<DataObjectModification<? extends DataObject>> nodes = collection.stream()
                 .map(DataTreeModification::getRootNode)
                 .collect(Collectors.toList());
 

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/transaction/TopologyTransaction.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/transaction/TopologyTransaction.java
index 1f6c977d1f1b956e225d14d8e229a278f631264a..09ce284513fd97a4d3cee663086427d17993054b 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/transaction/TopologyTransaction.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/transaction/TopologyTransaction.java
@@ -160,7 +160,7 @@ public class TopologyTransaction {
     }
 
     public static Nodes readOpenFLowTopology(DataBroker dataBroker) {
-        InstanceIdentifier instanceIdentifier = InstanceIdentifier.builder(Nodes.class).build();
+        InstanceIdentifier<Nodes> instanceIdentifier = InstanceIdentifier.builder(Nodes.class).build();
         return (Nodes) MdsalUtils.read(dataBroker, LogicalDatastoreType.CONFIGURATION,instanceIdentifier);
     }
 }

diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/DataStoreTestUtils.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/DataStoreTestUtils.java
index de3378a7f6798b45e68777933f325f86dba9f70c..5d6826cd14764fddf0909326d1fc1324d4ab97a2 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/DataStoreTestUtils.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/DataStoreTestUtils.java
@@ -29,11 +29,11 @@ import static org.junit.Assert.fail;
 public class DataStoreTestUtils {
     private static final Logger LOG = LoggerFactory.getLogger(DataStoreTestUtils.class);
 
-    public static <T extends DataObject> T read(InstanceIdentifier instanceIdentifier, DataBroker dataBroker) {
+    public static <T extends DataObject> T read(InstanceIdentifier<?> instanceIdentifier, DataBroker dataBroker) {
         return read(instanceIdentifier,dataBroker,LogicalDatastoreType.OPERATIONAL);
     }
 
-    public static <T extends DataObject> T readConfig(InstanceIdentifier instanceIdentifier, DataBroker dataBroker) {
+    public static <T extends DataObject> T readConfig(InstanceIdentifier<?> instanceIdentifier, DataBroker dataBroker) {
         return read(instanceIdentifier,dataBroker,LogicalDatastoreType.CONFIGURATION);
     }
 
@@ -55,7 +55,7 @@ public class DataStoreTestUtils {
         });
     }
 
-    public static void delete(InstanceIdentifier instanceIdentifier, DataBroker dataBroker) {
+    public static void delete(InstanceIdentifier<?> instanceIdentifier, DataBroker dataBroker) {
         ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction();
         transaction.delete(LogicalDatastoreType.OPERATIONAL, instanceIdentifier);
 
@@ -73,7 +73,7 @@ public class DataStoreTestUtils {
         });
     }
 
-    private static <T extends DataObject> T read(InstanceIdentifier instanceIdentifier, DataBroker dataBroker, LogicalDatastoreType type) {
+    private static <T extends DataObject> T read(InstanceIdentifier<?> instanceIdentifier, DataBroker dataBroker, LogicalDatastoreType type) {
         ReadOnlyTransaction transaction = dataBroker.newReadOnlyTransaction();
         try {
             Optional<T> opt = (Optional<T>) transaction.read(type,instanceIdentifier).checkedGet();

diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OpenFlowTopologyTestUtils.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OpenFlowTopologyTestUtils.java
index 5ff4d59308207759eeff1a014e065fe1f3e77d6f..be9730b09db7aeaf7896af3c543b80721ab868f7 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OpenFlowTopologyTestUtils.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OpenFlowTopologyTestUtils.java
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.unimgr.mef.nrp.ovs;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.unimgr.utils.MdsalUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
@@ -27,9 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author marek.ryznar@amartus.com
  */

diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OvsdbTopologyTestUtils.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OvsdbTopologyTestUtils.java
index c013766fac8ac051cadfc507d1d6c15748b8114b..879b9728dfb37781fab17728058950156c943b34 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OvsdbTopologyTestUtils.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/OvsdbTopologyTestUtils.java
@@ -32,7 +32,7 @@ import java.util.List;
  */
 public class OvsdbTopologyTestUtils {
     private static final TopologyId ovsdbTopologyId = new TopologyId(new Uri("ovsdb:1"));
-    private static final InstanceIdentifier ovsdbTopology =
+    private static final InstanceIdentifier<Topology> ovsdbTopology =
             InstanceIdentifier
                     .create(NetworkTopology.class)
                     .child(Topology.class, new TopologyKey(ovsdbTopologyId));
@@ -48,7 +48,7 @@ public class OvsdbTopologyTestUtils {
     }
 
     public static void writeBridge(Node node, DataBroker dataBroker) {
-        InstanceIdentifier bridgeIid = getNodeInstanceIdentifier(node.getNodeId());
+        InstanceIdentifier<Node> bridgeIid = getNodeInstanceIdentifier(node.getNodeId());
         DataStoreTestUtils.write(node,bridgeIid,dataBroker);
     }
 
@@ -61,7 +61,7 @@ public class OvsdbTopologyTestUtils {
         return nodeBuilder.build();
     }
 
-    public static InstanceIdentifier getNodeInstanceIdentifier(NodeId nodeId) {
+    public static InstanceIdentifier<Node> getNodeInstanceIdentifier(NodeId nodeId) {
         return InstanceIdentifier
                 .builder(NetworkTopology.class)
                 .child(Topology.class,
@@ -71,7 +71,7 @@ public class OvsdbTopologyTestUtils {
                 .build();
     }
 
-    public static InstanceIdentifier getPortInstanceIdentifier(String nodeName, String portName) {
+    public static InstanceIdentifier<TerminationPoint> getPortInstanceIdentifier(String nodeName, String portName) {
         return getNodeInstanceIdentifier(new NodeId(nodeName))
                 .child(TerminationPoint.class,
                         new TerminationPointKey(new TpId(portName)));

diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java
index 72549563c546f4190d229a9617b95f2e6efe116a..da184699f5b2c4af1e71667be5b09028ff2c328f 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/activator/OvsActivatorTest.java
@@ -277,7 +277,7 @@ public class OvsActivatorTest extends AbstractDataBrokerTest{
     }
 
     public static Nodes readOpenFLowTopology(DataBroker dataBroker) {
-        InstanceIdentifier instanceIdentifier = InstanceIdentifier.builder(Nodes.class).build();
+        InstanceIdentifier<Nodes> instanceIdentifier = InstanceIdentifier.builder(Nodes.class).build();
         return (Nodes) MdsalUtils.read(dataBroker,LogicalDatastoreType.CONFIGURATION,instanceIdentifier);
     }
 

diff --git a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java
index ff3855319ac49b1c8d5f9e37fdd042135fa302aa..351f83b5df43a91b96a756302f368e63e5bda598 100644 (file)
--- a/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java
+++ b/ovs-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/ovs/tapi/TopologyDataHandlerTestUtils.java
@@ -24,6 +24,7 @@ import org.opendaylight.unimgr.mef.nrp.ovs.OvsdbTopologyTestUtils;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Context;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Uuid;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.Context1;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.context.Topology;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortNumberUni;
@@ -34,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -75,12 +77,12 @@ public class TopologyDataHandlerTestUtils {
         tps.add(OvsdbTopologyTestUtils.createTerminationPoint(tp3Name,tp3OFport));
 
         org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node node = OvsdbTopologyTestUtils.createBridge(bridgeName,tps);
-        InstanceIdentifier instanceIdentifier = OvsdbTopologyTestUtils.getNodeInstanceIdentifier(node.getNodeId());
+        InstanceIdentifier<Node> instanceIdentifier = OvsdbTopologyTestUtils.getNodeInstanceIdentifier(node.getNodeId());
         DataStoreTestUtils.write(node,instanceIdentifier,dataBroker);
     }
 
     protected void deleteTestBridge() {
-        InstanceIdentifier instanceIdentifier = OvsdbTopologyTestUtils.getNodeInstanceIdentifier(new NodeId(bridgeName));
+        InstanceIdentifier<?> instanceIdentifier = OvsdbTopologyTestUtils.getNodeInstanceIdentifier(new NodeId(bridgeName));
         DataStoreTestUtils.delete(instanceIdentifier,dataBroker);
     }
 
@@ -181,13 +183,13 @@ public class TopologyDataHandlerTestUtils {
         return null;
     }
 
-    private static InstanceIdentifier getNodeIid() {
+    private static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.Node> getNodeIid() {
         return getTopoIid()
                 .child(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.Node.class,
                         new org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.NodeKey(new Uuid(ovsNodeId)));
     }
 
-    private static InstanceIdentifier getTopoIid() {
+    private static InstanceIdentifier<Topology> getTopoIid() {
         return InstanceIdentifier.create(Context.class)
                 .augmentation(Context1.class)
                 .child(org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.topology.context.Topology.class,