Move createProxy()

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / md / sal / binding / impl / BindingDOMRpcServiceAdapter.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java
index 6504341d930cea322c6537c4dcd6f877691c8e76..1981bd6cd850d3ba6ee6744f464dcf5ae8efd0fc 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.controller.md.sal.binding.impl;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -18,9 +19,10 @@ import org.opendaylight.controller.md.sal.binding.impl.BindingDOMAdapterBuilder.
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.md.sal.dom.api.DOMService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
 import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 
+@Deprecated
 public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
 
     protected static final Factory<RpcConsumerRegistry> BUILDER_FACTORY = Builder::new;
@@ -30,8 +32,10 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
             .build(new CacheLoader<Class<? extends RpcService>, RpcServiceAdapter>() {
 
                 @Override
-                public RpcServiceAdapter load(final Class<? extends RpcService> key) throws Exception {
-                    return createProxy(key);
+                public RpcServiceAdapter load(final Class<? extends RpcService> key) {
+                    checkArgument(BindingReflections.isBindingClass(key));
+                    checkArgument(key.isInterface(), "Supplied RPC service type must be interface.");
+                    return new RpcServiceAdapter(key, codec, domService);
                 }
 
             });
@@ -47,16 +51,10 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
     @SuppressWarnings("unchecked")
     @Override
     public <T extends RpcService> T getRpcService(final Class<T> rpcService) {
-        Preconditions.checkArgument(rpcService != null, "Rpc Service needs to be specied.");
+        checkArgument(rpcService != null, "Rpc Service needs to be specied.");
         return (T) proxies.getUnchecked(rpcService).getProxy();
     }
 
-    private RpcServiceAdapter createProxy(final Class<? extends RpcService> key) {
-        Preconditions.checkArgument(BindingReflections.isBindingClass(key));
-        Preconditions.checkArgument(key.isInterface(), "Supplied RPC service type must be interface.");
-        return new RpcServiceAdapter(key, codec, domService);
-    }
-
     private static final class Builder extends BindingDOMAdapterBuilder<RpcConsumerRegistry> {
 
         @Override
@@ -70,7 +68,5 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
         public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
             return ImmutableSet.of(DOMRpcService.class);
         }
-
     }
-
 }