[wpiutil] Remove RuntimeDetector and simplify RuntimeLoader (#6600)

wpilibsuite · May 24, 2024 · 6220c6b · 6220c6b
1 parent 72a6d22
commit 6220c6b
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 474 deletions.
diff --git a/apriltag/src/main/java/edu/wpi/first/apriltag/jni/AprilTagJNI.java b/apriltag/src/main/java/edu/wpi/first/apriltag/jni/AprilTagJNI.java
@@ -17,8 +17,6 @@
 public class AprilTagJNI {
   static boolean libraryLoaded = false;
 
-  static RuntimeLoader<AprilTagJNI> loader = null;
-
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
     private static AtomicBoolean extractOnStaticLoad = new AtomicBoolean(true);
@@ -48,10 +46,7 @@ private Helper() {}
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "apriltagjni", RuntimeLoader.getDefaultExtractionRoot(), AprilTagJNI.class);
-        loader.loadLibrary();
+        RuntimeLoader.loadLibrary("apriltagjni");
       } catch (IOException ex) {
         ex.printStackTrace();
         System.exit(1);

diff --git a/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagDetectorTest.java b/apriltag/src/test/java/edu/wpi/first/apriltag/AprilTagDetectorTest.java
@@ -29,15 +29,10 @@ class AprilTagDetectorTest {
   @SuppressWarnings("MemberName")
   AprilTagDetector detector;
 
-  static RuntimeLoader<Core> loader;
-
   @BeforeAll
   static void beforeAll() {
     try {
-      loader =
-          new RuntimeLoader<>(
-              Core.NATIVE_LIBRARY_NAME, RuntimeLoader.getDefaultExtractionRoot(), Core.class);
-      loader.loadLibrary();
+      RuntimeLoader.loadLibrary(Core.NATIVE_LIBRARY_NAME);
     } catch (IOException ex) {
       fail(ex);
     }

diff --git a/cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java b/cscore/src/dev/java/edu/wpi/first/cscore/DevMain.java
@@ -4,13 +4,13 @@
 
 package edu.wpi.first.cscore;
 
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main method. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
     System.out.println(CameraServerJNI.getHostname());
   }
 

diff --git a/cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java b/cscore/src/main/java/edu/wpi/first/cscore/CameraServerJNI.java
@@ -15,8 +15,6 @@
 public class CameraServerJNI {
   static boolean libraryLoaded = false;
 
-  static RuntimeLoader<CameraServerJNI> loader = null;
-
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
     private static AtomicBoolean extractOnStaticLoad = new AtomicBoolean(true);
@@ -46,10 +44,7 @@ private Helper() {}
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "cscorejni", RuntimeLoader.getDefaultExtractionRoot(), CameraServerJNI.class);
-        loader.loadLibrary();
+        RuntimeLoader.loadLibrary("cscorejni");
       } catch (IOException ex) {
         ex.printStackTrace();
         System.exit(1);
@@ -67,10 +62,7 @@ public static synchronized void forceLoad() throws IOException {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>(
-            "cscorejni", RuntimeLoader.getDefaultExtractionRoot(), CameraServerJNI.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary("cscorejni");
     libraryLoaded = true;
   }
 

diff --git a/cscore/src/main/java/edu/wpi/first/cscore/OpenCvLoader.java b/cscore/src/main/java/edu/wpi/first/cscore/OpenCvLoader.java
@@ -14,9 +14,6 @@ public final class OpenCvLoader {
   @SuppressWarnings("PMD.MutableStaticState")
   static boolean libraryLoaded;
 
-  @SuppressWarnings("PMD.MutableStaticState")
-  static RuntimeLoader<Core> loader;
-
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
     private static AtomicBoolean extractOnStaticLoad = new AtomicBoolean(true);
@@ -44,12 +41,9 @@ private Helper() {}
   }
 
   static {
-    String opencvName = Core.NATIVE_LIBRARY_NAME;
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(opencvName, RuntimeLoader.getDefaultExtractionRoot(), Core.class);
-        loader.loadLibraryHashed();
+        RuntimeLoader.loadLibrary(Core.NATIVE_LIBRARY_NAME);
       } catch (IOException ex) {
         ex.printStackTrace();
         System.exit(1);
@@ -76,10 +70,7 @@ public static synchronized void forceLoad() throws IOException {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>(
-            Core.NATIVE_LIBRARY_NAME, RuntimeLoader.getDefaultExtractionRoot(), Core.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary(Core.NATIVE_LIBRARY_NAME);
     libraryLoaded = true;
   }
 

diff --git a/hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java b/hal/src/main/java/edu/wpi/first/hal/JNIWrapper.java
@@ -11,7 +11,6 @@
 /** Base class for all JNI wrappers. */
 public class JNIWrapper {
   static boolean libraryLoaded = false;
-  static RuntimeLoader<JNIWrapper> loader = null;
 
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
@@ -42,11 +41,8 @@ private Helper() {}
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "wpiHaljni", RuntimeLoader.getDefaultExtractionRoot(), JNIWrapper.class);
-        loader.loadLibrary();
-      } catch (IOException ex) {
+        RuntimeLoader.loadLibrary("wpiHaljni");
+      } catch (Exception ex) {
         ex.printStackTrace();
         System.exit(1);
       }
@@ -63,10 +59,7 @@ public static synchronized void forceLoad() throws IOException {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>(
-            "wpiHaljni", RuntimeLoader.getDefaultExtractionRoot(), JNIWrapper.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary("wpiHaljni");
     libraryLoaded = true;
   }
 

diff --git a/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java b/ntcore/src/dev/java/edu/wpi/first/ntcore/DevMain.java
@@ -5,13 +5,13 @@
 package edu.wpi.first.ntcore;
 
 import edu.wpi.first.networktables.NetworkTablesJNI;
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main method. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
     NetworkTablesJNI.flush(NetworkTablesJNI.getDefaultInstance());
   }
 

diff --git a/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja b/ntcore/src/generate/main/java/NetworkTablesJNI.java.jinja
@@ -17,7 +17,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 /** NetworkTables JNI. */
 public final class NetworkTablesJNI {
   static boolean libraryLoaded = false;
-  static RuntimeLoader<NetworkTablesJNI> loader = null;
 
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
@@ -48,10 +47,7 @@ public final class NetworkTablesJNI {
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "ntcorejni", RuntimeLoader.getDefaultExtractionRoot(), NetworkTablesJNI.class);
-        loader.loadLibrary();
+        RuntimeLoader.loadLibrary("ntcorejni");
       } catch (IOException ex) {
         ex.printStackTrace();
         System.exit(1);
@@ -69,10 +65,7 @@ public final class NetworkTablesJNI {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>(
-            "ntcorejni", RuntimeLoader.getDefaultExtractionRoot(), NetworkTablesJNI.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary("ntcorejni");
     libraryLoaded = true;
   }
 

diff --git a/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java b/ntcore/src/generated/main/java/edu/wpi/first/networktables/NetworkTablesJNI.java
diff --git a/romiVendordep/src/dev/java/edu/wpi/first/wpilibj/romi/DevMain.java b/romiVendordep/src/dev/java/edu/wpi/first/wpilibj/romi/DevMain.java
@@ -6,13 +6,13 @@
 
 import edu.wpi.first.hal.HALUtil;
 import edu.wpi.first.networktables.NetworkTablesJNI;
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
     System.out.println(NetworkTablesJNI.now());
     System.out.println(HALUtil.getHALRuntimeType());
   }

diff --git a/styleguide/spotbugs-exclude.xml b/styleguide/spotbugs-exclude.xml
@@ -86,10 +86,6 @@
     <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
     <Source name="CombinedRuntimeLoader.java" />
   </Match>
-  <Match>
-    <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
-    <Source name="RuntimeLoader.java" />
-  </Match>
   <Match>
     <Bug pattern="SF_SWITCH_FALLTHROUGH" />
     <Source name="CameraServer.java" />

diff --git a/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java b/wpilibNewCommands/src/dev/java/edu/wpi/first/wpilibj2/commands/DevMain.java
@@ -6,13 +6,13 @@
 
 import edu.wpi.first.hal.HALUtil;
 import edu.wpi.first.networktables.NetworkTablesJNI;
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
     System.out.println(NetworkTablesJNI.now());
     System.out.println(HALUtil.getHALRuntimeType());
   }

diff --git a/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java b/wpilibj/src/dev/java/edu/wpi/first/wpilibj/DevMain.java
@@ -6,13 +6,13 @@
 
 import edu.wpi.first.hal.HALUtil;
 import edu.wpi.first.networktables.NetworkTablesJNI;
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
     System.out.println(NetworkTablesJNI.now());
     System.out.println(HALUtil.getHALRuntimeType());
   }

diff --git a/wpimath/src/main/java/edu/wpi/first/math/WPIMathJNI.java b/wpimath/src/main/java/edu/wpi/first/math/WPIMathJNI.java
@@ -11,16 +11,12 @@
 /** WPIMath JNI. */
 public final class WPIMathJNI {
   static boolean libraryLoaded = false;
-  static RuntimeLoader<WPIMathJNI> loader = null;
 
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "wpimathjni", RuntimeLoader.getDefaultExtractionRoot(), WPIMathJNI.class);
-        loader.loadLibrary();
-      } catch (IOException ex) {
+        RuntimeLoader.loadLibrary("wpimathjni");
+      } catch (Exception ex) {
         ex.printStackTrace();
         System.exit(1);
       }
@@ -37,10 +33,7 @@ public static synchronized void forceLoad() throws IOException {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>(
-            "wpimathjni", RuntimeLoader.getDefaultExtractionRoot(), WPIMathJNI.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary("wpimathjni");
     libraryLoaded = true;
   }
 

diff --git a/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java b/wpinet/src/dev/java/edu/wpi/first/net/DevMain.java
@@ -4,13 +4,13 @@
 
 package edu.wpi.first.net;
 
-import edu.wpi.first.util.RuntimeDetector;
+import edu.wpi.first.util.CombinedRuntimeLoader;
 
 public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
   }
 
   private DevMain() {}

diff --git a/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java b/wpinet/src/main/java/edu/wpi/first/net/WPINetJNI.java
@@ -11,7 +11,6 @@
 /** WPINet JNI. */
 public class WPINetJNI {
   static boolean libraryLoaded = false;
-  static RuntimeLoader<WPINetJNI> loader = null;
 
   /** Sets whether JNI should be loaded in the static block. */
   public static class Helper {
@@ -42,11 +41,8 @@ private Helper() {}
   static {
     if (Helper.getExtractOnStaticLoad()) {
       try {
-        loader =
-            new RuntimeLoader<>(
-                "wpinetjni", RuntimeLoader.getDefaultExtractionRoot(), WPINetJNI.class);
-        loader.loadLibrary();
-      } catch (IOException ex) {
+        RuntimeLoader.loadLibrary("wpinetjni");
+      } catch (Exception ex) {
         ex.printStackTrace();
         System.exit(1);
       }
@@ -63,9 +59,7 @@ public static synchronized void forceLoad() throws IOException {
     if (libraryLoaded) {
       return;
     }
-    loader =
-        new RuntimeLoader<>("wpinetjni", RuntimeLoader.getDefaultExtractionRoot(), WPINetJNI.class);
-    loader.loadLibrary();
+    RuntimeLoader.loadLibrary("wpinetjni");
     libraryLoaded = true;
   }
 

diff --git a/wpiutil/src/dev/java/edu/wpi/first/util/DevMain.java b/wpiutil/src/dev/java/edu/wpi/first/util/DevMain.java
@@ -8,7 +8,7 @@ public final class DevMain {
   /** Main entry point. */
   public static void main(String[] args) {
     System.out.println("Hello World!");
-    System.out.println(RuntimeDetector.getPlatformPath());
+    System.out.println(CombinedRuntimeLoader.getPlatformPath());
   }
 
   private DevMain() {}