Clean up BindingDOMRpcServiceAdapter a bit

This class should be final. Also use requireNonNull() and Class.cast()
to clean up our act.

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java
index e9dfe32d3dfd4013a98edc14589ba9ea553d5688..8192b6610a638508226cea1beb1a98f93e6de429 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcServiceAdapter.java
@@ -8,6 +8,7 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ClassToInstanceMap;
@@ -21,7 +22,7 @@ import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
 @VisibleForTesting
-public class BindingDOMRpcServiceAdapter
+public final class BindingDOMRpcServiceAdapter
         extends AbstractBindingLoadingAdapter<DOMRpcService, Class<? extends RpcService>, RpcServiceAdapter>
         implements RpcConsumerRegistry {
     static final Factory<RpcConsumerRegistry> BUILDER_FACTORY = Builder::new;
@@ -30,11 +31,9 @@ public class BindingDOMRpcServiceAdapter
         super(adapterContext, domService);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public <T extends RpcService> T getRpcService(final Class<T> rpcService) {
-        checkArgument(rpcService != null, "Rpc Service needs to be specied.");
-        return (T) getAdapter(rpcService).getProxy();
+        return rpcService.cast(getAdapter(requireNonNull(rpcService)).getProxy());
     }
 
     @Override