X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FBindingDOMRpcServiceAdapter.java;h=1981bd6cd850d3ba6ee6744f464dcf5ae8efd0fc;hb=4ad8e1880cfee424eac9e4f12e461d98445a6e44;hp=b58c56c9013a3fbc81eeefbc4d8768af842dd220;hpb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;p=controller.git 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 b58c56c901..1981bd6cd8 100644 --- 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; @@ -21,6 +22,7 @@ import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.RpcService; +@Deprecated public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry { protected static final Factory BUILDER_FACTORY = Builder::new; @@ -31,7 +33,9 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry { @Override public RpcServiceAdapter load(final Class key) { - return createProxy(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 getRpcService(final Class 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 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 { @Override @@ -70,7 +68,5 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry { public Set> getRequiredDelegates() { return ImmutableSet.of(DOMRpcService.class); } - } - }