Initialize PCEPTopologyDeployerImpl in constructor

There is nothing that could possibly during instantiation, eliminate
the init() method, allowing us to focus on lifecycle.

JIRA: BGPCEP-983
Change-Id: I5844ed57bc81acaeaf3fdfe08d956da9321c27d5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java
index 722eff13293980654151164c4ce1509e97636d11..bbc7d93596aac796c5c933ba760f4d0def991de2 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java
@@ -42,7 +42,7 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PCEPTopologyDeployerImpl implements ClusteredDataTreeChangeListener<Topology>, AutoCloseable {
+public final class PCEPTopologyDeployerImpl implements ClusteredDataTreeChangeListener<Topology>, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(PCEPTopologyDeployerImpl.class);
     private static final long TIMEOUT_NS = TimeUnit.SECONDS.toNanos(5);
 
@@ -77,9 +77,7 @@ public class PCEPTopologyDeployerImpl implements ClusteredDataTreeChangeListener
         this.stateRegistry = requireNonNull(stateRegistry);
         this.pceServerProvider = requireNonNull(pceServerProvider);
         this.bundleContext = requireNonNull(bundleContext);
-    }
 
-    public synchronized void init() {
         LOG.info("PCEP Topology Deployer initialized");
         listenerRegistration = dataBroker.registerDataTreeChangeListener(
             DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,

diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
index fcf8c2579bb01ada4a9cf624eb3f1864d10f4e2b..ebb2808d3fc73d82d6a5f7e42aa93df1e71b96e7 100644 (file)
--- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
+++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
@@ -21,7 +21,6 @@
 
     <bean id="pcepTopologyDeployer"
           class="org.opendaylight.bgpcep.pcep.topology.provider.config.PCEPTopologyDeployerImpl"
-          init-method="init"
           destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="clusterSingletonServiceProvider"/>