Use generic definition of Native#loadLibrary

Author: Lyor Goldstein

CHANGES.md

@@ -25,6 +25,7 @@ Features
 * [#484](https://github.com/twall/jna/pull/484): Added `XFetchName` to `X11` interface - [@pinaf](https://github.com/pinaf).
 * [#554](https://github.com/java-native-access/jna/pull/554): Initial code for a few Unix 'libc' API(s) [@lgoldstein](https://github.com/lgoldstein)
 * [#552](https://github.com/java-native-access/jna/pull/552): Added `Module32FirstW` and `Module32NextW` to `com.sun.jna.platform.win32.Kernel32` (and helper to `com.sun.jna.platform.win32.Kernel32Util`) and `MODULEENTRY32W` structure to `com.sun.jna.platform.win32.Tlhelp32` - [@mlfreeman2](https://github.com/mlfreeman2).
+* [#564](https://github.com/java-native-access/jna/pull/564): Use generic definition of Native#loadLibrary [@lgoldstein](https://github.com/lgoldstein)
 
 Bug Fixes
 ---------

build.xml

@@ -56,8 +56,8 @@
   <buildnumber/>
   <!-- JNA library release version -->
   <property name="jna.major" value="4"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="1"/>
+  <property name="jna.minor" value="3"/>
+  <property name="jna.revision" value="0"/>
   <property name="jna.build" value="0"/> <!--${build.number}-->
   <condition property="version.suffix" value="" else="-SNAPSHOT">
     <or>

contrib/ntservice/src/jnacontrib/jna/Advapi32.java

@@ -25,8 +25,7 @@
  * @author TB
  */
 public interface Advapi32 extends StdCallLibrary {
-    Advapi32 INSTANCE = (Advapi32) Native.loadLibrary("Advapi32",
-            Advapi32.class, W32APIOptions.UNICODE_OPTIONS);
+    Advapi32 INSTANCE = Native.loadLibrary("Advapi32", Advapi32.class, W32APIOptions.UNICODE_OPTIONS);
 
     /*
      * SC_HANDLE WINAPI OpenSCManager( LPCTSTR lpMachineName, LPCTSTR

contrib/platform/src/com/sun/jna/platform/mac/Carbon.java

@@ -33,58 +33,62 @@
  * Date: 7/25/11
  */
 public interface Carbon extends Library {
-    public static Carbon INSTANCE = (Carbon) Native.loadLibrary("Carbon", Carbon.class);
+    Carbon INSTANCE = Native.loadLibrary("Carbon", Carbon.class);
 
-    public static final int cmdKey = 0x0100;
-    public static final int shiftKey = 0x0200;
-    public static final int optionKey = 0x0800;
-    public static final int controlKey = 0x1000;
+    int cmdKey = 0x0100;
+    int shiftKey = 0x0200;
+    int optionKey = 0x0800;
+    int controlKey = 0x1000;
 
     /**
      * Obtains the event target reference for the standard toolbox dispatcher
      * @return event dispatcher reference
      */
-    public Pointer GetEventDispatcherTarget();
+    Pointer GetEventDispatcherTarget();
 
     /**
      * Installs an event handler on a specified event target.
      */
-    public int InstallEventHandler(Pointer inTarget, EventHandlerProcPtr inHandler, int inNumTypes, EventTypeSpec[] inList, Pointer inUserData, PointerByReference outRef);
+    int InstallEventHandler(Pointer inTarget, EventHandlerProcPtr inHandler, int inNumTypes, EventTypeSpec[] inList, Pointer inUserData, PointerByReference outRef);
 
     /**
      * Registers a global hot key.
      */
-    public int RegisterEventHotKey(int inHotKeyCode, int inHotKeyModifiers, EventHotKeyID.ByValue inHotKeyID, Pointer inTarget, int inOptions, PointerByReference outRef);
+    int RegisterEventHotKey(int inHotKeyCode, int inHotKeyModifiers, EventHotKeyID.ByValue inHotKeyID, Pointer inTarget, int inOptions, PointerByReference outRef);
 
     /**
      * Obtains a parameter from the specified event.
      */
-    public int GetEventParameter(Pointer inEvent, int inName, int inDesiredType, Pointer outActualType, int inBufferSize, IntBuffer outActualSize, EventHotKeyID outData);
+    int GetEventParameter(Pointer inEvent, int inName, int inDesiredType, Pointer outActualType, int inBufferSize, IntBuffer outActualSize, EventHotKeyID outData);
 
     /**
      * Removes the specified event handler
      */
-    public int RemoveEventHandler(Pointer inHandlerRef);
+    int RemoveEventHandler(Pointer inHandlerRef);
 
     /**
      * Unregisters a global hot key.
      */
-    public int UnregisterEventHotKey(Pointer inHotKey);
+    int UnregisterEventHotKey(Pointer inHotKey);
 
     public class EventTypeSpec extends Structure {
         public int eventClass;
         public int eventKind;
-        protected List getFieldOrder() {
-            return Arrays.asList(new String[] { "eventClass", "eventKind" }); }
+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList("eventClass", "eventKind");
+        }
     }
 
     public static class EventHotKeyID extends Structure {
         public int signature;
         public int id;
 
         public static class ByValue extends EventHotKeyID implements Structure.ByValue { }
-        protected List getFieldOrder() {
-            return Arrays.asList(new String[] { "signature", "id" }); }
+        @Override
+        protected List<String> getFieldOrder() {
+            return Arrays.asList("signature", "id");
+        }
     }
 
     public static interface EventHandlerProcPtr extends Callback {

contrib/platform/src/com/sun/jna/platform/mac/SystemB.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Daniel Widdis 
+ * Copyright (c) 2015 Daniel Widdis
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -33,46 +33,47 @@
  */
 public interface SystemB extends Library {
 
-    public static SystemB INSTANCE = (SystemB) Native.loadLibrary("System",
-                                                                  SystemB.class);
+    SystemB INSTANCE = Native.loadLibrary("System", SystemB.class);
 
     // host_statistics()
-    static int HOST_LOAD_INFO = 1;// System loading stats
-    static int HOST_VM_INFO = 2; // Virtual memory stats
-    static int HOST_CPU_LOAD_INFO = 3;// CPU load stats
+    int HOST_LOAD_INFO = 1;// System loading stats
+    int HOST_VM_INFO = 2; // Virtual memory stats
+    int HOST_CPU_LOAD_INFO = 3;// CPU load stats
 
     // host_statistics64()
-    static int HOST_VM_INFO64 = 4; // 64-bit virtual memory stats
+    int HOST_VM_INFO64 = 4; // 64-bit virtual memory stats
 
     // host_cpu_load_info()
-    static int CPU_STATE_MAX = 4;
-    static int CPU_STATE_USER = 0;
-    static int CPU_STATE_SYSTEM = 1;
-    static int CPU_STATE_IDLE = 2;
-    static int CPU_STATE_NICE = 3;
+    int CPU_STATE_MAX = 4;
+    int CPU_STATE_USER = 0;
+    int CPU_STATE_SYSTEM = 1;
+    int CPU_STATE_IDLE = 2;
+    int CPU_STATE_NICE = 3;
 
     // host_processor_info() flavor
-    static int PROCESSOR_BASIC_INFO = 1;
-    static int PROCESSOR_CPU_LOAD_INFO = 2;
+    int PROCESSOR_BASIC_INFO = 1;
+    int PROCESSOR_CPU_LOAD_INFO = 2;
 
     // Data size
-    static int UINT64_SIZE = Native.getNativeSize(long.class);
-    static int INT_SIZE = Native.getNativeSize(int.class);
+    int UINT64_SIZE = Native.getNativeSize(long.class);
+    int INT_SIZE = Native.getNativeSize(int.class);
 
     public static class HostCpuLoadInfo extends Structure {
         public int cpu_ticks[] = new int[CPU_STATE_MAX];
-		
+
+        @Override
         protected List<String> getFieldOrder() {
-            return Arrays.asList(new String[] { "cpu_ticks" });
+            return Arrays.asList("cpu_ticks");
         }
     }
 
     public static class HostLoadInfo extends Structure {
         public int[] avenrun = new int[3]; // scaled by LOAD_SCALE
         public int[] mach_factor = new int[3]; // scaled by LOAD_SCALE
-		
+
+        @Override
         protected List<String> getFieldOrder() {
-            return Arrays.asList(new String[] { "avenrun", "mach_factor" });
+            return Arrays.asList("avenrun", "mach_factor");
         }
     }
 
@@ -94,12 +95,13 @@ public static class VMStatistics extends Structure {
         // # of pages speculative (included in free_count)
         public int speculative_count;
 
+        @Override
         protected List<String> getFieldOrder() {
-            return Arrays.asList(new String[] { "free_count", "active_count",
-                                                "inactive_count", "wire_count", "zero_fill_count",
-                                                "reactivations", "pageins", "pageouts", "faults",
-                                                "cow_faults", "lookups", "hits", "purgeable_count",
-                                                "purges", "speculative_count" });
+            return Arrays.asList("free_count", "active_count",
+                                 "inactive_count", "wire_count", "zero_fill_count",
+                                 "reactivations", "pageins", "pageouts", "faults",
+                                 "cow_faults", "lookups", "hits", "purgeable_count",
+                                 "purges", "speculative_count");
         }
     }
 
@@ -137,34 +139,34 @@ public static class VMStatistics64 extends Structure {
 
         @Override
         protected List<String> getFieldOrder() {
-            return Arrays.asList(new String[] { "free_count", "active_count", 
-                                                "inactive_count", "wire_count", 
-                                                "zero_fill_count", "reactivations",
-                                                "pageins", "pageouts",
-                                                "faults", "cow_faults",
-                                                "lookups", "hits",
-                                                "purges",
-                                                "purgeable_count", "speculative_count", 
-                                                "decompressions", "compressions",
-                                                "swapins", "swapouts",
-                                                "compressor_page_count", "throttled_count",
-                                                "external_page_count", "internal_page_count",
-                                                "total_uncompressed_pages_in_compressor" });
+            return Arrays.asList("free_count", "active_count",
+                                 "inactive_count", "wire_count",
+                                 "zero_fill_count", "reactivations",
+                                 "pageins", "pageouts",
+                                 "faults", "cow_faults",
+                                 "lookups", "hits",
+                                 "purges",
+                                 "purgeable_count", "speculative_count",
+                                 "decompressions", "compressions",
+                                 "swapins", "swapouts",
+                                 "compressor_page_count", "throttled_count",
+                                 "external_page_count", "internal_page_count",
+                                 "total_uncompressed_pages_in_compressor");
         }
     }
 
     /**
      * The mach_host_self system call returns the calling thread's host name
      * port. It has an effect equivalent to receiving a send right for the host
      * port.
-     * 
+     *
      * @return the host's name port
      */
     int mach_host_self();
 
     /**
      * The host_page_size function returns the page size for the given host.
-     * 
+     *
      * @param machPort
      *            The name (or control) port for the host for which the page
      *            size is desired.
@@ -177,7 +179,7 @@ protected List<String> getFieldOrder() {
     /**
      * The host_statistics function returns scheduling and virtual memory
      * statistics concerning the host as specified by hostStat.
-     * 
+     *
      * @param machPort
      *            The control port for the host for which information is to be
      *            obtained.
@@ -191,13 +193,12 @@ protected List<String> getFieldOrder() {
      *            returned (in natural-sized units).
      * @return 0 on success; sets errno on failure
      */
-    int host_statistics(int machPort, int hostStat, Structure stats,
-			IntByReference count);
+    int host_statistics(int machPort, int hostStat, Structure stats, IntByReference count);
 
     /**
      * The host_statistics64 function returns 64-bit virtual memory statistics
      * concerning the host as specified by hostStat.
-     * 
+     *
      * @param machPort
      *            The control port for the host for which information is to be
      *            obtained.
@@ -210,17 +211,16 @@ int host_statistics(int machPort, int hostStat, Structure stats,
      *            returned (in natural-sized units).
      * @return 0 on success; sets errno on failure
      */
-    int host_statistics64(int machPort, int hostStat, Structure stats,
-                          IntByReference count);
+    int host_statistics64(int machPort, int hostStat, Structure stats, IntByReference count);
 
     /**
      * The sysctl() function retrieves system information and allows processes
      * with appropriate privileges to set system information. The information
      * available from sysctl() consists of integers, strings, and tables.
-     * 
+     *
      * The state is described using a "Management Information Base" (MIB) style
      * name, listed in name, which is a namelen length array of integers.
-     * 
+     *
      * The information is copied into the buffer specified by oldp. The size of
      * the buffer is given by the location specified by oldlenp before the call,
      * and that location gives the amount of data copied after a successful call
@@ -229,18 +229,18 @@ int host_statistics64(int machPort, int hostStat, Structure stats,
      * call supplies as much data as fits in the buffer provided and returns
      * with the error code ENOMEM. If the old value is not desired, oldp and
      * oldlenp should be set to NULL.
-     * 
+     *
      * The size of the available data can be determined by calling sysctl() with
      * the NULL argument for oldp. The size of the available data will be
      * returned in the location pointed to by oldlenp. For some operations, the
      * amount of space may change often. For these operations, the system
      * attempts to round up so that the returned size is large enough for a call
      * to return the data shortly thereafter.
-     * 
+     *
      * To set a new value, newp is set to point to a buffer of length newlen
      * from which the requested value is to be taken. If a new value is not to
      * be set, newp should be set to NULL and newlen set to 0.
-     * 
+     *
      * @param name
      *            MIB array of integers
      * @param namelen
@@ -262,7 +262,7 @@ int sysctl(int[] name, int namelen, Pointer oldp, IntByReference oldlenp,
      * The sysctlbyname() function accepts an ASCII representation of the name
      * and internally looks up the integer name vector. Apart from that, it
      * behaves the same as the standard sysctl() function.
-     * 
+     *
      * @param name
      *            ASCII representation of the MIB name
      * @param oldp
@@ -290,15 +290,15 @@ int sysctlbyname(String name, Pointer oldp, IntByReference oldlenp,
      * to repeatedly request the same variable (the sysctl() function runs in
      * about a third the time as the same request made via the sysctlbyname()
      * function).
-     * 
+     *
      * The number of elements in the mib array can be determined by calling
      * sysctlnametomib() with the NULL argument for mibp.
-     * 
+     *
      * The sysctlnametomib() function is also useful for fetching mib prefixes.
      * If size on input is greater than the number of elements written, the
      * array still contains the additional elements which may be written
      * programmatically.
-     * 
+     *
      * @param name
      *            ASCII representation of the name
      * @param mibp
@@ -309,10 +309,10 @@ int sysctlbyname(String name, Pointer oldp, IntByReference oldlenp,
      * @return 0 on success; sets errno on failure
      */
     int sysctlnametomib(String name, Pointer mibp, IntByReference size);
-    
+
     /**
      * The host_processor_info function returns information about processors.
-     * 
+     *
      * @param machPort
      *            The control port for the host for which information is to be
      *            obtained.

contrib/platform/src/com/sun/jna/platform/mac/XAttr.java

@@ -23,7 +23,7 @@
 interface XAttr extends Library {
 
 	// load from current image
-	XAttr INSTANCE = (XAttr) Native.loadLibrary(null, XAttr.class);
+	XAttr INSTANCE = Native.loadLibrary(null, XAttr.class);
 
 	// see /usr/include/sys/xattr.h
 	int XATTR_NOFOLLOW = 0x0001;

contrib/platform/src/com/sun/jna/platform/unix/LibC.java

@@ -21,5 +21,5 @@
  */
 public interface LibC extends LibCAPI, Library {
     String NAME = "c";
-    LibC INSTANCE = (LibC) Native.loadLibrary(NAME, LibC.class);
+    LibC INSTANCE = Native.loadLibrary(NAME, LibC.class);
 }