Use constructor injection in mdsal-singleton-dom-impl

Upgraded SpotBugs complains about
UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR, fix that by using constructor
injection.

Change-Id: I812feea91e0a13e7978d4d89b2ca2ee863c2187d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/OSGiClusterSingletonServiceProvider.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/OSGiClusterSingletonServiceProvider.java
index e709709cc93bddfd151ca320a4a7b966180b617c..f5d1a10cf039e72ce4f9a33834181ce85bac5dad 100644 (file)
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/OSGiClusterSingletonServiceProvider.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/OSGiClusterSingletonServiceProvider.java
@@ -24,23 +24,10 @@ import org.slf4j.LoggerFactory;
 public final class OSGiClusterSingletonServiceProvider implements ClusterSingletonServiceProvider {
     private static final Logger LOG = LoggerFactory.getLogger(OSGiClusterSingletonServiceProvider.class);
 
-    @Reference
-    DOMEntityOwnershipService entityOwnershipService = null;
-
     private DOMClusterSingletonServiceProviderImpl delegate;
 
-    @Override
-    public ClusterSingletonServiceRegistration registerClusterSingletonService(final ClusterSingletonService service) {
-        return delegate.registerClusterSingletonService(service);
-    }
-
-    @Override
-    public void close() {
-        // Ignored on purpose
-    }
-
     @Activate
-    void activate() {
+    public OSGiClusterSingletonServiceProvider(@Reference final DOMEntityOwnershipService entityOwnershipService) {
         LOG.info("Cluster Singleton Service starting");
         delegate = new DOMClusterSingletonServiceProviderImpl(entityOwnershipService);
         delegate.initializeProvider();
@@ -54,4 +41,14 @@ public final class OSGiClusterSingletonServiceProvider implements ClusterSinglet
         delegate = null;
         LOG.info("Cluster Singleton Service stopped");
     }
+
+    @Override
+    public ClusterSingletonServiceRegistration registerClusterSingletonService(final ClusterSingletonService service) {
+        return delegate.registerClusterSingletonService(service);
+    }
+
+    @Override
+    public void close() {
+        // Ignored on purpose
+    }
 }