Clean up DOMMountPointServiceImpl

Reduce logs and allow the service be found by Dagger and also for it to
be deactivated when needed.

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

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java
index 54f5837c5cdbe54bb51ed5a467244714c3a758da..3f681c8bdfb0ce161b634fbfb085c8f1478c8acf 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMMountPointServiceImpl.java
@@ -13,6 +13,7 @@ import com.google.common.collect.MutableClassToInstanceMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.kohsuke.MetaInfServices;
 import org.opendaylight.mdsal.dom.api.DOMMountPoint;
@@ -27,11 +28,10 @@ import org.opendaylight.yangtools.util.ListenerRegistry;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Component(immediate = true)
+@Component
 @MetaInfServices
 @Singleton
 public final class DOMMountPointServiceImpl implements DOMMountPointService {
@@ -41,6 +41,12 @@ public final class DOMMountPointServiceImpl implements DOMMountPointService {
 
     private final ListenerRegistry<DOMMountPointListener> listeners = ListenerRegistry.create();
 
+    @Inject
+    @Activate
+    public DOMMountPointServiceImpl() {
+        // Exposed only for DI
+    }
+
     @Override
     public Optional<DOMMountPoint> getMountPoint(final YangInstanceIdentifier path) {
         return Optional.ofNullable(mountPoints.get(path));
@@ -57,18 +63,6 @@ public final class DOMMountPointServiceImpl implements DOMMountPointService {
         return listeners.register(listener);
     }
 
-    @Activate
-    @SuppressWarnings("static-method")
-    void activate() {
-        LOG.info("DOMMountPointService activated");
-    }
-
-    @Deactivate
-    @SuppressWarnings("static-method")
-    void deactivate() {
-        LOG.info("DOMMountPointService deactivated");
-    }
-
     @SuppressWarnings("checkstyle:IllegalCatch")
     private ObjectRegistration<DOMMountPoint> registerMountPoint(final SimpleDOMMountPoint mountPoint) {
         final YangInstanceIdentifier mountPointId = mountPoint.getIdentifier();