Cleanup OSGi DOMRpcRouter services

We have constructor injection available, which allows us to make these
classes cleaner by making the delegate field final.

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

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionProviderService.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionProviderService.java
index f3637eee0f6b4c1ba1549593758ce73091968d15..2eacff1d7ebf3ef9f9891237563466b50c910033 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionProviderService.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionProviderService.java
@@ -7,26 +7,26 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
 import com.google.common.annotations.Beta;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
 import org.opendaylight.mdsal.dom.spi.ForwardingDOMActionProviderService;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
 @Beta
 @Component(immediate = true, service = DOMActionProviderService.class)
 public final class OSGiDOMActionProviderService extends ForwardingDOMActionProviderService {
-    private DOMActionProviderService delegate;
+    private final @NonNull DOMActionProviderService delegate;
 
-    @Override
-    protected DOMActionProviderService delegate() {
-        return verifyNotNull(delegate);
+    @Activate
+    public OSGiDOMActionProviderService(@Reference final DOMRpcRouterServices router) {
+        delegate = router.getActionProviderService();
     }
 
-    @Reference
-    void bindRpcRouter(final DOMRpcRouterServices router) {
-        delegate = router.getActionProviderService();
+    @Override
+    protected DOMActionProviderService delegate() {
+        return delegate;
     }
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionService.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionService.java
index 0966837b77c11c9a06e67255efb4be7ba5ea0306..b17c0e9c787c9fc59889fc0dfdf181a9f3c98dcb 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionService.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMActionService.java
@@ -7,26 +7,26 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
 import com.google.common.annotations.Beta;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
 import org.opendaylight.mdsal.dom.spi.ForwardingDOMActionService;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
 @Beta
 @Component(immediate = true, service = DOMActionService.class)
 public final class OSGiDOMActionService extends ForwardingDOMActionService {
-    private DOMActionService delegate;
+    private final @NonNull DOMActionService delegate;
 
-    @Override
-    protected DOMActionService delegate() {
-        return verifyNotNull(delegate);
+    @Activate
+    public OSGiDOMActionService(@Reference final DOMRpcRouterServices router) {
+        delegate = router.getActionService();
     }
 
-    @Reference
-    void bindRpcRouter(final DOMRpcRouterServices router) {
-        delegate = router.getActionService();
+    @Override
+    protected DOMActionService delegate() {
+        return delegate;
     }
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcProviderService.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcProviderService.java
index f29bf81e93e2c72869a9b0506dfc62514b85ef2b..bf9e7621708bfe18ea790f64a2914b24d92a5b85 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcProviderService.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcProviderService.java
@@ -7,26 +7,26 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
 import com.google.common.annotations.Beta;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.mdsal.dom.spi.ForwardingDOMRpcProviderService;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
 @Beta
 @Component(immediate = true, service = DOMRpcProviderService.class)
 public final class OSGiDOMRpcProviderService extends ForwardingDOMRpcProviderService {
-    private DOMRpcProviderService delegate;
+    private final @NonNull DOMRpcProviderService delegate;
 
-    @Override
-    protected DOMRpcProviderService delegate() {
-        return verifyNotNull(delegate);
+    @Activate
+    public OSGiDOMRpcProviderService(@Reference final DOMRpcRouterServices router) {
+        delegate = router.getRpcProviderService();
     }
 
-    @Reference
-    void bindRpcRouter(final DOMRpcRouterServices router) {
-        delegate = router.getRpcProviderService();
+    @Override
+    protected DOMRpcProviderService delegate() {
+        return delegate;
     }
 }

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcService.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcService.java
index 87ca75cba4c491a243ef99b4e3ee133eff4e1a15..c1ab11607908ca7399a74ed66ecd52410bed34e3 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcService.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OSGiDOMRpcService.java
@@ -7,26 +7,26 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import static com.google.common.base.Verify.verifyNotNull;
-
 import com.google.common.annotations.Beta;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.spi.ForwardingDOMRpcService;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
 @Beta
 @Component(immediate = true, service = DOMRpcService.class)
 public final class OSGiDOMRpcService extends ForwardingDOMRpcService {
-    private DOMRpcService delegate;
+    private final @NonNull DOMRpcService delegate;
 
-    @Override
-    protected DOMRpcService delegate() {
-        return verifyNotNull(delegate);
+    @Activate
+    public OSGiDOMRpcService(@Reference final DOMRpcRouterServices router) {
+        delegate = router.getRpcService();
     }
 
-    @Reference
-    void bindRpcRouter(final DOMRpcRouterServices router) {
-        delegate = router.getRpcService();
+    @Override
+    protected DOMRpcService delegate() {
+        return delegate;
     }
 }