Working on #353

Author: keilw

moneta-convert/moneta-convert-imf/pom.xml

@@ -33,6 +33,11 @@
 			<artifactId>moneta-convert</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>4.12.0</version>
+		</dependency>
 	</dependencies>
 	<name>Moneta Currency Conversion - IMF Provider</name>
 

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

@@ -20,6 +20,7 @@
 	requires org.javamoney.moneta.convert;
     requires static osgi.core;
     requires static osgi.annotation;
+    requires okhttp3;
     provides javax.money.convert.ExchangeRateProvider with
             org.javamoney.moneta.convert.imf.IMFRateProvider, org.javamoney.moneta.convert.imf.IMFHistoricRateProvider;
     uses LoaderService;

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

@@ -18,17 +18,17 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
 import java.time.YearMonth;
 import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import okhttp3.Call;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import org.javamoney.moneta.convert.imf.IMFRemoteSearchCallable.IMFRemoteSearchResult;
 
-
 class IMFRemoteSearchCallable implements Callable<IMFRemoteSearchResult>{
 
 	private static final Logger LOG = Logger.getLogger(IMFRemoteSearchCallable.class.getName());
@@ -46,13 +46,19 @@ class IMFRemoteSearchCallable implements Callable<IMFRemoteSearchResult>{
 
 	@Override
 	public IMFRemoteSearchResult call() throws Exception {
+		//connection.addRequestProperty("User-Agent", userAgent);
 
-		URLConnection connection = getConnection();
-		if(Objects.isNull(connection)) {
-			return null;
-		}
-		connection.addRequestProperty("User-Agent", userAgent);
-        try (InputStream inputStream = connection.getInputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+		OkHttpClient client = new OkHttpClient.Builder()
+				.build();
+
+		Request request = new Request.Builder()
+				.url(getUrl())
+				.build();
+
+		Call call = client.newCall(request);
+
+        try (InputStream inputStream =  call.execute().body().byteStream();
+			 ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
             byte[] data = new byte[4096];
             int read = inputStream.read(data);
             while (read > 0) {
@@ -61,20 +67,14 @@ public IMFRemoteSearchResult call() throws Exception {
             }
             return new IMFRemoteSearchResult(type, new ByteArrayInputStream(stream.toByteArray()));
         } catch (Exception e) {
-            LOG.log(Level.WARNING, "Failed to load resource from url " + type.getUrl(yearMonth), e);
+            LOG.log(Level.WARNING, "Failed to load resource from url " + getUrl(), e);
         }
 		return null;
 	}
 
 
-	private URLConnection getConnection() {
-		try {
-			return new URL(type.getUrl(yearMonth)).openConnection();
-		} catch (Exception e) {
-			LOG.log(Level.WARNING, "Failed to load resource from url "
-					+ type.getUrl(yearMonth), e);
-		}
-		return null;
+	private String getUrl() {
+		return type.getUrl(yearMonth);
 	}
 
 	@Override

moneta-convert/pom.xml

@@ -15,9 +15,7 @@
 	<modules>
 		<module>moneta-convert-base</module>
 		<module>moneta-convert-ecb</module>
-<!-- FIXME this is only temporary to isolate ECB from IMF issues
 		<module>moneta-convert-imf</module>
--->
 	</modules>
 
 	<build>