Skip to content

Commit e47b390

Browse files
pavly-gergespavly-gerges
committed
snaploader-examples: applied API changes
1 parent bbb3564 commit e47b390

File tree

8 files changed

+30
-22
lines changed

8 files changed

+30
-22
lines changed

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestBasicFeatures.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
4040
import electrostatic4j.snaploader.platform.util.NativeVariant;
4141
import electrostatic4j.snaploader.platform.util.PlatformPredicate;
42-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
42+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
4343
import electrostatic4j.snaploader.LoadingCriterion;
4444

4545
/**
@@ -92,7 +92,7 @@ protected static void printDetails(NativeBinaryLoader loader) {
9292
}
9393

9494
protected static DirectoryPath getLibrariesAbsolutePath() {
95-
return new DirectoryPath(PropertiesProvider.USER_DIR.getSystemProperty(), "libs");
95+
return new DirectoryPath(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs");
9696
}
9797

9898
protected static DirectoryPath getJarFilePath() {
@@ -101,7 +101,7 @@ protected static DirectoryPath getJarFilePath() {
101101

102102
protected static String getNativeDynamicLibraryPath() {
103103
return getLibrariesAbsolutePath().getPath() +
104-
PropertiesProvider.FILE_SEPARATOR.getSystemProperty() +
104+
DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() +
105105
"lib" + getLibraryBaseName() + ".so";
106106
}
107107

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestBasicFeatures2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import electrostatic4j.snaploader.platform.NativeDynamicLibrary;
4343
import electrostatic4j.snaploader.platform.util.NativeVariant;
4444
import electrostatic4j.snaploader.platform.util.PlatformPredicate;
45-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
45+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
4646
import electrostatic4j.snaploader.LoadingCriterion;
4747

4848
/**
@@ -55,8 +55,8 @@ public final class TestBasicFeatures2 {
5555

5656
public static void main(String[] args) throws Exception {
5757

58-
final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
59-
final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs",
58+
final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
59+
final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
6060
NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
6161

6262
final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestFilesystemException.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
import electrostatic4j.snaploader.platform.util.DefaultDynamicLibraries;
99
import electrostatic4j.snaploader.platform.util.NativeVariant;
1010
import electrostatic4j.snaploader.platform.util.PlatformPredicate;
11-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
11+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
1212

13-
import java.io.IOException;
1413
import java.nio.file.Files;
1514
import java.nio.file.Path;
1615
import java.nio.file.Paths;
1716

1817
public final class TestFilesystemException {
1918
public static void main(String[] args) throws Exception {
20-
final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
21-
final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs",
19+
final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", TestBasicFeatures.getJarFile());
20+
final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
2221
NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
2322

2423
final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestFilesystemMemoryLeak.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import electrostatic4j.snaploader.filesystem.FileExtractionListener;
3636
import electrostatic4j.snaploader.filesystem.FileExtractor;
3737
import electrostatic4j.snaploader.filesystem.FileLocator;
38-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
38+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
3939
import electrostatic4j.snaploader.util.SnapLoaderLogger;
4040
import java.util.logging.Level;
4141
import java.util.logging.Logger;
@@ -78,12 +78,12 @@ public void onExtractionFinalization(FileExtractor fileExtractor, FileLocator fi
7878

7979
protected static String getZipAbsolutePath() {
8080
return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
81-
PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
81+
DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
8282
}
8383

8484
protected static String getExtractionPath() {
8585
return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
86-
PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
86+
DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
8787
}
8888

8989
protected static String getFilePath() {

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestNativeDllLoader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public final class TestNativeDllLoader {
1212
public static void main(String[] args) throws Exception {
1313
final NativeDynamicLibrary[] baseLibs = new NativeDynamicLibrary[] {
1414
DefaultDynamicLibraries.ANDROID_ALL,
15-
new NativeDynamicLibrary("linux/x86-64/com/github/stephengoldd", PlatformPredicate.LINUX_X86_64),
16-
new NativeDynamicLibrary("windows/x86-64/com/github/stephengoldd", PlatformPredicate.WIN_X86_64),
15+
new NativeDynamicLibrary("linux/x86-64/com/github/stephengold", PlatformPredicate.LINUX_X86_64),
16+
new NativeDynamicLibrary("windows/x86-64/com/github/stephengold", PlatformPredicate.WIN_X86_64),
1717
};
1818

1919
final NativeDynamicLibrary[] cpuEnhancedLibs = new NativeDynamicLibrary[]{
@@ -24,7 +24,7 @@ public static void main(String[] args) throws Exception {
2424
"avx", "avx2", "sse4_1", "sse4_2")),
2525
};
2626
final LibraryInfo info = new LibraryInfo(new DirectoryPath("linux/x86-64/com/github/stephengold"),
27-
"joltjnid", DirectoryPath.USER_DIR);
27+
"joltjni", DirectoryPath.USER_DIR);
2828
final NativeDllLoader nativeDllLoader = new NativeDllLoader(baseLibs, cpuEnhancedLibs, info, true, true);
2929
nativeDllLoader.loadCpuEnhancedLibs(LoadingCriterion.INCREMENTAL_LOADING);
3030
}

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestRetryExhaustionException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import electrostatic4j.snaploader.platform.util.DefaultDynamicLibraries;
4444
import electrostatic4j.snaploader.platform.util.NativeVariant;
4545
import electrostatic4j.snaploader.platform.util.PlatformPredicate;
46-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
46+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
4747

4848
/**
4949
* Tests retry exhaustion on a broken library.
@@ -53,8 +53,8 @@
5353
public class TestRetryExhaustionException {
5454
public static void main(String[] args) throws Exception {
5555

56-
final Path compressionPath = Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs", "corrupted-lib.jar");
57-
final Path extractionPath = Files.createDirectories(Paths.get(PropertiesProvider.USER_DIR.getSystemProperty(), "libs",
56+
final Path compressionPath = Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs", "corrupted-lib.jar");
57+
final Path extractionPath = Files.createDirectories(Paths.get(DefaultPropertiesProvider.USER_DIR.getSystemProperty(), "libs",
5858
NativeVariant.OS_NAME.getProperty(), NativeVariant.OS_ARCH.getProperty()));
5959

6060
final LibraryInfo libraryInfo = new LibraryInfo(new DirectoryPath(compressionPath.toString()), new DirectoryPath("lib/placeholder"),

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/TestZipExtractor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import electrostatic4j.snaploader.filesystem.FileExtractionListener;
3636
import electrostatic4j.snaploader.filesystem.FileExtractor;
3737
import electrostatic4j.snaploader.filesystem.FileLocator;
38-
import electrostatic4j.snaploader.platform.util.PropertiesProvider;
38+
import electrostatic4j.snaploader.platform.util.DefaultPropertiesProvider;
3939
import electrostatic4j.snaploader.throwable.FilesystemResourceScavengingException;
4040

4141
import java.util.zip.ZipFile;
@@ -80,12 +80,12 @@ public void onExtractionFinalization(FileExtractor fileExtractor, FileLocator fi
8080

8181
protected static String getZipAbsolutePath() {
8282
return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
83-
PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
83+
DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + "jmelogo700.zip";
8484
}
8585

8686
protected static String getExtractionPath() {
8787
return TestBasicFeatures.getLibrariesAbsolutePath().getPath() +
88-
PropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
88+
DefaultPropertiesProvider.FILE_SEPARATOR.getSystemProperty() + getFilePath();
8989
}
9090

9191
protected static String getFilePath() {

‎snaploader-examples/src/main/java/electrostatic4j/snaploader/examples/api/NativeDllLoader.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,4 +348,13 @@ protected void signalImminentFailure(CallingStackMetaData callingStackMetaData)
348348
// signal an imminent failure and crash the application
349349
Runtime.getRuntime().exit(-callingStackMetaData.getErrorCause().hashCode());
350350
}
351+
352+
/**
353+
* Retrieves the associated native binary loader object.
354+
*
355+
* @return a native binary loader object that is associated wtih this object.
356+
*/
357+
public NativeBinaryLoader getLoader() {
358+
return loader;
359+
}
351360
}

0 commit comments

Comments
 (0)