Switch to MD-SAL APIs

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

diff --git a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImpl.java b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImpl.java
index 00580dca86da97f773f3894d4438be9ca82fb030..953079cc40ce4916822cce3633610d9f96864cd1 100644 (file)
--- a/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImpl.java
+++ b/applications/notification-supplier/src/main/java/org/opendaylight/openflowplugin/applications/notification/supplier/impl/item/stat/NodeConnectorStatNotificationSupplierImpl.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.inventory.rev130819.node.NodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
@@ -29,43 +28,44 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 public class NodeConnectorStatNotificationSupplierImpl extends
         AbstractNotificationSupplierForItemStat<FlowCapableNodeConnectorStatistics, NodeConnectorStatisticsUpdate> {
 
-    private static final InstanceIdentifier<FlowCapableNodeConnectorStatistics> wildCardedInstanceIdent =
-            getNodeWildII().child(NodeConnector.class)
-                    .augmentation(FlowCapableNodeConnectorStatisticsData.class)
-                    .child(FlowCapableNodeConnectorStatistics.class);
+    private static final InstanceIdentifier<FlowCapableNodeConnectorStatistics>
+            FLOW_CAPABLE_NODE_CONNECTOR_STATISTICS_INSTANCE_IDENTIFIER = getNodeWildII().child(NodeConnector.class)
+            .augmentation(FlowCapableNodeConnectorStatisticsData.class).child(FlowCapableNodeConnectorStatistics.class);
 
     /**
-     * Constructor register supplier as DataChangeLister and create wildCarded InstanceIdentifier.
+     * Constructor register supplier as DataTreeChangeListener and create wildCarded InstanceIdentifier.
      *
-     * @param notifProviderService - {@link NotificationProviderService}
+     * @param notifProviderService - {@link NotificationPublishService}
      * @param db                   - {@link DataBroker}
      */
-    public NodeConnectorStatNotificationSupplierImpl(final NotificationProviderService notifProviderService, final DataBroker db) {
+    public NodeConnectorStatNotificationSupplierImpl(final NotificationPublishService notifProviderService,
+                                                     final DataBroker db) {
         super(notifProviderService, db, FlowCapableNodeConnectorStatistics.class);
     }
 
     @Override
     public InstanceIdentifier<FlowCapableNodeConnectorStatistics> getWildCardPath() {
-        return wildCardedInstanceIdent;
+        return FLOW_CAPABLE_NODE_CONNECTOR_STATISTICS_INSTANCE_IDENTIFIER;
     }
 
     @Override
-    public NodeConnectorStatisticsUpdate createNotification(final FlowCapableNodeConnectorStatistics o,
-                                                            final InstanceIdentifier<FlowCapableNodeConnectorStatistics> path) {
-        Preconditions.checkArgument(o != null);
+    public NodeConnectorStatisticsUpdate createNotification(
+            final FlowCapableNodeConnectorStatistics flowCapableNodeConnectorStatistics,
+            final InstanceIdentifier<FlowCapableNodeConnectorStatistics> path) {
+        Preconditions.checkArgument(flowCapableNodeConnectorStatistics != null);
         Preconditions.checkArgument(path != null);
 
         final NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder();
-        final NodeConnectorKey ncKey = path.firstKeyOf(NodeConnector.class, NodeConnectorKey.class);
+        final NodeConnectorKey ncKey = path.firstKeyOf(NodeConnector.class);
         ncBuilder.setId(ncKey.getId());
-        ncBuilder.setKey(ncKey);
+        ncBuilder.withKey(ncKey);
 
         final NodeConnectorStatisticsUpdateBuilder builder = new NodeConnectorStatisticsUpdateBuilder();
         builder.setId(getNodeId(path));
         builder.setMoreReplies(Boolean.FALSE);
         builder.setNodeConnector(Collections.singletonList(ncBuilder.build()));
-        builder.setNodeConnectorStatisticsAndPortNumberMap(Collections
-                .singletonList(new NodeConnectorStatisticsAndPortNumberMapBuilder(o).build()));
+        builder.setNodeConnectorStatisticsAndPortNumberMap(Collections.singletonList(
+                new NodeConnectorStatisticsAndPortNumberMapBuilder(flowCapableNodeConnectorStatistics).build()));
         return builder.build();
     }
 }