Rename RpcConsumerRegistry to RpcService

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / BindingDOMRpcServiceAdapter.java

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 df4eb84b0b42cbf77f689d439e57828ee4511df6..a135dabd9ec7adc0d7b3f1feee32c1631201a8bb 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
@@ -7,57 +7,58 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+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;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
+import org.opendaylight.mdsal.binding.api.RpcService;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMService;
-import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
-
-public class BindingDOMRpcServiceAdapter extends AbstractBindingAdapter<DOMRpcService> implements RpcConsumerRegistry {
-
-    protected static final Factory<RpcConsumerRegistry> BUILDER_FACTORY = Builder::new;
-
-    private final LoadingCache<Class<? extends RpcService>, RpcServiceAdapter> proxies = CacheBuilder.newBuilder()
-            .weakKeys()
-            .build(new CacheLoader<Class<? extends RpcService>, RpcServiceAdapter>() {
-                @Override
-                public RpcServiceAdapter load(final Class<? extends RpcService> key) throws Exception {
-                    Preconditions.checkArgument(BindingReflections.isBindingClass(key));
-                    Preconditions.checkArgument(key.isInterface(), "Supplied RPC service type must be interface.");
-                    return new RpcServiceAdapter(key, getCodec(), getDelegate());
-                }
-            });
-
-    public BindingDOMRpcServiceAdapter(final DOMRpcService domService, final BindingToNormalizedNodeCodec codec) {
-        super(codec, domService);
+import org.opendaylight.yangtools.yang.binding.Rpc;
+
+@VisibleForTesting
+public final class BindingDOMRpcServiceAdapter
+        extends AbstractBindingLoadingAdapter<DOMRpcService, Class<?>, RpcAdapter> implements RpcService {
+    static final Factory<RpcService> BUILDER_FACTORY = Builder::new;
+
+    public BindingDOMRpcServiceAdapter(final AdapterContext adapterContext, final DOMRpcService domService) {
+        super(adapterContext, domService);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public <T extends RpcService> T getRpcService(final Class<T> rpcService) {
-        Preconditions.checkArgument(rpcService != null, "Rpc Service needs to be specied.");
-        return (T) proxies.getUnchecked(rpcService).getProxy();
+    public <T extends Rpc<?, ?>> T getRpc(final Class<T> rpcInterface) {
+        return rpcInterface.cast(getAdapter(requireNonNull(rpcInterface)).facade());
     }
 
-    private static final class Builder extends BindingDOMAdapterBuilder<RpcConsumerRegistry> {
-        @Override
-        protected RpcConsumerRegistry createInstance(final BindingToNormalizedNodeCodec codec,
-                final ClassToInstanceMap<DOMService> delegates) {
-            final DOMRpcService domRpc  = delegates.getInstance(DOMRpcService.class);
-            return new BindingDOMRpcServiceAdapter(domRpc  , codec);
+    @Override
+    RpcAdapter loadAdapter(final Class<?> key) {
+        checkArgument(BindingReflections.isBindingClass(key));
+        checkArgument(key.isInterface(), "Supplied RPC service type must be interface.");
+        if (Rpc.class.isAssignableFrom(key)) {
+            return new RpcAdapter(adapterContext(), getDelegate(), key.asSubclass(Rpc.class));
+        } else {
+            throw new IllegalStateException("Unhandled key " + key);
+        }
+    }
+
+    private static final class Builder extends BindingDOMAdapterBuilder<RpcService> {
+        Builder(final AdapterContext adapterContext) {
+            super(adapterContext);
         }
 
         @Override
         public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
             return ImmutableSet.of(DOMRpcService.class);
         }
+
+        @Override
+        protected RpcService createInstance(final ClassToInstanceMap<DOMService> delegates) {
+            return new BindingDOMRpcServiceAdapter(adapterContext(), delegates.getInstance(DOMRpcService.class));
+        }
     }
 }