Failed to load resource input for ECBCurrentRateProvider from org/javamoney/moneta/convert/ecb/defaults/eurofxref-daily.xml #431

Author: keilw

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/LoadDataInformation.java

@@ -15,6 +15,7 @@
  */
 package org.javamoney.moneta.spi.loader;
 
+import java.io.InputStream;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Map;
@@ -40,17 +41,24 @@ public class LoadDataInformation {
 
     private final URI backupResource;
 
+	public InputStream getFallbackStream() {
+		return fallbackStream;
+	}
+
+	private final InputStream fallbackStream;
+
     private final URI[] resourceLocations;
 
     private final boolean startRemote;
 
 	LoadDataInformation(String resourceId, UpdatePolicy updatePolicy,
 			Map<String, String> properties, LoaderService.Listener listener,
-			URI backupResource, URI[] resourceLocations, boolean startRemote) {
+			InputStream fallbackStream, URI backupResource, URI[] resourceLocations, boolean startRemote) {
 		this.resourceId = resourceId;
 		this.updatePolicy = updatePolicy;
 		this.properties = properties;
 		this.listener = listener;
+		this.fallbackStream = fallbackStream;
 		this.backupResource = backupResource;
 		this.resourceLocations = resourceLocations;
 		this.startRemote = startRemote;

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/LoadDataInformationBuilder.java

@@ -15,6 +15,7 @@
  */
 package org.javamoney.moneta.spi.loader;
 
+import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
@@ -36,11 +37,17 @@ public class LoadDataInformationBuilder {
 	private UpdatePolicy updatePolicy;
 
     private Map<String, String> properties;
+
 	/** An (optional) Listener to be registered. */
     private Listener listener;
+
+	/**
+	 * The fallback input stream in the classpath.
+	 */
+	private InputStream fallbackStream;
+
 	/**
-	 * The backup resource location in the classpath, not
-	 *                          {@code null}.
+	 * The backup resource location in the local filesystem.
 	 */
     private URI backupResource;
 
@@ -69,6 +76,11 @@ public LoadDataInformationBuilder withLoaderListener(Listener listener) {
 		return this;
 	}
 
+	public LoadDataInformationBuilder withFallbackStream(InputStream stream) {
+		this.fallbackStream = stream;
+		return this;
+	}
+
 	public LoadDataInformationBuilder withBackupResource(URI backupResource) {
 		this.backupResource = backupResource;
 		return this;
@@ -98,8 +110,7 @@ else if (Objects.isNull(resourceLocations)) {
 			throw new IllegalStateException("The properties should be informed");
 		}
 		return new LoadDataInformation(resourceId, updatePolicy, properties,
-                listener, backupResource, resourceLocations, startRemote);
+                listener, fallbackStream, backupResource, resourceLocations, startRemote);
 	}
 
-
 }

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/okhttp/HttpLoadDataService.java

@@ -50,10 +50,17 @@ public boolean execute(String resourceId,
 			}
 			try {
 				if (load.loadFallback()) {
-					LOG.log(Level.WARNING, "Read fallback data from: " + load.getFallbackResource());
-					listener.trigger(resourceId, load);
-					LOG.log(Level.WARNING, "Loaded fallback data from: " + load.getFallbackResource());
-					return true;
+					if (load.getFallbackStream() != null) {
+						LOG.log(Level.FINE, "Read fallback data from stream");
+						listener.trigger(resourceId, load);
+						LOG.log(Level.FINE, "Loaded fallback data from input stream");
+						return true;
+					} else if (load.getFallbackResource() != null) {
+						LOG.log(Level.FINE, "Read fallback data from: " + load.getFallbackResource());
+						listener.trigger(resourceId, load);
+						LOG.log(Level.FINE, "Loaded fallback data from: " + load.getFallbackResource());
+						return true;
+					}
 				}
 			} catch (Exception e) {
 				LOG.log(Level.SEVERE, "Failed to read/load fallback resource: " + resourceId,

moneta-core/src/main/java/org/javamoney/moneta/spi/loader/okhttp/LoadableHttpResource.java

@@ -59,9 +59,14 @@ class LoadableHttpResource implements DataStreamFactory {
      */
     private final List<URI> remoteResources = new ArrayList<>();
     /**
-     * The fallback location (classpath).
+     * The fallback location (local).
      */
     private final URI fallbackLocation;
+
+    /**
+     * The fallback stream (classpath).
+     */
+    private final InputStream fallbackStream;
     /**
      * The cache used.
      */
@@ -110,6 +115,7 @@ class LoadableHttpResource implements DataStreamFactory {
         this.updatePolicy = loadDataInformation.getUpdatePolicy();
         this.properties = loadDataInformation.getProperties();
         this.fallbackLocation = loadDataInformation.getBackupResource();
+        this.fallbackStream = loadDataInformation.getFallbackStream();
         this.remoteResources.addAll(Arrays.asList(loadDataInformation.getResourceLocations()));
     }
 
@@ -171,6 +177,15 @@ public final List<URI> getRemoteResources() {
         return Collections.unmodifiableList(remoteResources);
     }
 
+    /**
+     * Return the fallback input stream.
+     *
+     * @return the fallback stream, or null.
+     */
+    public InputStream getFallbackStream() {
+        return fallbackStream;
+    }
+
     /**
      * Return the fallback location.
      *
@@ -224,7 +239,7 @@ public final long getLastLoaded() {
     public boolean loadRemote() {
         for (URI itemToLoad : remoteResources) {
             try {
-                return load(itemToLoad, false);
+                return load(itemToLoad, false, null);
             } catch (Exception e) {
                 LOG.log(Level.WARNING, "Failed to load resource: " + itemToLoad, e);
             }
@@ -245,7 +260,7 @@ public boolean loadFallback() {
                         ", loadFallback not supported.");
                 return false;
             }
-            load(fallbackLocation, true);
+            load(fallbackLocation, true, fallbackStream);
             clearCache();
             return true;
         } catch (Exception e) {
@@ -302,18 +317,22 @@ protected void writeCache() throws IOException {
     /**
      * Tries to load the data from the given location. The location hereby can be a remote location or a local
      * location. Also it can be an URL pointing to a current dataset, or an url directing to fallback resources,
-     * e.g. within the current classpath.
+     * e.g. within the current file system.
      *
      * @param itemToLoad   the target {@link URI}
      * @param fallbackLoad true, for a fallback URL.
      */
-    protected boolean load(URI itemToLoad, boolean fallbackLoad) {
+    private boolean load(URI itemToLoad, boolean fallbackLoad, InputStream fallbackStream) {
         InputStream is = null;
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
 
         try {
             if (fallbackLoad) {
-                is = new BufferedInputStream(itemToLoad.toURL().openStream());
+                if (fallbackStream != null) {
+                    is = new BufferedInputStream(fallbackStream);
+                } else {
+                    is = new BufferedInputStream(itemToLoad.toURL().openStream());
+                }
             } else {
                 OkHttpClient.Builder builder = new OkHttpClient.Builder();