Switch to MD-SAL APIs

[openflowplugin.git] / applications / notification-supplier / src / main / java / org / opendaylight / openflowplugin / applications / notification / supplier / impl / item / stat / QueueStatNotificationSupplierImpl.java

diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImpl.java
index 78a06e33a03b7c4ea1b456655f1338dee96f8885..28281a1e4494904efe60fe780c335b90d4463234 100644 (file)
--- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImpl.java
+++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/QueueStatNotificationSupplierImpl.java
@@ -5,13 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.applications.notification.supplier.impl.item.stat;
 
 import com.google.common.base.Preconditions;
 import java.util.Collections;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector;
@@ -30,39 +29,41 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 public class QueueStatNotificationSupplierImpl extends
         AbstractNotificationSupplierForItemStat<FlowCapableNodeConnectorQueueStatisticsData, QueueStatisticsUpdate> {
 
-    private static final InstanceIdentifier<FlowCapableNodeConnectorQueueStatisticsData> wildCardedInstanceIdent =
-            getNodeWildII().child(NodeConnector.class)
-                    .augmentation(FlowCapableNodeConnector.class).child(Queue.class)
-                    .augmentation(FlowCapableNodeConnectorQueueStatisticsData.class);
+    private static final InstanceIdentifier<FlowCapableNodeConnectorQueueStatisticsData>
+            FLOW_CAPABLE_NODE_CONNECTOR_QUEUE_STATISTICS_DATA_INSTANCE_IDENTIFIER = getNodeWildII()
+            .child(NodeConnector.class).augmentation(FlowCapableNodeConnector.class).child(Queue.class)
+            .augmentation(FlowCapableNodeConnectorQueueStatisticsData.class);
 
     /**
      * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier.
      *
-     * @param notifProviderService - {@link NotificationProviderService}
-     * @param db - {@link DataBroker}
+     * @param notifProviderService - {@link NotificationPublishService}
+     * @param db                   - {@link DataBroker}
      */
-    public QueueStatNotificationSupplierImpl(final NotificationProviderService notifProviderService, final DataBroker db) {
+    public QueueStatNotificationSupplierImpl(final NotificationPublishService notifProviderService,
+                                             final DataBroker db) {
         super(notifProviderService, db, FlowCapableNodeConnectorQueueStatisticsData.class);
     }
 
     @Override
     public InstanceIdentifier<FlowCapableNodeConnectorQueueStatisticsData> getWildCardPath() {
-        return wildCardedInstanceIdent;
+        return FLOW_CAPABLE_NODE_CONNECTOR_QUEUE_STATISTICS_DATA_INSTANCE_IDENTIFIER;
     }
 
     @Override
-    public QueueStatisticsUpdate createNotification(final FlowCapableNodeConnectorQueueStatisticsData o,
+    public QueueStatisticsUpdate createNotification(
+            final FlowCapableNodeConnectorQueueStatisticsData statisticsDataTreeItem,
             final InstanceIdentifier<FlowCapableNodeConnectorQueueStatisticsData> path) {
-        Preconditions.checkArgument(o != null);
+        Preconditions.checkArgument(statisticsDataTreeItem != null);
         Preconditions.checkArgument(path != null);
 
         final NodeConnectorBuilder connBuilder = new NodeConnectorBuilder();
-        final NodeConnectorKey key = path.firstKeyOf(NodeConnector.class, NodeConnectorKey.class);
+        final NodeConnectorKey key = path.firstKeyOf(NodeConnector.class);
         connBuilder.setId(key.getId());
-        connBuilder.setKey(key);
+        connBuilder.withKey(key);
 
-        final QueueIdAndStatisticsMapBuilder queueStatMapBuilder =
-                new QueueIdAndStatisticsMapBuilder(o.getFlowCapableNodeConnectorQueueStatistics());
+        final QueueIdAndStatisticsMapBuilder queueStatMapBuilder = new QueueIdAndStatisticsMapBuilder(
+                statisticsDataTreeItem.getFlowCapableNodeConnectorQueueStatistics());
 
         final QueueStatisticsUpdateBuilder builder = new QueueStatisticsUpdateBuilder();
         builder.setId(getNodeId(path));