move download method to httputils

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

Diff for: engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

@@ -77,6 +77,7 @@
 import com.cloud.upgrade.dao.BasicTemplateDataStoreDaoImpl;
 import com.cloud.user.Account;
 import com.cloud.utils.DateUtil;
+import com.cloud.utils.HttpUtils;
 import com.cloud.utils.Pair;
 import com.cloud.utils.UriUtils;
 import com.cloud.utils.db.GlobalLock;
@@ -779,7 +780,7 @@ protected File getTemplateFile(MetadataTemplateDetails templateDetails) {
                 StringUtils.isNotBlank(templateDetails.getUrl())) {
             LOGGER.debug("Downloading the template file {} for hypervisor {} and arch {} as it is not present",
                     templateDetails.getUrl(), templateDetails.getHypervisorType().name(), templateDetails.getArch());
-            if (!NetUtils.downloadFileWithProgress(templateDetails.getUrl(), filePath, LOGGER)) {
+            if (!HttpUtils.downloadFileWithProgress(templateDetails.getUrl(), filePath, LOGGER)) {
                 return null;
             }
             return new File(filePath);

Diff for: utils/src/main/java/com/cloud/utils/HttpUtils.java

@@ -25,7 +25,12 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.Map;
 
 public class HttpUtils {
@@ -151,4 +156,50 @@ public static boolean validateSessionKey(final HttpSession session, final Map<St
         }
     }
 
+    public static boolean downloadFileWithProgress(final String fileURL, final String savePath, final Logger logger) {
+        HttpURLConnection httpConn = null;
+        try {
+            URL url = new URL(fileURL);
+            httpConn = (HttpURLConnection) url.openConnection();
+            int responseCode = httpConn.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                int contentLength = httpConn.getContentLength();
+                if (contentLength < 0) {
+                    logger.warn("Content length not provided for {}, progress updates may not be accurate",
+                            fileURL);
+                }
+                try (InputStream inputStream = httpConn.getInputStream();
+                     FileOutputStream outputStream = new FileOutputStream(savePath)) {
+                    byte[] buffer = new byte[4096];
+                    int bytesRead;
+                    int downloaded = 0;
+                    int lastReportedPercent = 0;
+                    while ((bytesRead = inputStream.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, bytesRead);
+                        downloaded += bytesRead;
+                        if (contentLength > 0) {
+                            int percentDownloaded = (int) ((downloaded / (double) contentLength) * 100);
+                            // Update every 5 percent or on completion
+                            if (percentDownloaded - lastReportedPercent >= 5 || percentDownloaded == 100) {
+                                logger.debug("Downloaded {}% from {}", downloaded, fileURL);
+                                lastReportedPercent = percentDownloaded;
+                            }
+                        }
+                    }
+                }
+                logger.info("File {} downloaded successfully using {}.", fileURL, savePath);
+            } else {
+                logger.error("No file to download {}. Server replied with code: {}", fileURL, responseCode);
+                return false;
+            }
+        } catch (IOException ex) {
+            logger.error("Failed to download {} due to: {}", fileURL, ex.getMessage(), ex);
+            return false;
+        } finally {
+            if (httpConn != null) {
+                httpConn.disconnect();
+            }
+        }
+        return true;
+    }
 }

Diff for: utils/src/main/java/com/cloud/utils/net/NetUtils.java

@@ -20,12 +20,9 @@
 package com.cloud.utils.net;
 
 import java.io.BufferedReader;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigInteger;
-import java.net.HttpURLConnection;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -34,7 +31,6 @@
 import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,8 +51,8 @@
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.validator.routines.InetAddressValidator;
 import org.apache.commons.validator.routines.RegexValidator;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.cloud.utils.IteratorUtil;
 import com.cloud.utils.Pair;
@@ -1878,51 +1874,4 @@ public static String transformCidr(final String cidr) {
         final long start = (ip & startNetMask);
         return String.format("%s/%s", long2Ip(start), size);
     }
-
-    public static boolean downloadFileWithProgress(final String fileURL, final String savePath, final Logger logger) {
-        HttpURLConnection httpConn = null;
-        try {
-            URL url = new URL(fileURL);
-            httpConn = (HttpURLConnection) url.openConnection();
-            int responseCode = httpConn.getResponseCode();
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                int contentLength = httpConn.getContentLength();
-                if (contentLength < 0) {
-                    logger.warn("Content length not provided for {}, progress updates may not be accurate",
-                            fileURL);
-                }
-                try (InputStream inputStream = httpConn.getInputStream();
-                     FileOutputStream outputStream = new FileOutputStream(savePath)) {
-                    byte[] buffer = new byte[4096];
-                    int bytesRead;
-                    int downloaded = 0;
-                    int lastReportedPercent = 0;
-                    while ((bytesRead = inputStream.read(buffer)) != -1) {
-                        outputStream.write(buffer, 0, bytesRead);
-                        downloaded += bytesRead;
-                        if (contentLength > 0) {
-                            int percentDownloaded = (int) ((downloaded / (double) contentLength) * 100);
-                            // Update every 5 percent or on completion
-                            if (percentDownloaded - lastReportedPercent >= 5 || percentDownloaded == 100) {
-                                logger.debug("Downloaded {}% from {}", downloaded, fileURL);
-                                lastReportedPercent = percentDownloaded;
-                            }
-                        }
-                    }
-                }
-                logger.info("File {} downloaded successfully using {}.", fileURL, savePath);
-            } else {
-                logger.error("No file to download {}. Server replied with code: {}", fileURL, responseCode);
-                return false;
-            }
-        } catch (IOException ex) {
-            logger.error("Failed to download {} due to: {}", fileURL, ex.getMessage(), ex);
-            return false;
-        } finally {
-            if (httpConn != null) {
-                httpConn.disconnect();
-            }
-        }
-        return true;
-    }
 }