diff --git a/README.md b/README.md index 2c5db93..55a62c7 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ For a list of supported platforms, look for released ```jbrotli-native-*``` arti ##### Example of regular BrotliCompressor with custom dictionary ```java -NativeLoader.loadLibrary("brotli"); +BrotliLibraryLoader.loadBrotli(); byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes(); byte[] compressedBuf = new byte[2048]; @@ -95,7 +95,7 @@ int outLength = compressor.compress(Brotli.DEFAULT_PARAMETER, inBuf, compressedB ##### Example of BrotliStreamCompressor using default dictionary ```java -NativeLoader.loadLibrary("brotli"); +BrotliLibraryLoader.loadBrotli(); byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes(); boolean doFlush = true; diff --git a/jbrotli-native/darwin/build.sh b/jbrotli-native/darwin-x86-amd64/build.sh old mode 100755 new mode 100644 similarity index 88% rename from jbrotli-native/darwin/build.sh rename to jbrotli-native/darwin-x86-amd64/build.sh index d3ffd93..c615063 --- a/jbrotli-native/darwin/build.sh +++ b/jbrotli-native/darwin-x86-amd64/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash CURPATH=$(pwd) -TARGET_CLASSES_PATH="target/classes" +TARGET_CLASSES_PATH="target/classes/lib/darwin-x86-amd64" TARGET_PATH="target" function exitWithError() { diff --git a/jbrotli-native/darwin/pom.xml b/jbrotli-native/darwin-x86-amd64/pom.xml similarity index 95% rename from jbrotli-native/darwin/pom.xml rename to jbrotli-native/darwin-x86-amd64/pom.xml index a3cd403..c01eded 100644 --- a/jbrotli-native/darwin/pom.xml +++ b/jbrotli-native/darwin-x86-amd64/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.meteogroup.jbrotli - jbrotli-native-darwin + jbrotli-native-darwin-x86-amd64 jar 0.3.1-SNAPSHOT @@ -20,13 +20,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - test - - org.testng testng diff --git a/jbrotli-native/darwin/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/darwin-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java similarity index 83% rename from jbrotli-native/darwin/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java rename to jbrotli-native/darwin-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java index bd9d899..87b5e5d 100644 --- a/jbrotli-native/darwin/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java +++ b/jbrotli-native/darwin-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java @@ -16,13 +16,15 @@ package org.meteogroup.jbrotli.jni; -import org.scijava.nativelib.NativeLoader; import org.testng.annotations.Test; +import java.net.URL; + public class LoadLibraryTest { @Test public void the_library_can_be_loaded() throws Exception { - NativeLoader.loadLibrary("brotli"); + URL resource = this.getClass().getResource("/lib/darwin-x86-amd64/brotli.dylib"); + Runtime.getRuntime().load(resource.getFile()); } } diff --git a/jbrotli-native/linux-arm32-vfp-hflt/pom.xml b/jbrotli-native/linux-arm32-vfp-hflt/pom.xml index f574f0d..37c8331 100644 --- a/jbrotli-native/linux-arm32-vfp-hflt/pom.xml +++ b/jbrotli-native/linux-arm32-vfp-hflt/pom.xml @@ -20,13 +20,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - test - - org.testng testng diff --git a/jbrotli-native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java index 4ab4f65..9df49cf 100644 --- a/jbrotli-native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java +++ b/jbrotli-native/linux-arm32-vfp-hflt/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java @@ -16,7 +16,6 @@ package org.meteogroup.jbrotli.jni; -import org.scijava.nativelib.NativeLoader; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -26,6 +25,8 @@ public class LoadLibraryTest { @Test public void the_library_can_be_loaded() throws Exception { // because of cross compiling, we can't test here. +// URL resource = this.getClass().getResource("/lib/linux-x86-amd64/libbrotli.so"); +// Runtime.getRuntime().load(resource.getFile()); assertThat(true).isTrue(); } } diff --git a/jbrotli-native/linux-x86-amd64/build.sh b/jbrotli-native/linux-x86-amd64/build.sh index 24ec653..b885be1 100755 --- a/jbrotli-native/linux-x86-amd64/build.sh +++ b/jbrotli-native/linux-x86-amd64/build.sh @@ -1,7 +1,7 @@ #!/bin/sh CURPATH=$(pwd) -TARGET_CLASSES_PATH="target/classes" +TARGET_CLASSES_PATH="target/classes/lib/linux-x86-amd64" TARGET_PATH="target" exitWithError() { diff --git a/jbrotli-native/linux-x86-amd64/pom.xml b/jbrotli-native/linux-x86-amd64/pom.xml index 03e966f..c05a765 100644 --- a/jbrotli-native/linux-x86-amd64/pom.xml +++ b/jbrotli-native/linux-x86-amd64/pom.xml @@ -20,13 +20,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - test - - org.testng testng diff --git a/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java index bd9d899..e79af40 100644 --- a/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java +++ b/jbrotli-native/linux-x86-amd64/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java @@ -16,13 +16,15 @@ package org.meteogroup.jbrotli.jni; -import org.scijava.nativelib.NativeLoader; import org.testng.annotations.Test; +import java.net.URL; + public class LoadLibraryTest { @Test public void the_library_can_be_loaded() throws Exception { - NativeLoader.loadLibrary("brotli"); + URL resource = this.getClass().getResource("/lib/linux-x86-amd64/libbrotli.so"); + Runtime.getRuntime().load(resource.getFile()); } } diff --git a/jbrotli-native/pom.xml b/jbrotli-native/pom.xml index 85aac1e..30e11be 100644 --- a/jbrotli-native/pom.xml +++ b/jbrotli-native/pom.xml @@ -43,14 +43,14 @@ - darwin + darwin-x86-amd64 mac - darwin + darwin-x86-amd64 diff --git a/jbrotli-native/win32-x86-amd64/build.bat b/jbrotli-native/win32-x86-amd64/build.bat index adff7cc..61799c3 100644 --- a/jbrotli-native/win32-x86-amd64/build.bat +++ b/jbrotli-native/win32-x86-amd64/build.bat @@ -16,7 +16,9 @@ cd "%~dp0" :PREPARE_FOLDERS if not exist "%~dp0target" mkdir "%~dp0target" if not exist "%~dp0target\classes" mkdir "%~dp0target\classes" -SET TARGET_CLASSES_PATH=%~dp0target\classes +if not exist "%~dp0target\classes\lib" mkdir "%~dp0target\classes\lib" +SET TARGET_CLASSES_PATH=%~dp0target\classes\lib\win32-x86-amd64 +if not exist "%TARGET_CLASSES_PATH%" mkdir "%TARGET_CLASSES_PATH%" :PREPARE_MAKEFILES cd "%~dp0target" @@ -27,7 +29,7 @@ cd "%~dp0target" nmake || goto ERROR :COPY_DLL_FOR_MAVEN_PACKAGING -copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR +copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR :ENSURE_WORKING_DIRECTORY cd %~dp0 diff --git a/jbrotli-native/win32-x86-amd64/pom.xml b/jbrotli-native/win32-x86-amd64/pom.xml index db0ee6b..5690fa3 100644 --- a/jbrotli-native/win32-x86-amd64/pom.xml +++ b/jbrotli-native/win32-x86-amd64/pom.xml @@ -20,13 +20,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - test - - org.testng testng diff --git a/jbrotli-native/win32-x86/build.bat b/jbrotli-native/win32-x86/build.bat index 05fec8c..cfdc524 100644 --- a/jbrotli-native/win32-x86/build.bat +++ b/jbrotli-native/win32-x86/build.bat @@ -7,7 +7,7 @@ REM Requirements REM -------------- REM o Java 1.8 JDK installed, needs JAVA_HOME set REM o cmake 3.0 + installed and available via PATH -REM o nmake installed (comes e.g. with Visual Studio), call "vcvarsall.bat x86" before to activate 64bit tools +REM o nmake installed (comes e.g. with Visual Studio), call "vcvarsall.bat x86" before to activate 32bit tools REM :ENSURE_WORKING_DIRECTORY @@ -16,7 +16,9 @@ cd "%~dp0" :PREPARE_FOLDERS if not exist "%~dp0target" mkdir "%~dp0target" if not exist "%~dp0target\classes" mkdir "%~dp0target\classes" -SET TARGET_CLASSES_PATH=%~dp0target\classes +if not exist "%~dp0target\classes\lib" mkdir "%~dp0target\classes\lib" +SET TARGET_CLASSES_PATH=%~dp0target\classes\lib\win32-x86 +if not exist "%TARGET_CLASSES_PATH%" mkdir "%TARGET_CLASSES_PATH%" :PREPARE_MAKEFILES cd "%~dp0target" @@ -27,7 +29,7 @@ cd "%~dp0target" nmake || goto ERROR :COPY_DLL_FOR_MAVEN_PACKAGING -copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR +copy /Y "%~dp0target\brotli.dll" "%TARGET_CLASSES_PATH%" || goto ERROR :ENSURE_WORKING_DIRECTORY cd %~dp0 diff --git a/jbrotli-native/win32-x86/pom.xml b/jbrotli-native/win32-x86/pom.xml index 1940570..8982219 100644 --- a/jbrotli-native/win32-x86/pom.xml +++ b/jbrotli-native/win32-x86/pom.xml @@ -20,13 +20,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - test - - org.testng testng diff --git a/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java b/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java index bd9d899..f256e4d 100644 --- a/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java +++ b/jbrotli-native/win32-x86/src/test/java/org/meteogroup/jbrotli/jni/LoadLibraryTest.java @@ -16,13 +16,15 @@ package org.meteogroup.jbrotli.jni; -import org.scijava.nativelib.NativeLoader; import org.testng.annotations.Test; +import java.net.URL; + public class LoadLibraryTest { @Test public void the_library_can_be_loaded() throws Exception { - NativeLoader.loadLibrary("brotli"); + URL resource = this.getClass().getResource("/lib/win32-x86/brotli.dll"); + Runtime.getRuntime().load(resource.getFile()); } } diff --git a/jbrotli-performance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java b/jbrotli-performance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java index da664c4..e63f6d2 100644 --- a/jbrotli-performance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java +++ b/jbrotli-performance/src/main/java/org/meteogroup/jbrotli/performance/Brotli_vs_Gzip_Benchmark.java @@ -19,6 +19,7 @@ import org.meteogroup.jbrotli.Brotli; import org.meteogroup.jbrotli.BrotliCompressor; import org.meteogroup.jbrotli.BrotliStreamCompressor; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; @@ -27,7 +28,6 @@ import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import org.scijava.nativelib.NativeLoader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -49,7 +49,7 @@ public class Brotli_vs_Gzip_Benchmark { @Setup public void init() throws IOException { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); brotliParameter = new Brotli.Parameter(Brotli.Mode.GENERIC, 5, Brotli.DEFAULT_LGWIN, Brotli.DEFAULT_LGBLOCK); diff --git a/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java b/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java index 2b587d1..3f3c8f6 100644 --- a/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java +++ b/jbrotli-servlet/src/main/java/org/meteogroup/jbrotli/servlet/BrotliServletFilter.java @@ -17,7 +17,7 @@ package org.meteogroup.jbrotli.servlet; import org.meteogroup.jbrotli.Brotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -51,8 +51,8 @@ public class BrotliServletFilter implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { try { - NativeLoader.loadLibrary("brotli"); - } catch (IOException e) { + BrotliLibraryLoader.loadBrotli(); + } catch (UnsatisfiedLinkError | IllegalStateException | SecurityException e) { throw new ServletException(e); } applyFilterConfig(filterConfig); diff --git a/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java b/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java index 05ff246..67e8075 100644 --- a/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java +++ b/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletOutputStreamTest.java @@ -18,7 +18,7 @@ import org.meteogroup.jbrotli.Brotli; import org.meteogroup.jbrotli.BrotliDeCompressor; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -35,7 +35,7 @@ public class BrotliServletOutputStreamTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java b/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java index 0eeb861..ea0013b 100644 --- a/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java +++ b/jbrotli-servlet/src/test/java/org/meteogroup/jbrotli/servlet/BrotliServletResponseWrapperTest.java @@ -17,7 +17,7 @@ package org.meteogroup.jbrotli.servlet; import org.meteogroup.jbrotli.Brotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +36,7 @@ public class BrotliServletResponseWrapperTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/pom.xml b/jbrotli/pom.xml index b5910a4..536864f 100644 --- a/jbrotli/pom.xml +++ b/jbrotli/pom.xml @@ -72,7 +72,7 @@ - darwin + darwin-x86-amd64 mac @@ -81,7 +81,7 @@ org.meteogroup.jbrotli - jbrotli-native-darwin + jbrotli-native-darwin-x86-amd64 ${version.jbrotli.native} @@ -192,12 +192,6 @@ - - org.scijava - native-lib-loader - 2.1.3 - - org.testng testng diff --git a/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java b/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java index efa2902..71fc4da 100755 --- a/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java +++ b/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoader.java @@ -16,12 +16,6 @@ package org.meteogroup.jbrotli.libloader; -import org.meteogroup.jbrotli.Brotli; -import org.meteogroup.jbrotli.BrotliStreamCompressor; - -import java.io.*; -import java.nio.file.Files; - public class BrotliLibraryLoader { private static final String BROTLI_LIB_NAME = "brotli"; @@ -35,7 +29,6 @@ public class BrotliLibraryLoader { */ public static synchronized void loadBrotli() throws UnsatisfiedLinkError, IllegalStateException, SecurityException { LibraryLoader libraryLoader = new LibraryLoader(BROTLI_LIB_NAME); - if (libraryLoader.tryAlreadyLoaded()) return; if (libraryLoader.trySystemLibraryLoading()) return; if (libraryLoader.tryLoadingFromTemporaryFolder()) return; String details = libraryLoader.getResult().asFormattedString(); diff --git a/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/LibraryLoader.java b/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/LibraryLoader.java index 73310cd..63718e9 100644 --- a/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/LibraryLoader.java +++ b/jbrotli/src/main/java/org/meteogroup/jbrotli/libloader/LibraryLoader.java @@ -16,9 +16,6 @@ package org.meteogroup.jbrotli.libloader; -import org.meteogroup.jbrotli.Brotli; -import org.meteogroup.jbrotli.BrotliStreamCompressor; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -39,17 +36,6 @@ class LibraryLoader { this.libName = libName; } - boolean tryAlreadyLoaded() { - try { - new BrotliStreamCompressor(new Brotli.Parameter().setQuality(0)).close(); - loaderResult.setAlreadyLoaded(true); - return true; - } catch (UnsatisfiedLinkError e) { - loaderResult.setAlreadyLoaded(false); - return false; - } - } - boolean trySystemLibraryLoading() { try { Runtime.getRuntime().loadLibrary(libName); @@ -85,9 +71,9 @@ boolean tryLoadingFromTemporaryFolder() throws SecurityException, IllegalStateEx } catch (IOException e) { throw new IllegalStateException("Can't write to " + libFile, e); } + libFile.deleteOnExit(); if (loaderResult.isUsedThisClassloader() || loaderResult.isUsedSystemClassloader()) { - libFile.deleteOnExit(); loaderResult.setMadeReadable(libFile.setReadable(true)); loaderResult.setMadeExecutable(libFile.setExecutable(true)); Runtime.getRuntime().load(libFile.getAbsolutePath()); diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorExtremeTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorExtremeTest.java index 997570c..32e5de3 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorExtremeTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorExtremeTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +29,7 @@ public class BrotliCompressorExtremeTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorTest.java index 0bc836a..b1ba368 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliCompressorTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -24,13 +24,9 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import static org.meteogroup.jbrotli.BufferTestHelper.createFilledByteArray; -import static org.meteogroup.jbrotli.BufferTestHelper.getByteArray; -import static org.meteogroup.jbrotli.BufferTestHelper.wrapDirect; -import static java.nio.ByteBuffer.allocate; -import static java.nio.ByteBuffer.allocateDirect; -import static java.nio.ByteBuffer.wrap; +import static java.nio.ByteBuffer.*; import static org.assertj.core.api.Assertions.assertThat; +import static org.meteogroup.jbrotli.BufferTestHelper.*; public class BrotliCompressorTest { @@ -41,7 +37,7 @@ public class BrotliCompressorTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliDeCompressorTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliDeCompressorTest.java index 0e36fa9..fe49d52 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliDeCompressorTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliDeCompressorTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -24,8 +24,9 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import static org.meteogroup.jbrotli.BrotliCompressorTest.*; import static org.assertj.core.api.Assertions.assertThat; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES_COMPRESSED; public class BrotliDeCompressorTest { @@ -33,7 +34,7 @@ public class BrotliDeCompressorTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliExampleTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliExampleTest.java index b9d441c..0030320 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliExampleTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliExampleTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.Test; public class BrotliExampleTest { @@ -29,7 +29,7 @@ public class BrotliExampleTest { @Test public void compress_with_byte_array() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes(); byte[] compressedBuf = new byte[2048]; @@ -46,7 +46,7 @@ public void compress_with_byte_array() throws Exception { @Test public void compress_with_stream_compressor() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); byte[] inBuf = "Brotli: a new compression algorithm for the internet. Now available for Java!".getBytes(); boolean doFlush = true; diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteArrayTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteArrayTest.java index 45ab8a1..d31a03f 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteArrayTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteArrayTest.java @@ -16,15 +16,15 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import static org.assertj.core.api.Assertions.assertThat; import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES_COMPRESSED; -import static org.assertj.core.api.Assertions.assertThat; public class BrotliStreamCompressorByteArrayTest { @@ -32,7 +32,7 @@ public class BrotliStreamCompressorByteArrayTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteBufferTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteBufferTest.java index a5c4e5d..ac38df7 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteBufferTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorByteBufferTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -24,11 +24,11 @@ import java.nio.ByteBuffer; +import static java.nio.ByteBuffer.wrap; +import static org.assertj.core.api.Assertions.assertThat; import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES_COMPRESSED; import static org.meteogroup.jbrotli.BufferTestHelper.*; -import static java.nio.ByteBuffer.wrap; -import static org.assertj.core.api.Assertions.assertThat; public class BrotliStreamCompressorByteBufferTest { @@ -36,7 +36,7 @@ public class BrotliStreamCompressorByteBufferTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorInitAndCloseTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorInitAndCloseTest.java index a1dada4..cbcfdf3 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorInitAndCloseTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamCompressorInitAndCloseTest.java @@ -16,14 +16,14 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; import static org.assertj.core.api.Assertions.assertThat; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; public class BrotliStreamCompressorInitAndCloseTest { @@ -31,7 +31,7 @@ public class BrotliStreamCompressorInitAndCloseTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteArrayTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteArrayTest.java index 8b30ecd..ac52150 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteArrayTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteArrayTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -24,16 +24,17 @@ import java.util.Arrays; -import static org.meteogroup.jbrotli.BrotliCompressorTest.*; -import static org.meteogroup.jbrotli.BufferTestHelper.concat; import static org.assertj.core.api.Assertions.assertThat; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES_COMPRESSED; +import static org.meteogroup.jbrotli.BufferTestHelper.concat; public class BrotliStreamDeCompressorByteArrayTest { private BrotliStreamDeCompressor decompressor; @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteBufferTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteBufferTest.java index 43493ce..110e75b 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteBufferTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorByteBufferTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -24,21 +24,20 @@ import java.nio.ByteBuffer; -import static org.meteogroup.jbrotli.BrotliCompressorTest.*; -import static org.meteogroup.jbrotli.BufferTestHelper.*; -import static java.nio.ByteBuffer.allocate; -import static java.nio.ByteBuffer.allocateDirect; -import static java.nio.ByteBuffer.wrap; +import static java.nio.ByteBuffer.*; import static java.util.Arrays.copyOf; import static java.util.Arrays.copyOfRange; import static org.assertj.core.api.Assertions.assertThat; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES; +import static org.meteogroup.jbrotli.BrotliCompressorTest.A_BYTES_COMPRESSED; +import static org.meteogroup.jbrotli.BufferTestHelper.*; public class BrotliStreamDeCompressorByteBufferTest { private BrotliStreamDeCompressor decompressor; @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorInitAndCloseTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorInitAndCloseTest.java index b907297..e47f499 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorInitAndCloseTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/BrotliStreamDeCompressorInitAndCloseTest.java @@ -16,7 +16,7 @@ package org.meteogroup.jbrotli; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -29,7 +29,7 @@ public class BrotliStreamDeCompressorInitAndCloseTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliInputStreamTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliInputStreamTest.java index 0eca778..d6c048d 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliInputStreamTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliInputStreamTest.java @@ -16,10 +16,9 @@ package org.meteogroup.jbrotli.io; -import org.meteogroup.jbrotli.Brotli; import org.meteogroup.jbrotli.BrotliCompressor; import org.meteogroup.jbrotli.BufferTestHelper; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -42,7 +41,7 @@ public class BrotliInputStreamTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliOutputStreamTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliOutputStreamTest.java index da6f406..9b8f87c 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliOutputStreamTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/io/BrotliOutputStreamTest.java @@ -19,7 +19,7 @@ import org.meteogroup.jbrotli.Brotli; import org.meteogroup.jbrotli.BrotliDeCompressor; import org.meteogroup.jbrotli.BrotliStreamCompressor; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -37,7 +37,7 @@ public class BrotliOutputStreamTest { @BeforeClass public void loadLibrary() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); } @BeforeMethod diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoaderTest.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoaderTest.java index d5eb6b8..6782789 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoaderTest.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/libloader/BrotliLibraryLoaderTest.java @@ -21,8 +21,7 @@ public class BrotliLibraryLoaderTest { @Test - public void testName() throws Exception { + public void happy_path() throws Exception { BrotliLibraryLoader.loadBrotli(); - } } \ No newline at end of file diff --git a/jbrotli/src/test/java/org/meteogroup/jbrotli/playground/TestSingleFileCompression.java b/jbrotli/src/test/java/org/meteogroup/jbrotli/playground/TestSingleFileCompression.java index 1f42121..330bebb 100644 --- a/jbrotli/src/test/java/org/meteogroup/jbrotli/playground/TestSingleFileCompression.java +++ b/jbrotli/src/test/java/org/meteogroup/jbrotli/playground/TestSingleFileCompression.java @@ -18,7 +18,7 @@ import org.meteogroup.jbrotli.Brotli; import org.meteogroup.jbrotli.BrotliStreamCompressor; -import org.scijava.nativelib.NativeLoader; +import org.meteogroup.jbrotli.libloader.BrotliLibraryLoader; import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; @@ -36,7 +36,7 @@ public static void main(String[] args) { } private void run() throws Exception { - NativeLoader.loadLibrary("brotli"); + BrotliLibraryLoader.loadBrotli(); byte[] data = loadDemoData();