Working on #353

Author: keilw

moneta-convert/moneta-convert-imf/src/main/java/module-info.java

@@ -1,7 +1,7 @@
 import org.javamoney.moneta.spi.loader.LoaderService;
 
 /*
-Copyright (c) 2012, 2023, Werner Keil and others by the @author tag.
+Copyright (c) 2012, 2024, 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/IMFAbstractRateProvider.java

@@ -63,9 +63,9 @@ abstract class IMFAbstractRateProvider extends AbstractRateProvider implements L
             CurrencyUnitBuilder.of("SDR", CurrencyContextBuilder.of(IMFRateProvider.class.getSimpleName()).build())
                     .setDefaultFractionDigits(3).build(true);
 
-	protected Map<CurrencyUnit, List<ExchangeRate>> currencyToSdr = Collections.emptyMap();
+	protected Map<CurrencyUnit, List<ExchangeRate>> currencyToSdr = new HashMap<>();
 
-	protected Map<CurrencyUnit, List<ExchangeRate>> sdrToCurrency = Collections.emptyMap();
+	protected Map<CurrencyUnit, List<ExchangeRate>> sdrToCurrency = new HashMap<>();
 
     protected volatile String loadState;
 

moneta-convert/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFHistoricRateProvider.java

@@ -51,12 +51,11 @@ public class IMFHistoricRateProvider extends IMFAbstractRateProvider {
     private static final String DATA_ID = IMFHistoricRateProvider.class.getSimpleName();
 
 	private static final ProviderContext CONTEXT = ProviderContextBuilder.of("IMF-HIST", RateType.HISTORIC)
-	            .set("providerDescription", "Historic International Monetary Fund")
+			.set("providerDescription", "Historic International Monetary Fund")
 			.set("days", 0)
-			.set("User-Agent", "Chrome/51.0.2704.103")
+			//.set("User-Agent", "Chrome/51.0.2704.103") This was a URLConnection hack, OkHttp works without the User-Agent
 			.build();
 
-
 	private final List<YearMonth> cachedHistoric = new ArrayList<>();
 	public IMFHistoricRateProvider() {
 		super(CONTEXT);

moneta-convert/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFRateProvider.java

@@ -51,7 +51,7 @@ public class IMFRateProvider extends IMFAbstractRateProvider {
     private static final ProviderContext CONTEXT = ProviderContextBuilder.of("IMF", RateType.DEFERRED)
             .set("providerDescription", "International Monetary Fund")
             .set("days", 1)
-            .set("User-Agent", "Chrome/51.0.2704.103")
+            //.set("User-Agent", "Chrome/51.0.2704.103")
             .build();
 
     public IMFRateProvider() {

moneta-convert/moneta-convert-imf/src/main/java/org/javamoney/moneta/convert/imf/IMFRemoteSearchCallable.java

@@ -46,8 +46,6 @@ class IMFRemoteSearchCallable implements Callable<IMFRemoteSearchResult>{
 
 	@Override
 	public IMFRemoteSearchResult call() throws Exception {
-		//connection.addRequestProperty("User-Agent", userAgent);
-		// TODO apply userAgent where applicable
 		final OkHttpClient client = new OkHttpClient.Builder()
 				.build();
 
@@ -83,7 +81,7 @@ public String toString() {
                 " type: " + type + ", yearMonth: " + yearMonth + '}';
 	}
 
-	class IMFRemoteSearchResult {
+	static class IMFRemoteSearchResult {
 
 		private final IMFHistoricalType type;
 

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

@@ -20,14 +20,12 @@
 import org.javamoney.moneta.spi.loader.LoaderService;
 import org.javamoney.moneta.spi.loader.ResourceCache;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.lang.ref.SoftReference;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URI;
+import java.net.URL;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -314,63 +312,65 @@ protected boolean load(URI itemToLoad, boolean fallbackLoad) {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
 
         try {
-            OkHttpClient.Builder builder = new OkHttpClient.Builder();
-
-            String proxyPort = this.properties.get("proxy.port");
-            String proxyHost = this.properties.get("proxy.host");
-            String proxyType = this.properties.get("proxy.type");
-            if(proxyPort != null && proxyHost != null) {
-                if (proxyType == null) {
-                    proxyType = Proxy.Type.HTTP.name();
+            if (fallbackLoad) {
+                is = new BufferedInputStream(itemToLoad.toURL().openStream());
+            } else {
+                OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+                String proxyPort = this.properties.get("proxy.port");
+                String proxyHost = this.properties.get("proxy.host");
+                String proxyType = this.properties.get("proxy.type");
+                if (proxyPort != null && proxyHost != null) {
+                    if (proxyType == null) {
+                        proxyType = Proxy.Type.HTTP.name();
+                    }
+                    Proxy proxy = new Proxy(Proxy.Type.valueOf(proxyType.toUpperCase()),
+                            InetSocketAddress.createUnresolved(proxyHost, Integer.parseInt(proxyPort)));
+                    builder = builder.proxy(proxy);
                 }
-                Proxy proxy = new Proxy(Proxy.Type.valueOf(proxyType.toUpperCase()),
-                        InetSocketAddress.createUnresolved(proxyHost, Integer.parseInt(proxyPort)));
-                builder = builder.proxy(proxy);
-            }
 
-            String connectTimeout = this.properties.get("connection.connect.timeout");
-            if(connectTimeout != null) {
-                int seconds = Integer.parseInt(connectTimeout);
-                builder = builder.connectTimeout(seconds, TimeUnit.SECONDS);
+                String connectTimeout = this.properties.get("connection.connect.timeout");
+                if (connectTimeout != null) {
+                    int seconds = Integer.parseInt(connectTimeout);
+                    builder = builder.connectTimeout(seconds, TimeUnit.SECONDS);
 //            }else{
 //                conn.setConnectTimeout(10000);
-            }
-            final String readTimeout = this.properties.get("connection.read.timeout");
-            if(readTimeout != null) {
-                int seconds = Integer.parseInt(readTimeout);
-                builder = builder.readTimeout(seconds, TimeUnit.SECONDS);
-            }
-//            else{
-//                conn.setReadTimeout(10000);
-//            }
-            final String writeTimeout = this.properties.get("connection.write.timeout");
-            if(writeTimeout != null) {
-                int seconds = Integer.parseInt(writeTimeout);
-                builder = builder.readTimeout(seconds, TimeUnit.SECONDS);
-            }
+                }
+                final String readTimeout = this.properties.get("connection.read.timeout");
+                if (readTimeout != null) {
+                    int seconds = Integer.parseInt(readTimeout);
+                    builder = builder.readTimeout(seconds, TimeUnit.SECONDS);
+                }
 
-            final OkHttpClient client = builder.build();
+                final String writeTimeout = this.properties.get("connection.write.timeout");
+                if (writeTimeout != null) {
+                    int seconds = Integer.parseInt(writeTimeout);
+                    builder = builder.readTimeout(seconds, TimeUnit.SECONDS);
+                }
 
-            Request.Builder requestBuilder = new Request.Builder();
-            final String userAgent = this.properties.get("useragent");
-            if(userAgent != null) {
-                requestBuilder = requestBuilder.header("User-Agent", userAgent);
-            }
+                final OkHttpClient client = builder.build();
+
+                Request.Builder requestBuilder = new Request.Builder();
+//                final String userAgent = this.properties.get("useragent");
+//                if (userAgent != null) {
+//                    requestBuilder = requestBuilder.header("User-Agent", userAgent);
+//                }
+
+                final Request request = requestBuilder
+                        .url(itemToLoad.toString())
+                        .build();
 
-            final Request request = requestBuilder
-                    .url(itemToLoad.toString())
-                    .build();
-            
 //            conn.setRequestProperty("Accept", "application/xhtml+xml");
 //            conn.setRequestProperty("Accept-Encoding", "gzip, deflate, br");
 //            conn.setRequestProperty("Accept-Language", "en-US,en;q=0.9");
 //            TODO check if any of those are necessary?
 
-            final Call call = client.newCall(request);
+                final Call call = client.newCall(request);
+                //is = conn.getInputStream();
+                is = call.execute().body().byteStream();
+            }
 
             byte[] data = new byte[4096];
-            //is = conn.getInputStream();
-            is = call.execute().body().byteStream();
             int read = is.read(data);
             while (read > 0) {
                 stream.write(data, 0, read);

moneta-core/src/test/java/org/javamoney/moneta/spi/loader/LoadDataInformationBuilderTest.java

@@ -17,7 +17,6 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,7 +32,7 @@ public class LoadDataInformationBuilderTest {
 	public void shouldCreateLoadDataInformation() throws URISyntaxException {
 		String resourceId = "resourceId";
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 		LoaderService.Listener listener = (id, is) -> {};
         URI backupResource = new URI("localhost");
         URI[] resourceLocations = new URI[]{new URI("localhost")};
@@ -83,7 +82,7 @@ public void shouldCreateLoadDataInformationWithOutListener() throws URISyntaxExc
 	public void shouldCreateLoadDataInformationWithOutBackupResource() throws URISyntaxException {
 		String resourceId = "resourceId";
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 		LoaderService.Listener listener = (id, is) -> {};
         URI[] resourceLocations = new URI[]{new URI("localhost")};
 
@@ -107,7 +106,7 @@ public void shouldCreateLoadDataInformationWithOutBackupResource() throws URISyn
 	@Test(expectedExceptions = IllegalStateException.class)
 	public void shouldReturnsErrorWhenResourceIdWasNotInformed() throws URISyntaxException {
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 		LoaderService.Listener listener = (id, is) -> {};
         URI[] resourceLocations = new URI[]{new URI("localhost")};
 
@@ -123,7 +122,7 @@ public void shouldReturnsErrorWhenResourceIdWasNotInformed() throws URISyntaxExc
 	@Test(expectedExceptions = IllegalStateException.class)
 	public void shouldReturnsErrorWhenUpdatePolicyWasNotInformed() throws URISyntaxException {
 		String resourceId = "resourceId";
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 		LoaderService.Listener listener = (id, is) -> {};
         URI[] resourceLocations = new URI[]{new URI("localhost")};
 
@@ -156,7 +155,7 @@ public void shouldReturnsErrorWhenPropertiesWasNotInformed() throws URISyntaxExc
 	public void shouldReturnsErrorWhenResourceLocationsWasNotInformed() throws URISyntaxException {
 		String resourceId = "resourceId";
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 		LoaderService.Listener listener = (id, is) -> {};
 
 		new LoadDataInformationBuilder()

moneta-core/src/test/java/org/javamoney/moneta/spi/loader/okhttp/LoadableHttpResourceBuilderTest.java

@@ -24,7 +24,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.testng.Assert.assertNotNull;
@@ -37,7 +37,7 @@ public class LoadableHttpResourceBuilderTest {
 	public void setup() throws URISyntaxException {
 		String resourceId = "resourceId";
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 	    Listener listener = (id, is) -> {};
         URI backupResource = new URI("localhost");
         URI[] resourceLocations = new URI[]{new URI("localhost")};

moneta-core/src/test/java/org/javamoney/moneta/spi/loader/urlconnection/LoadableURLResourceBuilderTest.java

@@ -19,7 +19,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.javamoney.moneta.spi.loader.LoadDataInformation;
@@ -37,7 +37,7 @@ public class LoadableURLResourceBuilderTest {
 	public void setup() throws URISyntaxException {
 		String resourceId = "resourceId";
 		UpdatePolicy updatePolicy = UpdatePolicy.LAZY;
-	    Map<String, String> properties = Collections.emptyMap();
+	    Map<String, String> properties = new HashMap<>();
 	    Listener listener = (id, is) -> {};
         URI backupResource = new URI("localhost");
         URI[] resourceLocations = new URI[]{new URI("localhost")};

src/etc/JVM_options.txt

@@ -0,0 +1 @@
+--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED