Clean up a bunch of generic-type warnings
[unimgr.git] / ovs-driver / src / test / java / org / opendaylight / unimgr / mef / nrp / ovs / DataStoreTestUtils.java
index de3378a7f6798b45e68777933f325f86dba9f70c..5d6826cd14764fddf0909326d1fc1324d4ab97a2 100644 (file)
@@ -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();