BUG-432 Registration change

- removed generic parameter

Change-Id: I9a464bcec927db1ba9a10ee81d327a65a0091267
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestProvider.java b/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestProvider.java
index 1ec19d38cb87a0f402120ed7917543ac0fe6ab76..64f29c8cd31bd1ded902d5dd29ffaf8248f552d4 100644 (file)
--- a/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestProvider.java
+++ b/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestProvider.java
@@ -20,7 +20,7 @@ public class DropTestProvider implements AutoCloseable {
 
     private DataProviderService _dataService;
     private NotificationProviderService _notificationService;
-    private Registration<NotificationListener> listenerRegistration;
+    private Registration listenerRegistration;
     private final DropTestCommiter commiter = new DropTestCommiter(this);
 
     public DropTestStats getStats() {

diff --git a/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestRpcProvider.java b/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestRpcProvider.java
index 587505a8a8ad0da428f0638915f6ec5befbac897..4157faab71a96d3cd0709f9bffc011268295f158 100644 (file)
--- a/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestRpcProvider.java
+++ b/drop-test/src/main/java/org/opendaylight/openflowplugin/droptest/DropTestRpcProvider.java
@@ -21,7 +21,7 @@ public class DropTestRpcProvider implements AutoCloseable {
     private SalFlowService _flowService;
     private NotificationProviderService _notificationService;
     private DropTestRpcSender commiter;
-    private Registration<NotificationListener> listenerRegistration;
+    private Registration listenerRegistration;
 
     public SalFlowService getFlowService() {
         return this._flowService;

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
index b71163385cd5a8944af043b61e8651713c76f841..78169fe8d03e2ff160fb81e3fdaab8e371812c10 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java
@@ -41,7 +41,7 @@ public class LearningSwitchManagerSimpleImpl implements DataChangeListenerRegist
     private PacketProcessingService packetProcessingService;
     private DataBrokerService data;
 
-    private Registration<NotificationListener> packetInRegistration;
+    private Registration packetInRegistration;
 
     private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration; 
     

diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
index 51c36aef7b19e644527aab80369eee87012db32b..aa3d565f5ba1d4499bbdfb4f9fc9ee071945b7c5 100644 (file)
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java
@@ -46,7 +46,7 @@ public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistr
     private PacketProcessingService packetProcessingService;
     private DataBrokerService data;
 
-    private Registration<NotificationListener> packetInRegistration;
+    private Registration packetInRegistration;
 
     private ListenerRegistration<DataChangeListener> dataChangeListenerRegistration; 
     

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
index 1c33bbe159ba4eed237b7cabc89bbdef2c397a17..c2bec71f45de759ec596f16a1aa0989fbfb5ec37 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
@@ -111,8 +111,8 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
     private FlowBuilder testFlow;
     private final String originalFlowName = "Foo";
     private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl();
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener2Reg;
+    private Registration listener1Reg;
+    private Registration listener2Reg;
     private Group testGroup;
     private Group testGroup2;
     private Node testNode12;

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
index 1559775ed8867d7ec88615bbe70b25caa9f241d2..e6f417410df5bffda1207580cd9a695aaa662a01 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkTransactionProvider.java
@@ -123,8 +123,8 @@ public class OpenflowPluginBulkTransactionProvider implements CommandProvider {
     private FlowBuilder testFlow;
     private final String originalFlowName = "Foo";
     private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl();
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener2Reg;
+    private Registration listener1Reg;
+    private Registration listener2Reg;
     private Node testNode12;
     private final String originalGroupName = "Foo";
     private static NotificationService notificationService;

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
index 7337842acf256ca1e0a545f037a8ea3735b51d32..471232cacfecd81b5ecbe6a464db89f8e8f6af2a 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestCommandProvider.java
@@ -68,7 +68,7 @@ public class OpenflowpluginMeterTestCommandProvider implements CommandProvider {
     private final String updatedMeterName = "Bar";
     private final MeterEventListener meterEventListener = new MeterEventListener();
     private static NotificationService notificationService;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
+    private Registration listener1Reg;
 
     public OpenflowpluginMeterTestCommandProvider(BundleContext ctx) {
         this.ctx = ctx;

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
index 4c55e6d2dae2870449f7d45d9c3288f4b7bb7745..290460b896fd815bfed931682e79b66336e5fd58 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
@@ -200,8 +200,8 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
     private final SalFlowListener flowEventListener = new FlowEventListenerLoggingImpl();
     private final NodeErrorListener nodeErrorListener = new NodeErrorListenerLoggingImpl();
     private static NotificationService notificationService;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener1Reg;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listener2Reg;
+    private Registration listener1Reg;
+    private Registration listener2Reg;
 
     public OpenflowpluginTestCommandProvider(BundleContext ctx) {
         this.ctx = ctx;

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestNodeConnectorNotification.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestNodeConnectorNotification.java
index 6eb0d32e20af20b3f456562315d287e44ff5827a..bbedb0098c5667b673ae75f61e7197b0b14bc184 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestNodeConnectorNotification.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestNodeConnectorNotification.java
@@ -34,7 +34,7 @@ public class OpenflowpluginTestNodeConnectorNotification {
     private final BundleContext ctx;
     private final PortEventListener portEventListener = new PortEventListener();
     private static NotificationService notificationService;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listenerReg;
+    private Registration listenerReg;
 
     public OpenflowpluginTestNodeConnectorNotification(BundleContext ctx) {
         this.ctx = ctx;

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestTopologyNotification.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestTopologyNotification.java
index c274875872c3505b594244323670c06c9b633179..64c772362e9f8d6d668ba18232f30b8ed877fc0c 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestTopologyNotification.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestTopologyNotification.java
@@ -34,7 +34,7 @@ public class OpenflowpluginTestTopologyNotification {
     private final BundleContext ctx;
     private final TopologyEventListener topologyEventListener = new TopologyEventListener();
     private static NotificationService notificationService;
-    private Registration<org.opendaylight.yangtools.yang.binding.NotificationListener> listenerReg;
+    private Registration listenerReg;
 
     public OpenflowpluginTestTopologyNotification(BundleContext ctx) {
         this.ctx = ctx;