Changing Class<T> to Class<T extends Library> for Native.loadLibrary

src/com/sun/jna/Native.java

@@ -503,7 +503,7 @@ public static List<String> toStringList(char[] buf, int offset, int len) {
      * @throws UnsatisfiedLinkError if the library cannot be found or
      * dependent libraries are missing.
      */
-    public static <T> T loadLibrary(Class<T> interfaceClass) {
+    public static <T extends Library> T loadLibrary(Class<T> interfaceClass) {
         return loadLibrary(null, interfaceClass);
     }
 
@@ -522,7 +522,7 @@ public static <T> T loadLibrary(Class<T> interfaceClass) {
      * dependent libraries are missing.
      * @see #loadLibrary(String, Class, Map)
      */
-    public static <T> T loadLibrary(Class<T> interfaceClass, Map<String, ?> options) {
+    public static <T extends Library> T loadLibrary(Class<T> interfaceClass, Map<String, ?> options) {
         return loadLibrary(null, interfaceClass, options);
     }
 
@@ -540,7 +540,7 @@ public static <T> T loadLibrary(Class<T> interfaceClass, Map<String, ?> options)
      * dependent libraries are missing.
      * @see #loadLibrary(String, Class, Map)
      */
-    public static <T> T loadLibrary(String name, Class<T> interfaceClass) {
+    public static <T extends Library> T loadLibrary(String name, Class<T> interfaceClass) {
         return loadLibrary(name, interfaceClass, Collections.<String, Object>emptyMap());
     }
 
@@ -560,8 +560,9 @@ public static <T> T loadLibrary(String name, Class<T> interfaceClass) {
      * @throws UnsatisfiedLinkError if the library cannot be found or
      * dependent libraries are missing.
      */
-    public static <T> T loadLibrary(String name, Class<T> interfaceClass, Map<String, ?> options) {
+    public static <T extends Library> T loadLibrary(String name, Class<T> interfaceClass, Map<String, ?> options) {
         if (!Library.class.isAssignableFrom(interfaceClass)) {
+            // Maybe still possible if the caller is not using generics?
             throw new IllegalArgumentException("Interface (" + interfaceClass.getSimpleName() + ")"
                     + " of library=" + name + " does not extend " + Library.class.getSimpleName());
         }

test/com/sun/jna/NativeTest.java

@@ -61,7 +61,7 @@ public void testLoadLibraryMethods() throws Exception {
                 Method m = Native.class.getMethod("loadLibrary", paramTypes);
                 Class<?> returnType = m.getReturnType();
                 signature.append(Native.getSignature(returnType));
-                assertSame("Mismatched return type for signature=" + signature, Object.class, returnType);
+                assertSame("Mismatched return type for signature=" + signature, Library.class, returnType);
 //                System.out.println("===>" + m.getName() + ": " + signature);
             } catch(NoSuchMethodError err) {
                 fail("No method for signature=" + signature);