Remove ClassLoaderUtils.findFirstGenericArgumentTask()

This has a single caller, inline it there, eliminating a warning.

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

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java
index e3e7a2c692411e4cc7c568f1f319b33e02924393..1625504cf733365eb6e37d2ecc4899990d633832 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ClassLoaderUtils.java
@@ -242,20 +242,12 @@ public final class ClassLoaderUtils {
         }
     }
 
-    public static <S,G,P> Class<P> findFirstGenericArgument(final Class<S> scannedClass, final Class<G> genericType) {
-        return withClassLoader(scannedClass.getClassLoader(), findFirstGenericArgumentTask(scannedClass, genericType));
-    }
-
     @SuppressWarnings("unchecked")
-    private static <S, G, P> Supplier<Class<P>> findFirstGenericArgumentTask(final Class<S> scannedClass,
-            final Class<G> genericType) {
-        return () -> {
+    public static <S, G, P> Class<P> findFirstGenericArgument(final Class<S> scannedClass, final Class<G> genericType) {
+        return getWithClassLoader(scannedClass.getClassLoader(), () -> {
             final ParameterizedType augmentationGeneric = findParameterizedType(scannedClass, genericType);
-            if (augmentationGeneric != null) {
-                return (Class<P>) augmentationGeneric.getActualTypeArguments()[0];
-            }
-            return null;
-        };
+            return augmentationGeneric != null ? (Class<P>) augmentationGeneric.getActualTypeArguments()[0] : null;
+        });
     }
 
     // FIXME: 3.0.0: Document and return Optional