From 049ffd00ea4e24fe3fb3d4f6abeaf51390ddd316 Mon Sep 17 00:00:00 2001 From: Andrej Leitner Date: Mon, 19 Sep 2016 18:40:43 +0200 Subject: [PATCH] Update comments and imports after DataChangeListener changes Change-Id: Ic8174cc2627deb12d48f6d41444f2e9b4dc60406 Signed-off-by: Andrej Leitner --- .../frm/ForwardingRulesCommiter.java | 3 +-- .../frm/impl/AbstractListeningCommiter.java | 10 ++------ .../applications/frm/impl/FlowForwarder.java | 8 +++---- ...wNodeConnectorInventoryTranslatorImpl.java | 2 +- .../applications/frm/impl/GroupForwarder.java | 9 +++---- .../applications/frm/impl/MeterForwarder.java | 8 +++---- .../applications/frm/impl/TableForwarder.java | 6 ++--- ...ConnectorInventoryEventTranslatorTest.java | 24 ++++++++++--------- .../AbstractNotificationSupplierBase.java | 2 +- ...stractNotificationSupplierForItemRoot.java | 10 ++++---- ...NodeConnectorNotificationSupplierImpl.java | 2 +- .../impl/NodeNotificationSupplierImpl.java | 2 +- .../AbstractNotificationSupplierForItem.java | 5 +--- .../item/FlowNotificationSupplierImpl.java | 2 +- .../item/GroupNotificationSupplierImpl.java | 2 +- .../item/MeterNotificationSupplierImpl.java | 2 +- ...stractNotificationSupplierForItemStat.java | 5 +--- .../FlowStatNotificationSupplierImpl.java | 2 +- ...FlowTableStatNotificationSupplierImpl.java | 2 +- .../GroupStatNotificationSupplierImpl.java | 2 +- .../MeterStatNotificationSupplierImpl.java | 2 +- ...ConnectorStatNotificationSupplierImpl.java | 2 +- .../QueueStatNotificationSupplierImpl.java | 2 +- .../src/main/yang/notification-supplier.yang | 2 +- ...ConnectorNotificationSupplierImplTest.java | 8 +------ .../NodeNotificationSupplierImplTest.java | 9 +------ .../helper/TestChangeEventBuildHelper.java | 11 --------- .../impl/helper/TestSupplierVerifyHelper.java | 2 +- .../FlowNotificationSupplierImplTest.java | 9 ++----- .../GroupNotificationSupplierImplTest.java | 10 ++------ .../MeterNotificationSupplierImplTest.java | 11 ++------- .../FlowStatNotificationSupplierImplTest.java | 5 +--- ...TableStatNotificationSupplierImplTest.java | 6 +---- ...GroupStatNotificationSupplierImplTest.java | 6 +---- ...MeterStatNotificationSupplierImplTest.java | 6 +---- ...ectorStatNotificationSupplierImplTest.java | 7 +----- ...QueueStatNotificationSupplierImplTest.java | 7 +----- .../config/DefaultConfigPusherTest.java | 2 +- .../impl/StatAbstractListenCommit.java | 22 ++++++++--------- .../manager/impl/StatListenCommitFlow.java | 5 +--- .../manager/impl/StatListenCommitGroup.java | 5 +--- .../manager/impl/StatListenCommitMeter.java | 10 +++----- .../impl/StatAbstractListenCommitTest.java | 2 +- 43 files changed, 79 insertions(+), 180 deletions(-) diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java index 8f099b60ed..348df22af9 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java @@ -20,10 +20,9 @@ import org.opendaylight.yangtools.yang.common.RpcResult; * org.opendaylight.openflowplugin.applications.frm * * ForwardingRulesCommiter - * It represent a contract between DataStore DataChangeEvent and relevant + * It represent a contract between DataStore DataTreeModification and relevant * SalRpcService for device. Every implementation has to be registered for * Configurational/DS tree path. - * */ public interface ForwardingRulesCommiter extends AutoCloseable, ClusteredDataTreeChangeListener { diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractListeningCommiter.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractListeningCommiter.java index c7c3a54362..b73e7ba908 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractListeningCommiter.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractListeningCommiter.java @@ -11,7 +11,6 @@ import com.google.common.base.Preconditions; import java.util.Collection; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesCommiter; import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesManager; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; @@ -21,18 +20,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * AbstractChangeListner implemented basic {@link AsyncDataChangeEvent} processing for - * flow node subDataObject (flows, groups and meters). - * - * @author Vaclav Demcak - * + * AbstractChangeListner implemented basic {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification} + * processing for flow node subDataObject (flows, groups and meters). */ public abstract class AbstractListeningCommiter implements ForwardingRulesCommiter { private static final Logger LOG = LoggerFactory.getLogger(AbstractListeningCommiter.class); - ForwardingRulesManager provider; - private final Class clazz; public AbstractListeningCommiter (ForwardingRulesManager provider, Class clazz) { diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java index aff5cea0dd..28fe152d2f 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowForwarder.java @@ -50,17 +50,15 @@ import org.slf4j.LoggerFactory; /** * FlowForwarder - * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener}} + * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener} * for WildCardedPath to {@link Flow} and ForwardingRulesCommiter interface for methods: - * add, update and remove {@link Flow} processing for - * {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent}. + * add, update and remove {@link Flow} processing for + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ public class FlowForwarder extends AbstractListeningCommiter { private static final Logger LOG = LoggerFactory.getLogger(FlowForwarder.class); - private final DataBroker dataBroker; - private ListenerRegistration listenerRegistration; public FlowForwarder (final ForwardingRulesManager manager, final DataBroker db) { diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java index 8b0df32c4b..d6cbb5c922 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java @@ -65,7 +65,7 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends AbstractNodeConnec }); } catch (final Exception e) { LOG.warn(" FlowNodeConnectorInventoryTranslatorImpl listener registration fail!"); - LOG.debug("FlowNodeConnectorInventoryTranslatorImpl DataChange listener registration fail ..", e); + LOG.debug("FlowNodeConnectorInventoryTranslatorImpl DataTreeChangeListener registration fail ..", e); throw new IllegalStateException("FlowNodeConnectorInventoryTranslatorImpl startup fail! System needs restart.", e); } } diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java index 94c147dbe0..bb55b50b68 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/GroupForwarder.java @@ -46,18 +46,15 @@ import org.slf4j.LoggerFactory; /** * GroupForwarder - * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener}} + * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener} * for WildCardedPath to {@link Group} and ForwardingRulesCommiter interface for methods: - * add, update and remove {@link Group} processing for - * {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent}. - * + * add, update and remove {@link Group} processing for + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ public class GroupForwarder extends AbstractListeningCommiter { private static final Logger LOG = LoggerFactory.getLogger(GroupForwarder.class); - private final DataBroker dataBroker; - private ListenerRegistration listenerRegistration; public GroupForwarder (final ForwardingRulesManager manager, final DataBroker db) { diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java index b731606700..531e858cb2 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/MeterForwarder.java @@ -46,18 +46,16 @@ import org.slf4j.LoggerFactory; /** * MeterForwarder - * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener}} + * It implements {@link org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener} * for WildCardedPath to {@link Meter} and ForwardingRulesCommiter interface for methods: - * add, update and remove {@link Meter} processing for - * {@link org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent}. + * add, update and remove {@link Meter} processing for + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. * */ public class MeterForwarder extends AbstractListeningCommiter { private static final Logger LOG = LoggerFactory.getLogger(MeterForwarder.class); - private final DataBroker dataBroker; - private ListenerRegistration listenerRegistration; public MeterForwarder (final ForwardingRulesManager manager, final DataBroker db) { diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java index 8839cb6354..91603cb6df 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java @@ -11,7 +11,6 @@ package org.opendaylight.openflowplugin.applications.frm.impl; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import java.util.Collections; -import java.util.concurrent.Callable; import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; @@ -37,7 +36,6 @@ import org.slf4j.LoggerFactory; public class TableForwarder extends AbstractListeningCommiter { private static final Logger LOG = LoggerFactory.getLogger(TableForwarder.class); - private ListenerRegistration listenerRegistration; public TableForwarder(final ForwardingRulesManager manager, final DataBroker db) { @@ -50,8 +48,8 @@ public class TableForwarder extends AbstractListeningCommiter { ForwardingRulesManagerImpl.STARTUP_LOOP_MAX_RETRIES); listenerRegistration = looper.loopUntilNoException(() -> db.registerDataTreeChangeListener(treeId, TableForwarder.this)); } catch (final Exception e) { - LOG.warn("FRM Table DataChange listener registration fail!"); - LOG.debug("FRM Table DataChange listener registration fail ..", e); + LOG.warn("FRM Table DataTreeChangeListener registration fail!"); + LOG.debug("FRM Table DataTreeChangeListener registration fail ..", e); throw new IllegalStateException("TableForwarder startup fail! System needs restart.", e); } } diff --git a/applications/lldp-speaker/src/test/java/org/opendaylight/openflowplugin/applications/lldpspeaker/NodeConnectorInventoryEventTranslatorTest.java b/applications/lldp-speaker/src/test/java/org/opendaylight/openflowplugin/applications/lldpspeaker/NodeConnectorInventoryEventTranslatorTest.java index 9ee90e653a..4608998993 100644 --- a/applications/lldp-speaker/src/test/java/org/opendaylight/openflowplugin/applications/lldpspeaker/NodeConnectorInventoryEventTranslatorTest.java +++ b/applications/lldp-speaker/src/test/java/org/opendaylight/openflowplugin/applications/lldpspeaker/NodeConnectorInventoryEventTranslatorTest.java @@ -59,7 +59,8 @@ public class NodeConnectorInventoryEventTranslatorTest { /** * Test that checks if {@link NodeConnectorEventsObserver#nodeConnectorAdded} is called - * for each FlowCapableNodeConnector item that @{AsyncDataChangeEvent#getCreatedData} return. + * for each FlowCapableNodeConnector item added in + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ @Test public void testNodeConnectorCreation() { @@ -92,8 +93,8 @@ public class NodeConnectorInventoryEventTranslatorTest { /** * Test that checks if {@link NodeConnectorEventsObserver#nodeConnectorRemoved} is called - * for each FlowCapableNodeConnector item inside @{AsyncDataChangeEvent#getUpdatedData} - * that have link down state. + * for each FlowCapableNodeConnector item that have link down state removed in + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ @Test public void testNodeConnectorUpdateToLinkDown() { @@ -105,8 +106,8 @@ public class NodeConnectorInventoryEventTranslatorTest { /** * Test that checks if {@link NodeConnectorEventsObserver#nodeConnectorRemoved} is called - * for each FlowCapableNodeConnector item inside @{AsyncDataChangeEvent#getUpdatedData} - * that have administrative down state. + * for each FlowCapableNodeConnector item with administrative down state removed in + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ @Test public void testNodeConnectorUpdateToAdminDown() { @@ -118,8 +119,8 @@ public class NodeConnectorInventoryEventTranslatorTest { /** * Test that checks if {@link NodeConnectorEventsObserver#nodeConnectorAdded} is called - * for each FlowCapableNodeConnector item inside @{AsyncDataChangeEvent#getUpdatedData} - * that have administrative up and link up state. + * for each FlowCapableNodeConnector item with administrative up and link up state added in + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification}. */ @Test public void testNodeConnectorUpdateToUp() { @@ -130,7 +131,8 @@ public class NodeConnectorInventoryEventTranslatorTest { /** * Test that checks if {@link NodeConnectorEventsObserver#nodeConnectorRemoved} is called - * for each FlowCapableNodeConnector path that @{AsyncDataChangeEvent#getRemovedPaths} return. + * for each FlowCapableNodeConnector path that + * {@link org.opendaylight.controller.md.sal.binding.api.DataTreeModification} return. */ @Test public void testNodeConnectorRemoval() { @@ -153,7 +155,7 @@ public class NodeConnectorInventoryEventTranslatorTest { List modifications = new ArrayList(); modifications.add(setupDataTreeChange(WRITE, iiToConnector, fcnc)); modifications.add(setupDataTreeChange(DELETE, iiToConnector2, null)); - // Invoke onDataChanged and check that both observers notified + // Invoke onDataTreeChanged and check that both observers notified translator.onDataTreeChanged(modifications); verify(eventsObserver).nodeConnectorAdded(id, fcnc); verify(eventsObserver).nodeConnectorRemoved(id2); @@ -167,8 +169,8 @@ public class NodeConnectorInventoryEventTranslatorTest { } private DataTreeModification setupDataTreeChange(final ModificationType type, - final InstanceIdentifier ii, - final FlowCapableNodeConnector connector) { + final InstanceIdentifier ii, + final FlowCapableNodeConnector connector) { final DataTreeModification dataTreeModification = mock(DataTreeModification.class); when(dataTreeModification.getRootNode()).thenReturn(mock(DataObjectModification.class)); DataTreeIdentifier identifier = new DataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, ii); diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierBase.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierBase.java index 4470678690..a413e43244 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierBase.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierBase.java @@ -67,7 +67,7 @@ public abstract class AbstractNotificationSupplierBase imp } }); }catch(final Exception ex){ - LOG.debug(" AbstractNotificationSupplierBase DataChange listener registration fail ..{}", ex.getMessage()); + LOG.debug("AbstractNotificationSupplierBase DataTreeChange listener registration fail ..{}", ex.getMessage()); throw new IllegalStateException("Notification supplier startup fail! System needs restart.", ex); } } diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierForItemRoot.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierForItemRoot.java index ff3c0cb54b..84322d8664 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierForItemRoot.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/AbstractNotificationSupplierForItemRoot.java @@ -9,13 +9,10 @@ package org.opendaylight.openflowplugin.applications.notification.supplier.impl; import com.google.common.base.Preconditions; - import java.util.Collection; -import java.util.Map.Entry; 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.DataTreeModification; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.applications.notification.supplier.NotificationSupplierForItemRoot; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -42,11 +39,12 @@ abstract class AbstractNotificationSupplierForItemRoot clazz) { + public AbstractNotificationSupplierForItemRoot(final NotificationProviderService notificationProviderService, + final DataBroker db, + final Class clazz) { super(db, clazz); this.notificationProviderService = Preconditions.checkNotNull(notificationProviderService); } diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeConnectorNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeConnectorNotificationSupplierImpl.java index f87a584300..b073231c21 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeConnectorNotificationSupplierImpl.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeConnectorNotificationSupplierImpl.java @@ -33,7 +33,7 @@ public class NodeConnectorNotificationSupplierImpl extends private static final InstanceIdentifier wildCardedInstanceIdent = getNodeWildII().child(NodeConnector.class).augmentation(FlowCapableNodeConnector.class); /** - * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier. + * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier. * * @param notifProviderService - {@link NotificationProviderService} * @param db - {@link DataBroker} diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImpl.java index 19ea605f5f..730d40750c 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImpl.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/NodeNotificationSupplierImpl.java @@ -33,7 +33,7 @@ public class NodeNotificationSupplierImpl extends private static final InstanceIdentifier wildCardedInstanceIdent = getNodeWildII().augmentation(FlowCapableNode.class); /** - * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier. + * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier. * * @param notifProviderService - {@link NotificationProviderService} * @param db - {@link DataBroker} diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/AbstractNotificationSupplierForItem.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/AbstractNotificationSupplierForItem.java index 2370c9b88d..706a9c4b81 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/AbstractNotificationSupplierForItem.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/AbstractNotificationSupplierForItem.java @@ -9,13 +9,10 @@ package org.opendaylight.openflowplugin.applications.notification.supplier.impl.item; import com.google.common.base.Preconditions; - import java.util.Collection; -import java.util.Map.Entry; 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.DataTreeModification; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.applications.notification.supplier.NotificationSupplierForItem; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.AbstractNotificationSupplierBase; @@ -45,7 +42,7 @@ abstract class AbstractNotificationSupplierForItem wildCardedInstanceIdent = getNodeWildII().augmentation(FlowCapableNode.class).child(Table.class).child(Flow.class); /** - * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier. + * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier. * * @param notifProviderService - {@link NotificationProviderService} * @param db - {@link DataBroker} diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImpl.java index 4f2250fb6c..da940d9cb6 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImpl.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImpl.java @@ -33,7 +33,7 @@ public class GroupNotificationSupplierImpl extends private static final InstanceIdentifier wildCardedInstanceIdent = getNodeWildII().augmentation(FlowCapableNode.class).child(Group.class); /** - * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier. + * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier. * * @param notifProviderService - {@link NotificationProviderService} * @param db - {@link DataBroker} diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImpl.java index badd371c30..60d525d4d2 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImpl.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImpl.java @@ -33,7 +33,7 @@ public class MeterNotificationSupplierImpl extends private static final InstanceIdentifier wildCardedInstanceIdent = getNodeWildII().augmentation(FlowCapableNode.class).child(Meter.class); /** - * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier. + * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier. * * @param notifProviderService - {@link NotificationProviderService} * @param db - {@link DataBroker} diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/AbstractNotificationSupplierForItemStat.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/AbstractNotificationSupplierForItemStat.java index 49fdf4744d..c37e459b34 100644 --- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/AbstractNotificationSupplierForItemStat.java +++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/AbstractNotificationSupplierForItemStat.java @@ -9,13 +9,10 @@ package org.opendaylight.openflowplugin.applications.notification.supplier.impl.item.stat; import com.google.common.base.Preconditions; - import java.util.Collection; -import java.util.Map.Entry; 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.DataTreeModification; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.applications.notification.supplier.NotificationSupplierForItemStat; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.AbstractNotificationSupplierBase; @@ -41,7 +38,7 @@ abstract class AbstractNotificationSupplierForItemStatany(), diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/FlowNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/FlowNotificationSupplierImplTest.java index fe24bad548..20328dfa2c 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/FlowNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/FlowNotificationSupplierImplTest.java @@ -16,10 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -44,11 +40,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** - * + * Test for {@link org.opendaylight.openflowplugin.applications.notification.supplier.impl.item.FlowNotificationSupplierImpl}. */ public class FlowNotificationSupplierImplTest { @@ -66,7 +61,7 @@ public class FlowNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new FlowNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImplTest.java index b363415098..3bccc2a035 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/GroupNotificationSupplierImplTest.java @@ -16,10 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -31,7 +27,6 @@ import org.opendaylight.openflowplugin.applications.notification.supplier.impl.h import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestData; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestSupplierVerifyHelper; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupAdded; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupUpdated; @@ -43,11 +38,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** - * + * Test for {@link org.opendaylight.openflowplugin.applications.notification.supplier.impl.item.GroupNotificationSupplierImpl}. */ public class GroupNotificationSupplierImplTest { @@ -64,7 +58,7 @@ public class GroupNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new GroupNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImplTest.java index 4d120ae1a9..5f2c1c26b1 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/MeterNotificationSupplierImplTest.java @@ -16,10 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.junit.Before; import org.junit.Test; @@ -35,8 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918.GroupUpdated; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; @@ -45,11 +39,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.Met import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.MeterUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** - * + * Test for {@link org.opendaylight.openflowplugin.applications.notification.supplier.impl.item.MeterNotificationSupplierImpl}. */ public class MeterNotificationSupplierImplTest { @@ -66,7 +59,7 @@ public class MeterNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new MeterNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowStatNotificationSupplierImplTest.java index 2cb788e02f..cafc97b452 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -42,7 +40,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class FlowStatNotificationSupplierImplTest { @@ -59,7 +56,7 @@ public class FlowStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new FlowStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowTableStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowTableStatNotificationSupplierImplTest.java index ff581c8b0e..dce79da031 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowTableStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/FlowTableStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -31,7 +29,6 @@ import org.opendaylight.openflowplugin.applications.notification.supplier.impl.h import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.FlowTableStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.flow.table.statistics.FlowTableStatistics; @@ -40,7 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class FlowTableStatNotificationSupplierImplTest { @@ -57,7 +53,7 @@ public class FlowTableStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new FlowTableStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/GroupStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/GroupStatNotificationSupplierImplTest.java index 2f05827d4e..91d30468d6 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/GroupStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/GroupStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -29,7 +27,6 @@ import org.opendaylight.openflowplugin.applications.notification.supplier.impl.h import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestData; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestSupplierVerifyHelper; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupStatisticsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.statistics.GroupStatistics; @@ -41,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class GroupStatNotificationSupplierImplTest { @@ -57,7 +53,7 @@ public class GroupStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new GroupStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java index 22f1e23457..ad86ad455c 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/MeterStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -31,7 +29,6 @@ import org.opendaylight.openflowplugin.applications.notification.supplier.impl.h import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.MeterKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; @@ -41,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterId; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class MeterStatNotificationSupplierImplTest { @@ -57,7 +53,7 @@ public class MeterStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new MeterStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImplTest.java index 0ea64796e6..669f457939 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -28,7 +26,6 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestChangeEventBuildHelper; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestData; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestSupplierVerifyHelper; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; @@ -36,12 +33,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.NodeConnectorStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.NodeConnectorStatisticsUpdate; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.flow.capable.node.connector.statistics.FlowCapableNodeConnectorStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.flow.capable.node.connector.statistics.FlowCapableNodeConnectorStatisticsBuilder; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class NodeConnectorStatNotificationSupplierImplTest { @@ -57,7 +52,7 @@ public class NodeConnectorStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new NodeConnectorStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImplTest.java b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImplTest.java index 3a85a21e8f..d19d879174 100644 --- a/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImplTest.java +++ b/applications/notification-supplier/src/test/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Matchers; @@ -29,7 +27,6 @@ import org.opendaylight.openflowplugin.applications.notification.supplier.impl.h import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestData; import org.opendaylight.openflowplugin.applications.notification.supplier.impl.helper.TestSupplierVerifyHelper; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; @@ -41,9 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.FlowCapableNodeConnectorQueueStatisticsDataBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.QueueStatisticsUpdate; -import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.flow.capable.node.connector.queue.statistics.FlowCapableNodeConnectorQueueStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.flow.capable.node.connector.queue.statistics.FlowCapableNodeConnectorQueueStatisticsBuilder; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** @@ -62,7 +57,7 @@ public class QueueStatNotificationSupplierImplTest { notifProviderService = mock(NotificationProviderService.class); dataBroker = mock(DataBroker.class); notifSupplierImpl = new QueueStatNotificationSupplierImpl(notifProviderService, dataBroker); - TestSupplierVerifyHelper.verifyDataChangeRegistration(dataBroker); + TestSupplierVerifyHelper.verifyDataTreeChangeListenerRegistration(dataBroker); } @Test(expected = NullPointerException.class) diff --git a/applications/of-switch-config-pusher/src/test/java/org/opendaylight/openflowplugin/openflow/ofswitch/config/DefaultConfigPusherTest.java b/applications/of-switch-config-pusher/src/test/java/org/opendaylight/openflowplugin/openflow/ofswitch/config/DefaultConfigPusherTest.java index 9417ae7c16..6079ed0f1c 100644 --- a/applications/of-switch-config-pusher/src/test/java/org/opendaylight/openflowplugin/openflow/ofswitch/config/DefaultConfigPusherTest.java +++ b/applications/of-switch-config-pusher/src/test/java/org/opendaylight/openflowplugin/openflow/ofswitch/config/DefaultConfigPusherTest.java @@ -61,7 +61,7 @@ public class DefaultConfigPusherTest { } @Test - public void testOnDataChanged() { + public void testOnDataTreeChanged() { defaultConfigPusher.onDataTreeChanged(Collections.singleton(dataTreeModification)); Mockito.verify(nodeConfigService).setConfig(setConfigInputCaptor.capture()); final SetConfigInput captured = setConfigInputCaptor.getValue(); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java index 5a96bf79ae..e6dfc888f9 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java @@ -10,13 +10,14 @@ package org.opendaylight.openflowplugin.applications.statistics.manager.impl; import com.google.common.base.Optional; import com.google.common.base.Preconditions; - import java.util.Collection; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; - -import org.opendaylight.controller.md.sal.binding.api.*; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; +import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; +import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; @@ -24,13 +25,11 @@ import org.opendaylight.openflowplugin.applications.statistics.manager.StatListe import org.opendaylight.openflowplugin.applications.statistics.manager.StatNodeRegistration; import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager; import org.opendaylight.openflowplugin.common.wait.SimpleTaskRetryLooper; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.NotificationListener; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,11 +38,10 @@ import org.slf4j.LoggerFactory; * org.opendaylight.openflowplugin.applications.statistics.manager.impl * * StatAbstractListeneningCommiter - * Class is abstract implementation for all Configuration/DataStore DataChange + * Class is abstract implementation for all Configuration/DataStore DataTreeModification * listenable DataObjects like flows, groups, meters. It is a holder for common - * functionality needed by construction/destruction class and for DataChange + * functionality needed by construction/destruction class and for DataTreeModification * event processing. - * */ public abstract class StatAbstractListenCommit extends StatAbstractNotifyCommit implements StatListeningCommiter { @@ -80,15 +78,15 @@ public abstract class StatAbstractListenCommit>>() { @Override public ListenerRegistration> call() throws Exception { return db.registerDataTreeChangeListener(treeId,StatAbstractListenCommit.this); } }); - }catch(final Exception ex){ - LOG.debug(" StatAbstractListenCommit DataChange listener registration failed {}", ex.getMessage()); + } catch (final Exception ex) { + LOG.debug(" StatAbstractListenCommit DataTreeChangeListener registration failed {}", ex.getMessage()); throw new IllegalStateException("Notification supplier startup fail! System needs restart.", ex); } } @@ -138,7 +136,7 @@ public abstract class StatAbstractListenCommitVaclav Demcak - * */ public class StatListenCommitFlow extends StatAbstractListenCommit implements OpendaylightFlowStatisticsListener { diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitGroup.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitGroup.java index a89ea181f0..b4eaa0893f 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitGroup.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitGroup.java @@ -66,10 +66,7 @@ import com.google.common.base.Preconditions; * StatListenCommitGroup * Class is a NotifyListener for GroupStatistics and DataTreeChangeListener for Config/DataStore for Group node. * All expected (registered) GroupStatistics will be builded and commit to Operational/DataStore. - * DataChangeEven should call create/delete Group in Operational/DS - * - * @author Vaclav Demcak - * + * DataTreeModification should call create/delete Group in Operational/DS */ public class StatListenCommitGroup extends StatAbstractListenCommit implements OpendaylightGroupStatisticsListener { diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitMeter.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitMeter.java index 127e2c6a74..20eb166586 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitMeter.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitMeter.java @@ -8,10 +8,11 @@ package org.opendaylight.openflowplugin.applications.statistics.manager.impl; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import java.util.UUID; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; @@ -31,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.me import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionAware; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; @@ -57,9 +57,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - /** * statistics-manager * org.opendaylight.openflowplugin.applications.statistics.manager.impl @@ -67,8 +64,7 @@ import com.google.common.base.Preconditions; * StatListenCommitMeter * Class is a NotifyListener for MeterStatistics and DataTreeChangeListener for Config/DataStore for Meter node. * All expected (registered) MeterStatistics will be builded and commit to Operational/DataStore. - * DataChangeEven should call create/delete Meter in Operational/DS - * + * DataTreeModification should call create/delete Meter in Operational/DS */ public class StatListenCommitMeter extends StatAbstractListenCommit implements OpendaylightMeterStatisticsListener { diff --git a/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java b/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java index 93b150741d..122ffd0680 100644 --- a/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java +++ b/applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommitTest.java @@ -142,7 +142,7 @@ public class StatAbstractListenCommitTest { @SuppressWarnings("unchecked") @Test - public void testReadLatestConfigurationWithInterveningOnDataChanged() { + public void testReadLatestConfigurationWithInterveningOnDataTreeChanged() { InstanceIdentifier path = InstanceIdentifier.create(DataObject.class); -- 2.36.6