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 {
 
-	protected static final Logger LOG = Logger.getLogger(ECBAbstractRateProvider.class.getName());
+	private 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/ECBCurrentRateProvider.java

@@ -71,7 +71,7 @@ protected LoadDataInformation getDefaultLoadData() {
                 .withResourceId(getDataId())
                 .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
                 .withProperties(props)
-                .withBackupResource(URI.create(ECB_CURRENT_FALLBACK_PATH))
+                .withBackupResource(getResourceFromPath(ECB_CURRENT_FALLBACK_PATH))
                 .withResourceLocations(URI.create(ECB_CURRENT_URL))
                 .withStartRemote(true)
                 .build();

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

@@ -72,19 +72,12 @@ 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(backupResource)
+                .withBackupResource(getResourceFromPath(ECB_HIST90_FALLBACK_PATH))
                 .withResourceLocations(URI.create(ECB_HIST90_URL))
                 .withStartRemote(true)
                 .build();

moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProvider.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
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.javamoney.moneta.convert.ecb.defaults.Defaults.ECB_HIST_FALLBACK_PATH;
 import static org.javamoney.moneta.convert.ecb.defaults.Defaults.ECB_HIST_URL;
 
 /**
@@ -81,7 +82,7 @@ protected LoadDataInformation getDefaultLoadData() {
             .withResourceId(getDataId())
             .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
             .withProperties(props)
-            .withBackupResource(URI.create("org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist.xml"))
+            .withBackupResource(getResourceFromPath(ECB_HIST_FALLBACK_PATH))
             .withResourceLocations(URI.create(ECB_HIST_URL))
             .withStartRemote(false)
             .build();

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

@@ -23,8 +23,8 @@ private Defaults() {}
     public static final String ECB_CURRENT_FALLBACK_PATH = "org/javamoney/moneta/convert/ecb/defaults/eurofxref-daily.xml";
 
     public static final String ECB_HIST90_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml";
-
     public static final String ECB_HIST90_FALLBACK_PATH = "org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist-90d.xml";
 
     public static final String ECB_HIST_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist.xml";
+    public static final String ECB_HIST_FALLBACK_PATH = "org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist.xml";
 }

moneta-core/src/main/java/org/javamoney/moneta/spi/AbstractRateProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Anatole Tresch, 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
@@ -19,6 +19,9 @@
 
 import java.math.BigDecimal;
 import java.math.MathContext;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -47,8 +50,7 @@ public abstract class AbstractRateProvider implements ExchangeRateProvider {
      */
     private final ProviderContext context;
 
-    @Deprecated
-    protected final Logger log = Logger.getLogger(getClass().getName());
+    protected static final Logger LOG = Logger.getLogger(AbstractRateProvider.class.getName());
 
     /**
      * Constructor.
@@ -175,4 +177,21 @@ protected LocalDate[] getQueryDates(ConversionQuery query) {
         }
         return null;
     }
+
+    /**
+     * Return a URI from the given location.
+     *
+     * @param path the given location.
+     * @return the URL resource, or null.
+     */
+    protected URI getResourceFromPath(String path) {
+        final URL url = getClass().getResource(path);
+        URI resource = null;
+        try {
+            resource = url.toURI();
+        } catch (URISyntaxException e) {
+            LOG.warning(e.getMessage());
+        }
+        return resource;
+    }
 }