Merge pull request #40 from githuib/fix/resource-loading

Fix/resource loading

README.md

@@ -87,25 +87,25 @@ Observable<Response<Void>> shareCollection(CollectionShareQuery collectionShareQ
 
 ### Using latest release
 
-The most recent release is Bynder Java SDK 2.2.5.
+The most recent release is Bynder Java SDK 2.2.6.
 
-- API Docs: http://www.javadoc.io/doc/com.bynder/bynder-java-sdk/2.2.5
+- API Docs: http://www.javadoc.io/doc/com.bynder/bynder-java-sdk/2.2.6
 
 To add a dependency on the SDK using Maven, use the following:
 
 ```xml
 <dependency>
   <groupId>com.bynder</groupId>
   <artifactId>bynder-java-sdk</artifactId>
-  <version>2.2.5</version>
+  <version>2.2.6</version>
 </dependency>
 ```
 
 To add a dependency using Gradle:
 
 ```
 dependencies {
-  implementation 'com.bynder:bynder-java-sdk:2.2.5'
+  implementation 'com.bynder:bynder-java-sdk:2.2.6'
 }
 ```
 

pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>com.bynder</groupId>
   <artifactId>bynder-java-sdk</artifactId>
-  <version>2.2.5</version>
+  <version>2.2.6</version>
   <packaging>jar</packaging>
 
   <name>Bynder Java SDK</name>

src/main/java/com/bynder/sdk/util/Utils.java

@@ -65,10 +65,20 @@ public static Properties loadConfig(final String file)
             throws IOException {
         String filename = file + ".properties";
         Properties config = new Properties();
-        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
+
+        // Try to load the resource, using some fallbacks if it fails.
+        InputStream is = ClassLoader.getSystemResourceAsStream(filename);
+        if (is == null) {
+            is = Utils.class.getResourceAsStream(filename);
+        }
         if (is == null) {
-            throw new IOException(filename + " could not be loaded.");
+            is = Thread.currentThread().getContextClassLoader().getResourceAsStream(filename);
         }
+
+        if (is == null) {
+            throw new IOException("Resource could not be loaded: " + filename);
+        }
+
         config.load(is);
         return config;
     }