Updated code to accept a class parameter

terl · Aug 30, 2019 · f3c3356 · f3c3356
1 parent aa9c973
commit f3c3356
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
 ext {
     artifactId = "resource-loader"
     groupId = "co.libly"
-    version = '1.3.1'
+    version = '1.3.2'
     description = "Resource Loader gives you the functions to load resource files inside or outside JARs."
 }
 

diff --git a/src/main/java/co/libly/resourceloader/FileLoader.java b/src/main/java/co/libly/resourceloader/FileLoader.java
@@ -36,8 +36,8 @@ public static FileLoader get() {
      * @return The file your directory.
      * @throws IOException
      */
-    public File load(String relativePath) throws IOException {
-        return load(relativePath, new HashSet<>());
+    public File load(String relativePath, Class outsideClass) throws IOException {
+        return load(relativePath, new HashSet<>(), outsideClass);
     }
 
     /**
@@ -49,12 +49,12 @@ public File load(String relativePath) throws IOException {
      * @return The file your directory.
      * @throws IOException
      */
-    public File load(String relativePath, Set<PosixFilePermission> permissions) throws IOException {
-        return loadFromRelativePath(relativePath, permissions);
+    public File load(String relativePath, Set<PosixFilePermission> permissions, Class outsideClass) throws IOException {
+        return loadFromRelativePath(relativePath, permissions, outsideClass);
     }
 
-    private File loadFromRelativePath(String relativePath, Set<PosixFilePermission> filePermissions) throws IOException {
-        File file = copyToTempDirectory(relativePath);
+    private File loadFromRelativePath(String relativePath, Set<PosixFilePermission> filePermissions, Class outsideClass) throws IOException {
+        File file = copyToTempDirectory(relativePath, outsideClass);
         setPermissions(file, filePermissions);
         return file;
     }

diff --git a/src/main/java/co/libly/resourceloader/ResourceLoader.java b/src/main/java/co/libly/resourceloader/ResourceLoader.java
@@ -53,7 +53,7 @@ public class ResourceLoader {
      * @return The file or directory you want to load.
      * @throws IOException
      */
-    public File copyToTempDirectory(String relativePath) throws IOException {
+    public File copyToTempDirectory(String relativePath, Class outsideClass) throws IOException {
         // If the file does not start with a separator,
         // then let's make sure it does!
         if (!relativePath.startsWith(File.separator)) {
@@ -68,7 +68,7 @@ public File copyToTempDirectory(String relativePath) throws IOException {
         mainTempDir.mkdirs();
 
         try {
-            URL jarUrl = getThisJarPath();
+            URL jarUrl = getThisJarPath(outsideClass);
             // Is the user loading this in a JAR?
             if (jarUrl.toString().endsWith(".jar")) {
                 // If so the get the file/directory
@@ -363,7 +363,7 @@ protected boolean isPosixCompliant() {
      * using this method.
      * @return URL of this JAR.
      */
-    public URL getThisJarPath() {
-        return ResourceLoader.class.getProtectionDomain().getCodeSource().getLocation();
+    public URL getThisJarPath(Class outsideClass) {
+        return outsideClass.getProtectionDomain().getCodeSource().getLocation();
     }
 }
diff --git a/src/main/java/co/libly/resourceloader/SharedLibraryLoader.java b/src/main/java/co/libly/resourceloader/SharedLibraryLoader.java
@@ -49,7 +49,7 @@ public File load(String relativePath, Class clzz) {
     public File load(String relativePath, List<Class> classes) {
         synchronized (lock) {
             try {
-                File library = copyToTempDirectory(relativePath);
+                File library = copyToTempDirectory(relativePath, classes.get(0));
                 setPermissions(library);
                 if (library.isDirectory()) {
                     throw new IOException("Please supply a relative path to a file and not a directory.");

diff --git a/src/test/java/co/libly/resourceloader/FileLoaderTest.java b/src/test/java/co/libly/resourceloader/FileLoaderTest.java
@@ -27,15 +27,15 @@ public void loadLoader() {
 
     @Test
     public void loadFile() throws IOException {
-        File file = fileLoader.load("test1.txt");
+        File file = fileLoader.load("test1.txt", FileLoaderTest.class);
         assertThat(file)
                 .as("Load a file")
                 .isNotNull();
     }
 
     @Test
     public void loadFileCheckContents() throws IOException {
-        File file = fileLoader.load("test1.txt");
+        File file = fileLoader.load("test1.txt", FileLoaderTest.class);
 
         assertThat(file)
                 .as("Load a file testing the content")
@@ -44,7 +44,7 @@ public void loadFileCheckContents() throws IOException {
 
     @Test
     public void loadWholeFolders() throws IOException {
-        File file = fileLoader.load("folder2");
+        File file = fileLoader.load("folder2", FileLoaderTest.class);
 
         assertThat(file)
                 .as("Load a directory with children")