Capture collection type class

Improve CodeHelpers safety by not losing Class type.

Change-Id: I585afdbda3328b018764627631dff7c8df372c01
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 2840f8a13a244834a831614d96a1411b3add3286)
(cherry picked from commit 6b33f21070f1fef0d42575290b439d52a4e74233)

diff --git a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
index a62a586c690ba419c3713d6fdb0684788e5def77..5430c27dbf6fe4ef72c7093f7a617aadb3731f29 100644 (file)
--- a/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
+++ b/binding/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/CodeHelpers.java
@@ -458,7 +458,7 @@ public final class CodeHelpers {
      * @throws NullPointerException if {@code requiredClass} or {@code fieldName} is {@code null}
      */
     @SuppressWarnings("unchecked")
-    public static <T> @Nullable List<T> checkListFieldCast(final @NonNull Class<?> requiredClass,
+    public static <T> @Nullable List<T> checkListFieldCast(final @NonNull Class<T> requiredClass,
             final @NonNull String fieldName, final @Nullable List<?> list) {
         checkCollectionField(requiredClass, fieldName, list);
         return (List<T>) list;
@@ -475,7 +475,7 @@ public final class CodeHelpers {
      * @throws NullPointerException if {@code requiredClass} or {@code fieldName} is {@code null}
      */
     @SuppressWarnings("unchecked")
-    public static <T> @Nullable Set<T> checkSetFieldCast(final @NonNull Class<?> requiredClass,
+    public static <T> @Nullable Set<T> checkSetFieldCast(final @NonNull Class<T> requiredClass,
             final @NonNull String fieldName, final @Nullable Set<?> set) {
         checkCollectionField(requiredClass, fieldName, set);
         return (Set<T>) set;