Support arbitrary sources for loading properties from

owner/src/main/java/org/aeonbits/owner/Config.java

@@ -9,16 +9,17 @@
 package org.aeonbits.owner;
 
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
-import java.net.URL;
+import java.net.URI;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
+import org.aeonbits.owner.loaders.ConfigurationSourceNotFoundException;
+
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -101,13 +102,13 @@ enum LoadType {
          */
         FIRST {
             @Override
-            Properties load(List<URL> urls, LoadersManager loaders) {
+            Properties load(List<URI> uris, LoadersManager loaders) {
                 Properties result = new Properties();
-                for (URL url : urls)
+                for (URI uri : uris)
                     try {
-                        loaders.load(result, url);
+                        loaders.load(result, uri);
                         break;
-                    } catch (IOException ex) {
+                    } catch (ConfigurationSourceNotFoundException ex) {
                         // happens when a file specified in the sources is not found or cannot be read.
                         ignore();
                     }
@@ -121,20 +122,20 @@ Properties load(List<URL> urls, LoadersManager loaders) {
          */
         MERGE {
             @Override
-            Properties load(List<URL> urls, LoadersManager loaders) {
+            Properties load(List<URI> uris, LoadersManager loaders) {
                 Properties result = new Properties();
-                for (URL url :  reverse(urls))
+                for (URI uri :  reverse(uris))
                     try {
-                        loaders.load(result, url);
-                    } catch (IOException ex) {
+                        loaders.load(result, uri);
+                    } catch (ConfigurationSourceNotFoundException ex) {
                         // happens when a file specified in the sources is not found or cannot be read.
                         ignore();
                     }
                 return result;
             }
         };
 
-        abstract Properties load(List<URL> urls, LoadersManager loaders);
+        abstract Properties load(List<URI> uris, LoadersManager loaders);
     }
 
     /**

owner/src/main/java/org/aeonbits/owner/ConfigFactory.java

@@ -133,5 +133,9 @@ public static String clearProperty(String key) {
     public static void registerLoader(Loader loader) {
         INSTANCE.registerLoader(loader);
     }
+
+    public static void resetLoaders() {
+        INSTANCE.resetLoaders();
+    }
 
 }

owner/src/main/java/org/aeonbits/owner/ConfigURLFactory.java → owner/src/main/java/org/aeonbits/owner/ConfigURIFactory.java

@@ -9,34 +9,42 @@
 package org.aeonbits.owner;
 
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 /**
  * @author Luigi R. Viggiano
  */
-class ConfigURLFactory {
+class ConfigURIFactory {
 
     private static final String CLASSPATH_PROTOCOL = "classpath:";
+    private static final String FILE_PROTOCOL = "file:";
     private final transient ClassLoader classLoader;
     private final VariablesExpander expander;
 
-    ConfigURLFactory(ClassLoader classLoader, VariablesExpander expander) {
+    ConfigURIFactory(ClassLoader classLoader, VariablesExpander expander) {
         this.classLoader = classLoader;
         this.expander = expander;
     }
 
-    URL newURL(String spec) throws MalformedURLException {
+    URI newURI(String spec) throws MalformedURLException, URISyntaxException {
         String expanded = expand(spec);
-        URL url;
+        URI uri;
         if (expanded.startsWith(CLASSPATH_PROTOCOL)) {
             String path = expanded.substring(CLASSPATH_PROTOCOL.length());
-            url = classLoader.getResource(path);
+            URL url = classLoader.getResource(path);
             if (url == null)
                 return null;
+            uri = url.toURI();
+        } else if(expanded.startsWith(FILE_PROTOCOL)) {
+        	URL url = new URL(expanded);
+        	uri = url.toURI();
         } else {
-            url = new URL(expanded);
+            uri = new URI(expanded);
         }
-        return new URL(url.getProtocol(), url.getHost(), url.getPort(), expand(url.getPath()));
+
+        return uri;
     }
 
     private String expand(String path) {

owner/src/main/java/org/aeonbits/owner/DefaultFactory.java

@@ -71,6 +71,11 @@ public void setProperties(Properties properties) {
     public void registerLoader(Loader loader) {
         loadersManager.registerLoader(loader);
     }
+
+    public void resetLoaders() {
+        loadersManager.clear();
+        loadersManager.registerDefaultLoaders();
+    }
 
     public String getProperty(String key) {
         checkKey(key);

owner/src/main/java/org/aeonbits/owner/Factory.java

@@ -87,5 +87,8 @@ public interface Factory {
      * @since 1.0.5
      */
     void registerLoader(Loader loader);
+
+    void resetLoaders();
+
 
 }

owner/src/main/java/org/aeonbits/owner/HotReloadLogic.java

@@ -13,13 +13,14 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
 import static org.aeonbits.owner.Config.HotReloadType.SYNC;
-import static org.aeonbits.owner.Util.fileFromURL;
+import static org.aeonbits.owner.Util.fileFromURI;
 import static org.aeonbits.owner.Util.now;
 
 /**
@@ -51,16 +52,16 @@ public boolean isChanged() {
         }
     }
 
-    public HotReloadLogic(HotReload hotReload, List<URL> urls, PropertiesManager manager) {
+    public HotReloadLogic(HotReload hotReload, List<URI> uris, PropertiesManager manager) {
         this.manager = manager;
         type = hotReload.type();
         interval = hotReload.unit().toMillis(hotReload.value());
-        setupWatchableResources(urls);
+        setupWatchableResources(uris);
     }
 
-    private void setupWatchableResources(List<URL> urls) {
-        for (URL url : urls) {
-            File file = fileFromURL(url);
+    private void setupWatchableResources(List<URI> uris) {
+        for (URI url : uris) {
+            File file = fileFromURI(url);
             if (file != null)
                 watchableFiles.add(new WatchableFile(file));
         }

owner/src/main/java/org/aeonbits/owner/LoadersManager.java

@@ -8,13 +8,15 @@
 
 package org.aeonbits.owner;
 
+import org.aeonbits.owner.loaders.ConfigurationSourceNotFoundException;
 import org.aeonbits.owner.loaders.Loader;
 import org.aeonbits.owner.loaders.PropertiesLoader;
 import org.aeonbits.owner.loaders.XMLLoader;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -38,27 +40,26 @@ class LoadersManager implements Serializable {
     private final List<Loader> loaders = new LinkedList<Loader>();
 
     LoadersManager() {
+    	registerDefaultLoaders();
+    }
+
+    void registerDefaultLoaders() {
         registerLoader(new PropertiesLoader());
         registerLoader(new XMLLoader());
     }
 
-    void load(Properties result, URL url) throws IOException {
-        InputStream stream = url.openStream();
-        try {
-            Loader loader = findLoader(url);
-            loader.load(result, stream);
-        } finally {
-            stream.close();
-        }
+    void load(Properties result, URI uri) throws ConfigurationSourceNotFoundException {
+    	Loader loader = findLoader(uri);
+        loader.load(result, uri);
     }
 
-    Loader findLoader(URL url) {
+    Loader findLoader(URI uri) {
         lock.readLock().lock();
         try {
             for (Loader loader : loaders)
-                if (loader.accept(url))
+                if (loader.accept(uri))
                     return loader;
-            throw unsupported("Can't resolve a Loader for the URL %s.", url.toString());
+            throw unsupported("Can't resolve a Loader for the URL %s.", uri.toString());
         } finally {
             lock.readLock().unlock();
         }

owner/src/main/java/org/aeonbits/owner/PropertiesManager.java

@@ -31,6 +31,8 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -73,7 +75,7 @@ class PropertiesManager implements Reloadable, Accessible, Mutable {
     private final WriteLock writeLock = lock.writeLock();
 
     private final LoadType loadType;
-    private final List<URL> urls;
+    private final List<URI> urls;
     private final HotReloadLogic hotReloadLogic;
 
     private volatile boolean loading = false;
@@ -111,8 +113,8 @@ public boolean remove(Object o) {
         this.loaders = loaders;
         this.imports = imports;
 
-        ConfigURLFactory urlFactory = new ConfigURLFactory(clazz.getClassLoader(), expander);
-        urls = toURLs(clazz.getAnnotation(Sources.class), urlFactory);
+        ConfigURIFactory urlFactory = new ConfigURIFactory(clazz.getClassLoader(), expander);
+        urls = toURIs(clazz.getAnnotation(Sources.class), urlFactory);
 
         LoadPolicy loadPolicy = clazz.getAnnotation(LoadPolicy.class);
         loadType = (loadPolicy != null) ? loadPolicy.value() : FIRST;
@@ -132,27 +134,29 @@ public void run() {
         }
     }
 
-    private List<URL> toURLs(Sources sources, ConfigURLFactory urlFactory) {
+    private List<URI> toURIs(Sources sources, ConfigURIFactory urlFactory) {
         String[] specs = specs(sources, urlFactory);
-        ArrayList<URL> result = new ArrayList<URL>();
+        List<URI> result = new ArrayList<URI>();
         for (String spec : specs) {
             try {
-                URL url = urlFactory.newURL(spec);
-                if (url != null)
-                    result.add(url);
+                URI uri = urlFactory.newURI(spec);
+                if (uri != null)
+                    result.add(uri);
             } catch (MalformedURLException e) {
                 throw unsupported(e, "Can't convert '%s' to a valid URL", spec);
-            }
+            } catch (URISyntaxException e) {
+            	throw unsupported(e, "Can't convert '%s' to a valid URI", spec);
+			}
         }
         return result;
     }
 
-    private String[] specs(Sources sources, ConfigURLFactory urlFactory) {
+    private String[] specs(Sources sources, ConfigURIFactory urlFactory) {
         if (sources != null) return sources.value();
         return defaultSpecs(urlFactory);
     }
 
-    private String[] defaultSpecs(ConfigURLFactory urlFactory) {
+    private String[] defaultSpecs(ConfigURIFactory urlFactory) {
         String prefix = urlFactory.toClasspathURLSpec(clazz.getName());
         return loaders.defaultSpecs(prefix);
     }

owner/src/main/java/org/aeonbits/owner/Util.java

@@ -15,6 +15,8 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -132,28 +134,36 @@ static long now() {
         return timeProvider.getTime();
     }
 
-    static File fileFromURL(URL url) {
-        if ("file".equalsIgnoreCase(url.getProtocol())) {
-            String path = url.getPath();
+    static File fileFromURI(URI uri) {
+        //if ("file".equalsIgnoreCase(url.getProtocol())) {
+    	if ("file".equalsIgnoreCase(uri.getScheme())) {
+            String path = uri.getSchemeSpecificPart();
             try {
                 path = decode(path, "utf-8");
                 return new File(path);
             } catch (UnsupportedEncodingException e) {
                 return unreachableButCompilerNeedsThis(/* utf-8 is supported in jre libraries */);
             }
-        } else if ("jar".equalsIgnoreCase(url.getProtocol())) {
+        //} else if ("jar".equalsIgnoreCase(url.getProtocol())) {
+    	} else if ("jar".equalsIgnoreCase(uri.getScheme())) {
+    		URL url = null;
+    		try {
+				url = uri.toURL();
+			} catch (MalformedURLException e1) {
+                return unreachableButCompilerNeedsThis(/* utf-8 is supported in jre libraries */);
+			}
             String path = url.getPath();
             try {
                 return fileFromURL(path.substring(0, path.indexOf('!')));
-            } catch (MalformedURLException e) {
-                return ignore(/* non critical */);
-            }
+            } catch (URISyntaxException e) {
+            	return ignore(/* non critical */);
+			}
         }
         return null;
     }
 
-    static File fileFromURL(String urlSpec) throws MalformedURLException {
-        return fileFromURL(new URL(urlSpec));
+    static File fileFromURL(String urlSpec) throws URISyntaxException {
+        return fileFromURI(new URI(urlSpec));
     }
 
     static boolean eq(Object o1, Object o2) {

owner/src/main/java/org/aeonbits/owner/loaders/AbstractFileBasedLoader.java

@@ -0,0 +1,26 @@
+package org.aeonbits.owner.loaders;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.Properties;
+
+public abstract class AbstractFileBasedLoader implements Loader {
+
+	private static final long serialVersionUID = -7207237322627631047L;
+
+	public void load(Properties result, InputStream input) throws IOException {
+        result.load(input);
+    }
+
+    public void load(Properties result, URI uri) throws ConfigurationSourceNotFoundException {
+    	try {
+    		InputStream stream = uri.toURL().openStream();
+    		doLoadInternal(result, stream);
+    	} catch(IOException ioe) {
+    		throw new ConfigurationSourceNotFoundException(ioe);
+    	}
+    }
+
+	protected abstract void doLoadInternal(Properties result, InputStream input) throws IOException;
+}