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

Author: keilw

moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBAbstractRateProvider.java

@@ -57,7 +57,7 @@
 abstract class ECBAbstractRateProvider extends AbstractRateProvider implements
         LoaderService.Listener {
 
-	private static final Logger LOG = Logger.getLogger(ECBAbstractRateProvider.class.getName());
+	protected static final Logger LOG = Logger.getLogger(ECBAbstractRateProvider.class.getName());
 
     private static final String BASE_CURRENCY_CODE = "EUR";
 

moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
+ * Copyright (c) 2012, 2025, Werner Keil and others by the @author tag.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -23,6 +23,8 @@
 import javax.money.convert.ProviderContextBuilder;
 import javax.money.convert.RateType;
 import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -70,12 +72,19 @@ public String getDataId() {
     protected LoadDataInformation getDefaultLoadData() {
         final Map<String, String> props = new HashMap<>();
         props.put("period", "03:00");
-
+        final URL backupUrl = getClass().getResource(ECB_HIST90_FALLBACK_PATH);
+        // TODO factor fallBackResource into ECBAbstractRateProvider
+        URI backupResource = null;
+        try {
+            backupResource = backupUrl.toURI();
+        } catch (URISyntaxException e) {
+            LOG.warning(e.getMessage());
+        }
         return new LoadDataInformationBuilder()
                 .withResourceId(getDataId())
                 .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
                 .withProperties(props)
-                .withBackupResource(URI.create(ECB_HIST90_FALLBACK_PATH))
+                .withBackupResource(backupResource)
                 .withResourceLocations(URI.create(ECB_HIST90_URL))
                 .withStartRemote(true)
                 .build();

moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/defaults/Defaults.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Werner Keil and others by the @author tag.
+ * Copyright (c) 2023-2025, Werner Keil and others by the @author tag.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of

moneta-convert/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/defaults/Defaults.java

@@ -3,8 +3,6 @@
 public final class Defaults {
     private Defaults() {}
 
-    //public static final String DIGIT_FRACTION = "ecb.digit.fraction"
-
     public static final String HOST = "https://www.imf.org/external/np/fin/data/rms_mth.aspx?SelectDate=%s&reportType=%s&tsvflag=Y";
 
     public static final String CVSDR = "CVSDR";

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

@@ -15,7 +15,6 @@
  */
 package org.javamoney.moneta.spi.loader;
 
-import java.io.InputStream;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Map;
@@ -41,24 +40,17 @@ 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,
-			InputStream fallbackStream, URI backupResource, URI[] resourceLocations, boolean startRemote) {
+			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,7 +15,6 @@
  */
 package org.javamoney.moneta.spi.loader;
 
-import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
@@ -37,17 +36,11 @@ 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 local filesystem.
+	 * The backup resource location in the classpath, not
+	 *                          {@code null}.
 	 */
     private URI backupResource;
 
@@ -76,11 +69,6 @@ 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;
@@ -110,7 +98,8 @@ else if (Objects.isNull(resourceLocations)) {
 			throw new IllegalStateException("The properties should be informed");
 		}
 		return new LoadDataInformation(resourceId, updatePolicy, properties,
-                listener, fallbackStream, backupResource, resourceLocations, startRemote);
+                listener, backupResource, resourceLocations, startRemote);
 	}
 
+
 }

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

@@ -50,17 +50,10 @@ public boolean execute(String resourceId,
 			}
 			try {
 				if (load.loadFallback()) {
-					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;
-					}
+					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;
 				}
 			} 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,14 +59,9 @@ class LoadableHttpResource implements DataStreamFactory {
      */
     private final List<URI> remoteResources = new ArrayList<>();
     /**
-     * The fallback location (local).
+     * The fallback location (classpath).
      */
     private final URI fallbackLocation;
-
-    /**
-     * The fallback stream (classpath).
-     */
-    private final InputStream fallbackStream;
     /**
      * The cache used.
      */
@@ -115,7 +110,6 @@ 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()));
     }
 
@@ -177,15 +171,6 @@ 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.
      *
@@ -239,7 +224,7 @@ public final long getLastLoaded() {
     public boolean loadRemote() {
         for (URI itemToLoad : remoteResources) {
             try {
-                return load(itemToLoad, false, null);
+                return load(itemToLoad, false);
             } catch (Exception e) {
                 LOG.log(Level.WARNING, "Failed to load resource: " + itemToLoad, e);
             }
@@ -260,7 +245,7 @@ public boolean loadFallback() {
                         ", loadFallback not supported.");
                 return false;
             }
-            load(fallbackLocation, true, fallbackStream);
+            load(fallbackLocation, true);
             clearCache();
             return true;
         } catch (Exception e) {
@@ -317,22 +302,18 @@ 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 file system.
+     * e.g. within the current classpath.
      *
      * @param itemToLoad   the target {@link URI}
      * @param fallbackLoad true, for a fallback URL.
      */
-    private boolean load(URI itemToLoad, boolean fallbackLoad, InputStream fallbackStream) {
+    protected boolean load(URI itemToLoad, boolean fallbackLoad) {
         InputStream is = null;
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
 
         try {
             if (fallbackLoad) {
-                if (fallbackStream != null) {
-                    is = new BufferedInputStream(fallbackStream);
-                } else {
-                    is = new BufferedInputStream(itemToLoad.toURL().openStream());
-                }
+                is = new BufferedInputStream(itemToLoad.toURL().openStream());
             } else {
                 OkHttpClient.Builder builder = new OkHttpClient.Builder();