Improve

Author: ice1000

circle.yml

@@ -5,10 +5,9 @@ machine:
 
 dependencies:
  pre:
- - chmod a+x gradlew
  - cmake jni
  override:
- - ./gradlew dependencies
+ - bash gradlew dependencies
  - cmake --build . --target all -- -j 8
 #
 
@@ -17,7 +16,7 @@ test:
  - if [ -e ./gradlew ]; then ./gradlew jacocoTestReport;else gradle jacocoTestReport;fi
  - bash <(curl -s https://codecov.io/bash)
  override:
- - ./gradlew check --info
+ - bash gradlew check --info
 #
 
 general:

src/main/java/org/algo4j/util/Loader.java

@@ -1,7 +1,5 @@
 package org.algo4j.util;
 
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
@@ -14,7 +12,7 @@
  */
 @SuppressWarnings("WeakerAccess")
 public final class Loader {
-public final static String JNI_LIB_NAME;
+public final static @NotNull String JNI_LIB_NAME;
 private static boolean loaded = false;
 
 /*
@@ -25,24 +23,9 @@ public final class Loader {
 loadJni();
 }
 
-@NotNull
-@Contract(pure = true)
-private static String libraryName(@NonNls @NotNull String libName) {
-String ___ = System.getProperty("os.name");
-String fileName;
-if (___.contains("Linux"))
-fileName = libName + ".so";
-else if (___.contains("Windows"))
-fileName = libName + ".dll";
-else // if (___.contains("OSX"))
-fileName = libName + ".dylib";
-//	else fileName = libName;
-return new File(fileName).getAbsolutePath();
-}
-
 public static void loadJni() {
 if (!loaded) {
-System.load(libraryName(JNI_LIB_NAME));
+System.load(new File(System.mapLibraryName(JNI_LIB_NAME)).getAbsolutePath());
 loaded = true;
 }
 }