From: Robert Varga Date: Mon, 1 Oct 2018 06:26:44 +0000 (+0200) Subject: Fix some raw types X-Git-Tag: v3.0.0~27 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6ea8b6d9ff00161af4a4792f4ca9746775ab5f84;p=mdsal.git Fix some raw types Add trivial parameterization to silence eclipse. Change-Id: I92642b35426f9582ff4578835c0c34146ced207a Signed-off-by: Robert Varga --- diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java index 3d9cd408d5..cb67a808d4 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMMountPointListenerAdapterTest.java @@ -28,12 +28,12 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public class BindingDOMMountPointListenerAdapterTest { - private BindingDOMMountPointListenerAdapter bindingDOMMountPointListenerAdapter; + private BindingDOMMountPointListenerAdapter bindingDOMMountPointListenerAdapter; private BindingToNormalizedNodeCodec codec; @Mock private MountPointListener listener; @Mock private DOMMountPointService mountPointService; - @Mock private ListenerRegistration listenerRegistration; + @Mock private ListenerRegistration listenerRegistration; @Before public void setUp() throws Exception { diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistrationTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistrationTest.java index 918bc33d38..221a701964 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistrationTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcAdapterRegistrationTest.java @@ -17,11 +17,11 @@ import org.opendaylight.yangtools.yang.binding.RpcService; public class BindingDOMRpcAdapterRegistrationTest { @Test - public void removeRegistration() throws Exception { - final DOMRpcImplementationRegistration registration = mock(DOMRpcImplementationRegistration.class); - final BindingDOMRpcAdapterRegistration bindingDOMRpcAdapterRegistration = + public void removeRegistration() { + final DOMRpcImplementationRegistration registration = mock(DOMRpcImplementationRegistration.class); + final BindingDOMRpcAdapterRegistration adapterReg = new BindingDOMRpcAdapterRegistration<>(mock(RpcService.class), registration); - bindingDOMRpcAdapterRegistration.removeRegistration(); + adapterReg.close(); verify(registration).close(); } } \ No newline at end of file diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistrationTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistrationTest.java index e5f8bc347b..f8f6d9b057 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistrationTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingRpcAdapterRegistrationTest.java @@ -16,16 +16,15 @@ import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration; import org.opendaylight.yangtools.yang.binding.RpcService; public class BindingRpcAdapterRegistrationTest { - @Test public void removeRegistrationTest() throws Exception { final RpcService rpcService = mock(RpcService.class); - final DOMRpcImplementationRegistration domRpcImplementationRegistration = + final DOMRpcImplementationRegistration domRpcImplementationRegistration = mock(DOMRpcImplementationRegistration.class); - final BindingRpcAdapterRegistration bindingRpcAdapterRegistration = + final BindingRpcAdapterRegistration bindingRpcAdapterRegistration = new BindingRpcAdapterRegistration<>(rpcService, domRpcImplementationRegistration); doNothing().when(domRpcImplementationRegistration).close(); - bindingRpcAdapterRegistration.removeRegistration(); + bindingRpcAdapterRegistration.close(); verify(domRpcImplementationRegistration).close(); } } \ No newline at end of file