Clean up RpcServiceAdapter

Deal with the proxy naming conflict, removing a CheckStyle suppression.
Also use local variable type inference to shorten things a bit.

JIRA: MDSAL-777
Change-Id: Ie0cebd4dac3c714060af5683671b1cafd164f00e
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 8192b6610a638508226cea1beb1a98f93e6de429..f0d97a5475cbbf1cfbc9a0d4929095c56cc337e6 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
@@ -33,7 +33,7 @@ public final class BindingDOMRpcServiceAdapter
 
     @Override
     public <T extends RpcService> T getRpcService(final Class<T> rpcService) {
-        return rpcService.cast(getAdapter(requireNonNull(rpcService)).getProxy());
+        return rpcService.cast(getAdapter(requireNonNull(rpcService)).facade());
     }
 
     @Override

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java
index 28099e3142039faa815d7f0aa0e0e30b0fadc3d8..62e39cf17d2f8ff8fddaf7424b523b3b59a5d3f5 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapter.java
@@ -9,25 +9,21 @@ package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.Map.Entry;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.RpcService;
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
 
 class RpcServiceAdapter implements InvocationHandler {
     private final ImmutableMap<Method, RpcInvocationStrategy> rpcNames;
     private final @NonNull Class<? extends RpcService> type;
     private final @NonNull AdapterContext adapterContext;
     private final @NonNull DOMRpcService delegate;
-    private final RpcService proxy;
+    private final @NonNull RpcService facade;
 
     RpcServiceAdapter(final Class<? extends RpcService> type, final AdapterContext adapterContext,
             final DOMRpcService domService) {
@@ -35,15 +31,14 @@ class RpcServiceAdapter implements InvocationHandler {
         this.adapterContext = requireNonNull(adapterContext);
         delegate = requireNonNull(domService);
 
-        final ImmutableBiMap<Method, RpcDefinition> methods = adapterContext.currentSerializer()
-                .getRpcMethodToSchema(type);
-        final Builder<Method, RpcInvocationStrategy> rpcBuilder = ImmutableMap.builderWithExpectedSize(methods.size());
-        for (final Entry<Method, RpcDefinition> rpc : methods.entrySet()) {
-            rpcBuilder.put(rpc.getKey(),
-                RpcInvocationStrategy.of(this, rpc.getKey(), rpc.getValue().asEffectiveStatement()));
+        final var methods = adapterContext.currentSerializer().getRpcMethodToSchema(type);
+        final var rpcBuilder = ImmutableMap.<Method, RpcInvocationStrategy>builderWithExpectedSize(methods.size());
+        for (var rpc : methods.entrySet()) {
+            final var method = rpc.getKey();
+            rpcBuilder.put(method, RpcInvocationStrategy.of(this, method, rpc.getValue().asEffectiveStatement()));
         }
         rpcNames = rpcBuilder.build();
-        proxy = (RpcService) Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, this);
+        facade = (RpcService) Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, this);
     }
 
     final @NonNull CurrentAdapterSerializer currentSerializer() {
@@ -54,19 +49,18 @@ class RpcServiceAdapter implements InvocationHandler {
         return delegate;
     }
 
-    RpcService getProxy() {
-        return proxy;
+    final @NonNull RpcService facade() {
+        return facade;
     }
 
     @Override
-    @SuppressWarnings("checkstyle:hiddenField")
     public Object invoke(final Object proxy, final Method method, final Object[] args) {
-        final RpcInvocationStrategy rpc = rpcNames.get(method);
-        if (rpc != null) {
+        final var strategy = rpcNames.get(method);
+        if (strategy != null) {
             if (args.length != 1) {
                 throw new IllegalArgumentException("Input must be provided.");
             }
-            return rpc.invoke((DataObject) requireNonNull(args[0]));
+            return strategy.invoke((DataObject) requireNonNull(args[0]));
         }
 
         switch (method.getName()) {

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal739Test.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal739Test.java
index e16ff619cf33e61a7f146a10b9dc2549648ee2c4..02020367191e349f142becc2be164a30abbbb730 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal739Test.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal739Test.java
@@ -66,7 +66,7 @@ public class Mdsal739Test {
         final var captor = ArgumentCaptor.forClass(ContainerNode.class);
         doReturn(Futures.immediateFailedFuture(new Throwable())).when(rpcService).invokeRpc(any(), captor.capture());
         final var adapter = (OpendaylightTestRpcServiceService) new RpcServiceAdapter(
-            OpendaylightTestRpcServiceService.class, adapterContext, rpcService).getProxy();
+            OpendaylightTestRpcServiceService.class, adapterContext, rpcService).facade();
 
         final var result = adapter.rockTheHouse(new RockTheHouseInputBuilder().setZipCode("12345").build());
         assertThrows(ExecutionException.class, () -> Futures.getDone(result));

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapterTest.java
index 2e995ec33a4fb777ae975085b7fc14d7883c2d3f..b1dbdcd6e07c30045af5342fd86cbafc2ec15f04 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapterTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/RpcServiceAdapterTest.java
@@ -39,27 +39,27 @@ public class RpcServiceAdapterTest {
                 bindingTestContext.getCodec(), bindingTestContext.getDomRpcInvoker());
 
         Method method = TestRpcService.class.getMethod("equals", Object.class);
-        assertTrue((boolean) rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(), method,
-                new Object[]{ rpcServiceAdapter.getProxy() }));
-        assertFalse((boolean) rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(), method,
+        assertTrue((boolean) rpcServiceAdapter.invoke(rpcServiceAdapter.facade(), method,
+                new Object[]{ rpcServiceAdapter.facade() }));
+        assertFalse((boolean) rpcServiceAdapter.invoke(rpcServiceAdapter.facade(), method,
                 new Object[]{ new Object() }));
 
         method = TestRpcService.class.getMethod("hashCode");
-        assertEquals(rpcServiceAdapter.getProxy().hashCode(), rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(),
+        assertEquals(rpcServiceAdapter.facade().hashCode(), rpcServiceAdapter.invoke(rpcServiceAdapter.facade(),
                 method, new Object[]{ }));
 
         method = TestRpcService.class.getMethod("toString");
-        assertEquals(rpcServiceAdapter.getProxy().toString(), rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(),
+        assertEquals(rpcServiceAdapter.facade().toString(), rpcServiceAdapter.invoke(rpcServiceAdapter.facade(),
                 method, new Object[]{ }));
 
         method = OpendaylightTestRpcServiceService.class.getMethod("rockTheHouse", RockTheHouseInput.class);
-        assertNotNull(rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(), method,
+        assertNotNull(rpcServiceAdapter.invoke(rpcServiceAdapter.facade(), method,
             new Object[]{ new RockTheHouseInputBuilder().build() }));
 
         rpcServiceAdapter = new RpcServiceAdapter(OpendaylightTestRoutedRpcService.class,
                 bindingTestContext.getCodec(), bindingTestContext.getDomRpcInvoker());
         method = OpendaylightTestRoutedRpcService.class.getMethod("routedSimpleRoute", RoutedSimpleRouteInput.class);
-        assertNotNull(rpcServiceAdapter.invoke(rpcServiceAdapter.getProxy(), method,
+        assertNotNull(rpcServiceAdapter.invoke(rpcServiceAdapter.facade(), method,
                 new Object[]{ new RoutedSimpleRouteInputBuilder().build() }));
     }