Merge pull request #388 from kewne/fix_ecb_config

keilw · web-flow · commit 20b9c10b4fab · 2023-02-26T16:21:42.000+01:00
fix: Add default to ECB loader config
diff --git a/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBAbstractRateProvider.java b/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBAbstractRateProvider.java
@@ -15,6 +15,25 @@
  */
 package org.javamoney.moneta.convert.ecb;
 
+import org.javamoney.moneta.convert.ExchangeRateBuilder;
+import org.javamoney.moneta.spi.AbstractRateProvider;
+import org.javamoney.moneta.spi.DefaultNumberValue;
+import org.javamoney.moneta.spi.loader.LoadDataInformation;
+import org.javamoney.moneta.spi.loader.LoaderService;
+import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+
+import javax.money.CurrencyUnit;
+import javax.money.Monetary;
+import javax.money.MonetaryException;
+import javax.money.convert.ConversionQuery;
+import javax.money.convert.CurrencyConversionException;
+import javax.money.convert.ExchangeRate;
+import javax.money.convert.ProviderContext;
+import javax.money.spi.Bootstrap;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import java.io.InputStream;
 import java.math.MathContext;
 import java.nio.charset.StandardCharsets;
@@ -31,25 +50,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.money.CurrencyUnit;
-import javax.money.Monetary;
-import javax.money.MonetaryException;
-import javax.money.convert.ConversionQuery;
-import javax.money.convert.CurrencyConversionException;
-import javax.money.convert.ExchangeRate;
-import javax.money.convert.ProviderContext;
-import javax.money.spi.Bootstrap;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.javamoney.moneta.convert.ExchangeRateBuilder;
-import org.javamoney.moneta.spi.AbstractRateProvider;
-import org.javamoney.moneta.spi.DefaultNumberValue;
-import org.javamoney.moneta.spi.loader.LoaderService;
-import org.javamoney.moneta.spi.loader.LoaderService.LoaderListener;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-
 /**
  * Base to all Europe Central Bank implementation.
  *
@@ -90,12 +90,23 @@ abstract class ECBAbstractRateProvider extends AbstractRateProvider implements
         saxParserFactory.setNamespaceAware(false);
         saxParserFactory.setValidating(false);
         LoaderService loader = Bootstrap.getService(LoaderService.class);
+        if (!loader.isResourceRegistered(getDataId())) {
+            loader.registerData(getDefaultLoadData());
+        }
         loader.addLoaderListener(this, getDataId());
         loader.loadDataAsync(getDataId());
     }
 
     protected abstract String getDataId();
 
+    /**
+     * Gets the default data loading configuration.
+     *
+     * This configuration is used if no other is provided.
+     * @return the configuration
+     */
+    protected abstract LoadDataInformation getDefaultLoadData();
+
     @Override
     public void newDataLoaded(String resourceId, InputStream is) {
         final int oldSize = this.rates.size();
@@ -243,4 +254,4 @@ private class RateResult {
     	}
     }
 
-}
+}
diff --git a/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBCurrentRateProvider.java b/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBCurrentRateProvider.java
@@ -15,10 +15,16 @@
  */
 package org.javamoney.moneta.convert.ecb;
 
+import org.javamoney.moneta.spi.loader.LoadDataInformation;
+import org.javamoney.moneta.spi.loader.LoadDataInformationBuilder;
+import org.javamoney.moneta.spi.loader.LoaderService;
+
 import javax.money.convert.ConversionContext;
 import javax.money.convert.ProviderContext;
 import javax.money.convert.ProviderContextBuilder;
 import javax.money.convert.RateType;
+import java.net.URI;
+import java.util.Map;
 
 /**
  * This class implements an {@link javax.money.convert.ExchangeRateProvider} that loads data from
@@ -51,4 +57,16 @@ public ECBCurrentRateProvider() {
     public String getDataId() {
         return DATA_ID;
     }
-}
+
+    @Override
+    protected LoadDataInformation getDefaultLoadData() {
+        return new LoadDataInformationBuilder()
+            .withResourceId(getDataId())
+            .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
+            .withProperties(Map.of("period", "03:00"))
+            .withBackupResource(URI.create("org/javamoney/moneta/convert/ecb/defaults/eurofxref-daily.xml"))
+            .withResourceLocations(URI.create("https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml"))
+            .withStartRemote(true)
+            .build();
+    }
+}
diff --git a/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProvider.java b/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProvider.java
@@ -15,9 +15,15 @@
  */
 package org.javamoney.moneta.convert.ecb;
 
+import org.javamoney.moneta.spi.loader.LoadDataInformation;
+import org.javamoney.moneta.spi.loader.LoadDataInformationBuilder;
+import org.javamoney.moneta.spi.loader.LoaderService;
+
 import javax.money.convert.ProviderContext;
 import javax.money.convert.ProviderContextBuilder;
 import javax.money.convert.RateType;
+import java.net.URI;
+import java.util.Map;
 
 /**
  * <p>
@@ -57,4 +63,16 @@ public String getDataId() {
     }
 
 
-}
+    @Override
+    protected LoadDataInformation getDefaultLoadData() {
+        return new LoadDataInformationBuilder()
+            .withResourceId(getDataId())
+            .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
+            .withProperties(Map.of("period", "03:00"))
+            .withBackupResource(URI.create("org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist-90d.xml"))
+            .withResourceLocations(URI.create("https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml"))
+            .withStartRemote(true)
+            .build();
+    }
+
+}
diff --git a/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProvider.java b/moneta-convert/moneta-convert-ecb/src/main/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProvider.java
@@ -15,10 +15,16 @@
  */
 package org.javamoney.moneta.convert.ecb;
 
+import org.javamoney.moneta.spi.loader.LoadDataInformation;
+import org.javamoney.moneta.spi.loader.LoadDataInformationBuilder;
+import org.javamoney.moneta.spi.loader.LoaderService;
+
 import javax.money.convert.ConversionContext;
 import javax.money.convert.ProviderContext;
 import javax.money.convert.ProviderContextBuilder;
 import javax.money.convert.RateType;
+import java.net.URI;
+import java.util.Map;
 
 /**
  * <p>
@@ -64,4 +70,18 @@ public String getDataId() {
     }
 
 
-}
+    @Override
+    protected LoadDataInformation getDefaultLoadData() {
+        return new LoadDataInformationBuilder()
+            .withResourceId(getDataId())
+            .withUpdatePolicy(LoaderService.UpdatePolicy.SCHEDULED)
+            .withProperties(Map.of("period", "24:00",
+                "delay", "01:00",
+                "at", "07:00"))
+            .withBackupResource(URI.create("org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist.xml"))
+            .withResourceLocations(URI.create("https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist.xml"))
+            .withStartRemote(true)
+            .build();
+    }
+
+}
diff --git a/moneta-convert/moneta-convert-ecb/src/main/resources/javamoney.properties b/moneta-convert/moneta-convert-ecb/src/main/resources/javamoney.properties
@@ -15,26 +15,4 @@
 # Default MathContext for Money
 #-------------------------------
 
-# ResourceLoader-Configuration (optional)
-# ECB Rates
-{-1}load.ECBCurrentRateProvider.type=SCHEDULED
-{-1}load.ECBCurrentRateProvider.period=03:00
-{-1}load.ECBCurrentRateProvider.resource=org/javamoney/moneta/convert/ecb/defaults/eurofxref-daily.xml
-{-1}load.ECBCurrentRateProvider.urls=https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml
-{-1}load.ECBCurrentRateProvider.startRemote=true
-
-{-1}load.ECBHistoric90RateProvider.type=SCHEDULED
-{-1}load.ECBHistoric90RateProvider.period=03:00
-#{-1}load.ECBHistoric90RateProvider.at=12:00
-{-1}load.ECBHistoric90RateProvider.resource=org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist-90d.xml
-{-1}load.ECBHistoric90RateProvider.urls=https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml
-{-1}load.ECBHistoric90RateProvider.startRemote=true
-
-{-1}load.ECBHistoricRateProvider.type=SCHEDULED
-{-1}load.ECBHistoricRateProvider.period=24:00
-{-1}load.ECBHistoricRateProvider.delay=01:00
-{-1}load.ECBHistoricRateProvider.at=07:00
-{-1}load.ECBHistoricRateProvider.resource=org/javamoney/moneta/convert/ecb/defaults/eurofxref-hist.xml
-{-1}load.ECBHistoricRateProvider.urls=https://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist.xml
-{-1}load.ECBHistoricRateProvider.startRemote=false
 {-1}ecb.digit.fraction=6
diff --git a/moneta-convert/moneta-convert-ecb/src/main/resources/javamoney.properties~ b/moneta-convert/moneta-convert-ecb/src/main/resources/javamoney.properties~
diff --git a/moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProviderTest.java b/moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoric90RateProviderTest.java
@@ -63,7 +63,6 @@ public class ECBHistoric90RateProviderTest {
     @BeforeClass
     public static void setup() throws InterruptedException {
         provider = getExchangeRateProvider(ExchangeRateType.ECB_HIST90);
-        Thread.sleep(10_000L);
     }
 
     @Test
@@ -245,4 +244,4 @@ public final LocalDate[] withDaysBetween(LocalDate begin, LocalDate end) {
 		return dates.toArray(new LocalDate[dates.size()]);
 
 	}
-}
+}
diff --git a/moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProviderTest.java b/moneta-convert/moneta-convert-ecb/src/test/java/org/javamoney/moneta/convert/ecb/ECBHistoricRateProviderTest.java
@@ -51,7 +51,6 @@ public class ECBHistoricRateProviderTest {
     @BeforeTest
     public void setup() throws InterruptedException {
         provider = getExchangeRateProvider(ExchangeRateType.ECB_HIST);
-        Thread.sleep(20_000L);
     }
 
     @Test
diff --git a/moneta-core/src/main/java/org/javamoney/moneta/spi/LazyBoundCurrencyConversion.java b/moneta-core/src/main/java/org/javamoney/moneta/spi/LazyBoundCurrencyConversion.java
@@ -59,8 +59,6 @@ public ExchangeRate getExchangeRate(MonetaryAmount amount) {
         return this.rateProvider.getExchangeRate(ConversionQueryBuilder
                 .of(conversionQuery).setBaseCurrency(amount.getCurrency())
                 .build());
-        // return this.rateProvider.getExchangeRate(amount.getCurrency(),
-        // getCurrency());
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ public class ECBHistoric90RateProviderTest {`
`63`	`63`	`@BeforeClass`
`64`	`64`	`public static void setup() throws InterruptedException {`
`65`	`65`	`provider = getExchangeRateProvider(ExchangeRateType.ECB_HIST90);`
`66`		`- Thread.sleep(10_000L);`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`@Test`
`@@ -245,4 +244,4 @@ public final LocalDate[] withDaysBetween(LocalDate begin, LocalDate end) {`
`245`	`244`	`return dates.toArray(new LocalDate[dates.size()]);`
`246`	`245`
`247`	`246`	`}`
`248`		`-}`
	`247`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ public class ECBHistoricRateProviderTest {`
`51`	`51`	`@BeforeTest`
`52`	`52`	`public void setup() throws InterruptedException {`
`53`	`53`	`provider = getExchangeRateProvider(ExchangeRateType.ECB_HIST);`
`54`		`- Thread.sleep(20_000L);`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,6 @@ public ExchangeRate getExchangeRate(MonetaryAmount amount) {`
`59`	`59`	`return this.rateProvider.getExchangeRate(ConversionQueryBuilder`
`60`	`60`	`.of(conversionQuery).setBaseCurrency(amount.getCurrency())`
`61`	`61`	`.build());`
`62`		`- // return this.rateProvider.getExchangeRate(amount.getCurrency(),`
`63`		`- // getCurrency());`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`@Override`