Clean up ForwardingRulesManager interface

start()/close() should not be exposed from the interface, as they are
lifecycle methods of the implementation.

JIRA: OPNFLWPLUG-1112
Change-Id: I5609dba0d8777eed2ddc99f18fd5a12a4d318c58
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java
index 8f748cf72cc554eab87010c3df01e4790e3ca208..abb2697b822dbe58e9a7e3e7844a7e6557844e99 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java
@@ -32,10 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  *
  * @author <a href="mailto:vdemcak@cisco.com">Vaclav Demcak</a>
  */
-public interface ForwardingRulesManager extends ConfigurationListener, AutoCloseable {
-
-    void start();
-
+public interface ForwardingRulesManager extends ConfigurationListener {
     /**
      * Method returns information : "is Node with send InstanceIdentifier
      * connected"?.

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
index 9b6094c9112459ff31885559d531c7cb9b9aac73..b4e7bd4886aa86ff75a54c3b9ebda8b4862b606f 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/ForwardingRulesManagerImpl.java
@@ -10,12 +10,10 @@ package org.opendaylight.openflowplugin.applications.frm.impl;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicLong;
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -68,45 +66,41 @@ import org.slf4j.LoggerFactory;
  *
  */
 @Singleton
-public final class ForwardingRulesManagerImpl implements ForwardingRulesManager {
+public final class ForwardingRulesManagerImpl implements ForwardingRulesManager, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(ForwardingRulesManagerImpl.class);
 
     private static final int FRM_RECONCILIATION_PRIORITY = Integer.getInteger("frm.reconciliation.priority", 1);
     private static final String SERVICE_NAME = "FRM";
 
+    private final FlowNodeConnectorInventoryTranslatorImpl flowNodeConnectorInventoryTranslatorImpl;
+    private final DevicesGroupRegistry devicesGroupRegistry = new DevicesGroupRegistry();
+    private final NodeConfigurator nodeConfigurator = new NodeConfiguratorImpl();
+    private final ClusterSingletonServiceProvider clusterSingletonServiceProvider;
+    private final OpenflowServiceRecoveryHandler openflowServiceRecoveryHandler;
+    private final ArbitratorReconcileService arbitratorReconciliationManager;
+    private final BundleMessagesCommiter<Group> bundleGroupListener;
+    private final BundleMessagesCommiter<Flow> bundleFlowListener;
+    private final ServiceRecoveryRegistry serviceRecoveryRegistry;
     private final AtomicLong txNum = new AtomicLong();
     private final DataBroker dataService;
     private final SalFlowService salFlowService;
     private final SalGroupService salGroupService;
     private final SalMeterService salMeterService;
     private final SalTableService salTableService;
-    private final ClusterSingletonServiceProvider clusterSingletonServiceProvider;
     private final SalBundleService salBundleService;
+
     private final AutoCloseable configurationServiceRegistration;
-    private final MastershipChangeServiceManager mastershipChangeServiceManager;
-    private final RpcProviderService rpcProviderService;
     private ForwardingRulesCommiter<Flow> flowListener;
     private ForwardingRulesCommiter<Group> groupListener;
     private ForwardingRulesCommiter<Meter> meterListener;
     private ForwardingRulesCommiter<TableFeatures> tableListener;
-    private BundleMessagesCommiter<Flow> bundleFlowListener;
-    private BundleMessagesCommiter<Group> bundleGroupListener;
     private FlowNodeReconciliation nodeListener;
     private NotificationRegistration reconciliationNotificationRegistration;
-    private FlowNodeConnectorInventoryTranslatorImpl flowNodeConnectorInventoryTranslatorImpl;
     private DeviceMastershipManager deviceMastershipManager;
-    private final ReconciliationManager reconciliationManager;
-    private DevicesGroupRegistry devicesGroupRegistry;
-    private NodeConfigurator nodeConfigurator;
-    private final ArbitratorReconcileService arbitratorReconciliationManager;
     private boolean disableReconciliation;
     private boolean staleMarkingEnabled;
     private int reconciliationRetryCount;
     private boolean isBundleBasedReconciliationEnabled;
-    private final OpenflowServiceRecoveryHandler openflowServiceRecoveryHandler;
-    private final ServiceRecoveryRegistry serviceRecoveryRegistry;
-    private final FlowGroupCacheManager flowGroupCacheManager;
-    private final ListenerRegistrationHelper registrationHelper;
 
     @Inject
     public ForwardingRulesManagerImpl(final DataBroker dataBroker,
@@ -126,16 +120,8 @@ public final class ForwardingRulesManagerImpl implements ForwardingRulesManager
         reconciliationRetryCount = config.getReconciliationRetryCount().toJava();
         isBundleBasedReconciliationEnabled = config.getBundleBasedReconciliationEnabled();
         configurationServiceRegistration = configurationService.registerListener(this);
-        dataService = requireNonNull(dataBroker, "DataBroker can not be null!");
-        this.registrationHelper = requireNonNull(registrationHelper, "RegistrationHelper cannot be null");
-        clusterSingletonServiceProvider = requireNonNull(clusterSingletonService,
-                "ClusterSingletonService provider can not be null");
-        this.reconciliationManager = reconciliationManager;
-        this.rpcProviderService = rpcProviderService;
-        this.mastershipChangeServiceManager = mastershipChangeServiceManager;
-        this.flowGroupCacheManager = flowGroupCacheManager;
-
-        Preconditions.checkArgument(rpcRegistry != null, "RpcProviderRegistry can not be null !");
+        dataService = requireNonNull(dataBroker);
+        clusterSingletonServiceProvider = requireNonNull(clusterSingletonService);
 
         salFlowService = requireNonNull(rpcRegistry.getRpcService(SalFlowService.class),
                 "RPC SalFlowService not found.");
@@ -154,13 +140,7 @@ public final class ForwardingRulesManagerImpl implements ForwardingRulesManager
         arbitratorReconciliationManager =
                 requireNonNull(rpcRegistry.getRpcService(ArbitratorReconcileService.class),
                         "ArbitratorReconciliationManager can not be null!");
-    }
 
-    @Override
-    @PostConstruct
-    public void start() {
-        nodeConfigurator = new NodeConfiguratorImpl();
-        devicesGroupRegistry = new DevicesGroupRegistry();
         nodeListener = new FlowNodeReconciliationImpl(this, dataService, SERVICE_NAME, FRM_RECONCILIATION_PRIORITY,
                 ResultState.DONOTHING, flowGroupCacheManager);
         if (isReconciliationDisabled()) {

diff --git a/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml b/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml
index e0b9ec028b5e2ffe79fd6b4d20393e9fc35a43d5..46e483c58291399a2a0e87e01b48dbe5365ebc92 100644 (file)
--- a/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml
+++ b/applications/forwardingrules-manager/src/main/resources/OSGI-INF/blueprint/forwardingrules-manager.xml
@@ -11,7 +11,6 @@
 
   <bean id="forwardingRulesManagerImpl"
         class="org.opendaylight.openflowplugin.applications.frm.impl.ForwardingRulesManagerImpl"
-        init-method="start"
         destroy-method="close">
     <argument ref="dataBroker"/>
     <argument ref="rpcConsumerRegistry"/>

diff --git a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
index d556f7f6b7aba2347f373f7b676e6bf315dcaa5c..415463d87a849c0dd9cc1902181f4c80ff05232e 100644 (file)
--- a/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
+++ b/applications/forwardingrules-manager/src/test/java/test/mock/util/AbstractFRMTest.java
@@ -88,7 +88,6 @@ public abstract class AbstractFRMTest extends AbstractDataBrokerTest {
                 rpcProviderService, getConfig(), mastershipChangeServiceManager, clusterSingletonService,
                 getConfigurationService(), reconciliationManager, openflowServiceRecoveryHandler,
                 serviceRecoveryRegistry, flowGroupCacheManager, new ListenerRegistrationHelperImpl(dataBroker));
-        forwardingRulesManager.start();
     }
 
     protected void setDeviceMastership(final NodeId nodeId) {