Move createProxy()

This is a simple internal method, inline it.

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

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 5d0039c92960e71b1bb58851fff5a8296f95ccdc..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;
 
  */
 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;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;


@@ -32,7 +33,9 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
 
                 @Override
                 public RpcServiceAdapter load(final Class<? extends RpcService> key) {
 
                 @Override
                 public RpcServiceAdapter load(final Class<? extends RpcService> key) {

-                    return createProxy(key);
+                    checkArgument(BindingReflections.isBindingClass(key));
+                    checkArgument(key.isInterface(), "Supplied RPC service type must be interface.");
+                    return new RpcServiceAdapter(key, codec, domService);

                 }
 
             });
                 }
 
             });


@@ -48,16 +51,10 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
     @SuppressWarnings("unchecked")
     @Override
     public <T extends RpcService> T getRpcService(final Class<T> rpcService) {
     @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();
     }
 
         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
     private static final class Builder extends BindingDOMAdapterBuilder<RpcConsumerRegistry> {
 
         @Override


@@ -71,7 +68,5 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry {
         public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
             return ImmutableSet.of(DOMRpcService.class);
         }
         public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
             return ImmutableSet.of(DOMRpcService.class);
         }

-

     }
     }

-

 }
 }