Clean up utility method

We have introduced a nasty bit of code, clean it back up again.

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

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
index 56745ed61e02bcde5fb3a14999114377eb73c404..48eba6c85fb87a0b4b7ba9779016b38bffd5735e 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
@@ -695,10 +695,9 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
         return getMountPointService(mountPoint, DOMActionService.class);
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private static <T extends DOMService> T getMountPointService(final DOMMountPoint mountPoint,
-            final Class<T> serviceClass) {
-        return (T) mountPoint.getService((Class) serviceClass).orElseThrow();
+    private static <T extends DOMService<T, E>, E extends DOMService.Extension<T, E>> T getMountPointService(
+            final DOMMountPoint mountPoint, final Class<T> serviceClass) {
+        return mountPoint.getService(serviceClass).orElseThrow();
     }
 
     private DOMMountPoint awaitMountPoint(final DOMMountPointService mountPointService) {