X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=applications%2Fforwardingrules-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fapplications%2Ffrm%2Fimpl%2FAbstractNodeConnectorCommitter.java;h=bbc910831bc3430b4c03799e8ef02f7361c76b86;hb=5778c89b1d3a72fcbafaf2df7af62d7edd853dda;hp=5e75b2d202d998a0f7151ddd9607c0a5034c3be4;hpb=2f0bb7b74a58dde036e69677e5dba089863d82cf;p=openflowplugin.git

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractNodeConnectorCommitter.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractNodeConnectorCommitter.java
index 5e75b2d202..bbc910831b 100644
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractNodeConnectorCommitter.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/AbstractNodeConnectorCommitter.java
@@ -1,32 +1,23 @@
-/**
+/*
  * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * 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.frm.impl;
 
 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.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.openflowplugin.applications.frm.FlowCapableNodeConnectorCommitter;
-import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public abstract class AbstractNodeConnectorCommitter <T extends DataObject> implements FlowCapableNodeConnectorCommitter<T> {
-    private ForwardingRulesManager provider;
-
-    private final Class<T> clazz;
-
-    public AbstractNodeConnectorCommitter (ForwardingRulesManager provider, Class<T> clazz) {
-        this.provider = Preconditions.checkNotNull(provider, "ForwardingRulesManager can not be null!");
-        this.clazz = Preconditions.checkNotNull(clazz, "Class can not be null!");
-    }
+public abstract class AbstractNodeConnectorCommitter<T extends DataObject>
+        implements FlowCapableNodeConnectorCommitter<T> {
 
     @Override
     public void onDataTreeChanged(Collection<DataTreeModification<T>> changes) {
@@ -35,8 +26,8 @@ public abstract class AbstractNodeConnectorCommitter <T extends DataObject> impl
         for (DataTreeModification<T> change : changes) {
             final InstanceIdentifier<T> key = change.getRootPath().getRootIdentifier();
             final DataObjectModification<T> mod = change.getRootNode();
-            final InstanceIdentifier<FlowCapableNodeConnector> nodeConnIdent =
-                    key.firstIdentifierOf(FlowCapableNodeConnector.class);
+            final InstanceIdentifier<FlowCapableNodeConnector> nodeConnIdent = key
+                    .firstIdentifierOf(FlowCapableNodeConnector.class);
 
             if (preConfigurationCheck(nodeConnIdent)) {
                 switch (mod.getModificationType()) {
@@ -61,14 +52,13 @@ public abstract class AbstractNodeConnectorCommitter <T extends DataObject> impl
     }
 
     /**
-     * Method return wildCardPath for Listener registration
-     * and for identify the correct KeyInstanceIdentifier from data;
+     * Method return wildCardPath for Listener registration and for identify the
+     * correct KeyInstanceIdentifier from data.
      */
     protected abstract InstanceIdentifier<T> getWildCardPath();
 
     private boolean preConfigurationCheck(final InstanceIdentifier<FlowCapableNodeConnector> nodeConnIdent) {
         Preconditions.checkNotNull(nodeConnIdent, "FlowCapableNodeConnector ident can not be null!");
         return true;
-        //return provider.isNodeActive(nodeConnIdent);
     }
 }