DefaultResourceLoader uses ClassLoader.getSystemResourceAsStream() as fallback (#146)

* #142 Use UncheckedIOException rather than IllegalStateException This improves consistency with other use of UncheckedIOException * #141 DefaultResourceLoader uses ClassLoader.getSystemResourceAsStream() as fallback This should be no change when using "normal" Config/Configuration but allows users of the ConfigurationBuilder to have this fallback to ClassLoader.getSystemResourceAsStream() when the resource is not found via the usual getClass().getResourceAsStream() * #141 Use inputStream as variable name

Author: rbygrave

avaje-config/src/main/java/io/avaje/config/DefaultResourceLoader.java

@@ -9,6 +9,11 @@ final class DefaultResourceLoader implements ResourceLoader {
 
  @Override
  public InputStream getResourceAsStream(String resourcePath) {
- return getClass().getResourceAsStream("/" + resourcePath);
+ var inputStream = getClass().getResourceAsStream("/" + resourcePath);
+ if (inputStream == null) {
+ // search the module path for top level resource
+ inputStream = ClassLoader.getSystemResourceAsStream(resourcePath);
+ }
+ return inputStream;
  }
 }

avaje-config/src/main/java/io/avaje/config/InitialLoadContext.java

@@ -104,12 +104,7 @@ InputStream resource(String resourcePath, InitialLoader.Source source) {
  }
 
  private InputStream resourceStream(String resourcePath) {
- InputStream is = resourceLoader.getResourceAsStream(resourcePath);
- if (is == null) {
- // search the module path for top level resource
- is = ClassLoader.getSystemResourceAsStream(resourcePath);
- }
- return is;
+ return resourceLoader.getResourceAsStream(resourcePath);
  }
 
  /**