Moved download function to OkHttpDownloader.java which utilizes OkHttp libraries to download data

Author: dreina-gei

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/HttpRequestBuilderImpl.java

@@ -220,23 +220,6 @@ public HttpRequestExecutor withMediaType(String type) {
         }
     }
 
-    public final String download(String urlString) throws IOException {
-        StringBuilder result = new StringBuilder();
-
-        URL url = new URL(urlString);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-        connection.setRequestMethod("GET");
-
-        try(BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
-            String line;
-            while((line = reader.readLine()) != null) {
-                result.append(line);
-            }
-        }
-
-        return result.toString();
-    }
-
     class HttpRequestExecutorImpl implements HttpRequestExecutor {
         @Override
         public final HttpRequestResponse execute() throws IOException {

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/OkHttpDownloader.java

@@ -0,0 +1,18 @@
+package mil.army.usace.hec.cwms.http.client;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import java.io.IOException;
+
+public final class OkHttpDownloader {
+    public static String download(String urlString) throws IOException {
+        OkHttpClient client = new OkHttpClient();
+        Request request = new Request.Builder()
+                .url(urlString)
+                .build();
+        try (Response response = client.newCall(request).execute()) {
+            assert response.body() != null;
+            return response.body().string();
+        }
+    }
+}

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/controllers/TextTimeSeriesController.java

@@ -27,6 +27,7 @@
 import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
 import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
 import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
+import mil.army.usace.hec.cwms.http.client.OkHttpDownloader;
 import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
 import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
 import mil.army.usace.hec.cwms.radar.client.model.TextTimeSeries;
@@ -85,8 +86,7 @@ public String getTextValueFromUrl(ApiConnectionInfo apiConnectionInfo, RegularTe
         String valueUrl = row.getValueUrl();
         String downloadedText = null;
         try {
-            HttpRequestBuilderImpl executor = new HttpRequestBuilderImpl(apiConnectionInfo);
-            downloadedText = executor.download(valueUrl);
+            downloadedText = OkHttpDownloader.download(valueUrl);
         } catch(IOException e) {
             logger.log(Level.FINE, "Failed to download data from " + valueUrl + "with exception " + e);
         }