From 70928b0211d95a21515e81c5848ead76d3a30f68 Mon Sep 17 00:00:00 2001 From: Michal Rehak Date: Mon, 28 Jul 2014 17:02:18 +0200 Subject: [PATCH] BUG-432 Registration change - removed generic parameter Change-Id: I9a464bcec927db1ba9a10ee81d327a65a0091267 Signed-off-by: Michal Rehak --- .../openflowplugin/droptest/DropTestProvider.java | 2 +- .../openflowplugin/droptest/DropTestRpcProvider.java | 2 +- .../learningswitch/LearningSwitchManagerSimpleImpl.java | 2 +- .../learningswitch/multi/LearningSwitchManagerMultiImpl.java | 2 +- .../test/OpenflowPluginBulkGroupTransactionProvider.java | 4 ++-- .../test/OpenflowPluginBulkTransactionProvider.java | 4 ++-- .../test/OpenflowpluginMeterTestCommandProvider.java | 2 +- .../test/OpenflowpluginTestCommandProvider.java | 4 ++-- .../test/OpenflowpluginTestNodeConnectorNotification.java | 2 +- .../test/OpenflowpluginTestTopologyNotification.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) 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 1ec19d38cb..64f29c8cd3 100644 --- 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 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 587505a8a8..4157faab71 100644 --- 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 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 b71163385c..78169fe8d0 100644 --- 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 packetInRegistration; + private Registration packetInRegistration; private ListenerRegistration 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 51c36aef7b..aa3d565f5b 100644 --- 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 packetInRegistration; + private Registration packetInRegistration; private ListenerRegistration 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 1c33bbe159..c2bec71f45 100644 --- 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 listener1Reg; - private Registration 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 1559775ed8..e6f417410d 100644 --- 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 listener1Reg; - private Registration 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 7337842acf..471232cacf 100644 --- 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 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 4c55e6d2da..290460b896 100644 --- 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 listener1Reg; - private Registration 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 6eb0d32e20..bbedb0098c 100644 --- 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 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 c274875872..64c772362e 100644 --- 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 listenerReg; + private Registration listenerReg; public OpenflowpluginTestTopologyNotification(BundleContext ctx) { this.ctx = ctx; -- 2.36.6