refactor

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java

@@ -186,8 +186,7 @@ public Long getRemoteFileSize(String url, String format) {
                 SSLContext context = getSSLContext();
                 urlConnection.setSSLSocketFactory(context.getSocketFactory());
                 urlConnection.connect();
-                boolean isCompressed = UriUtils.COMMPRESSION_FORMATS.stream().anyMatch(f -> !url.toLowerCase().endsWith(f));
-                return QCOW2Utils.getVirtualSize(urlObj.openStream(), isCompressed);
+                return QCOW2Utils.getVirtualSize(urlObj.openStream(), UriUtils.isUrlForCompressedFile(url));
             } catch (IOException e) {
                 throw new CloudRuntimeException(String.format("Cannot obtain qcow2 virtual size due to: %s", e.getMessage()), e);
             }

utils/src/main/java/com/cloud/utils/UriUtils.java

@@ -408,14 +408,14 @@ public static List<String> getMetalinkUrls(String metalinkUrl) {
         return urls;
     }
 
-    public static final Set<String> COMMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz");
+    public static final Set<String> COMPRESSION_FORMATS = ImmutableSet.of("zip", "bz2", "gz");
 
     public static final Set<String> buildExtensionSet(boolean metalink, String... baseExtensions) {
         final ImmutableSet.Builder<String> builder = ImmutableSet.builder();
 
         for (String baseExtension : baseExtensions) {
             builder.add("." + baseExtension);
-            for (String format : COMMPRESSION_FORMATS) {
+            for (String format : COMPRESSION_FORMATS) {
                 builder.add("." + baseExtension + "." + format);
             }
         }
@@ -647,4 +647,8 @@ private static UriInfo getRbdUrlInfo(String url) {
             throw new CloudRuntimeException(url + " is not a valid uri for RBD");
         }
     }
+
+    public static boolean isUrlForCompressedFile(String url) {
+        return UriUtils.COMPRESSION_FORMATS.stream().anyMatch(f -> url.toLowerCase().endsWith(f));
+    }
 }

utils/src/main/java/com/cloud/utils/storage/QCOW2Utils.java

@@ -115,8 +115,7 @@ private static long getVirtualSizeFromInputStream(InputStream inputStream) throw
     public static long getVirtualSize(String urlStr) {
         try {
             URL url = new URL(urlStr);
-            boolean isCompressed = UriUtils.COMMPRESSION_FORMATS.stream().anyMatch(f -> !urlStr.toLowerCase().endsWith(f));
-            return getVirtualSize(url.openStream(), isCompressed);
+            return getVirtualSize(url.openStream(), UriUtils.isUrlForCompressedFile(urlStr));
         } catch (MalformedURLException e) {
             LOGGER.warn("Failed to validate for qcow2, malformed URL: " + urlStr + ", error: " + e.getMessage());
             throw new IllegalArgumentException("Invalid URL: " + urlStr);

utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java

@@ -101,7 +101,7 @@ public static boolean isCorrectExtension(String path, String format) {
 
     public static boolean isCompressedExtension(String path) {
         final String lowerCasePath = path.toLowerCase();
-        return UriUtils.COMMPRESSION_FORMATS
+        return UriUtils.COMPRESSION_FORMATS
                        .stream()
                        .map(extension -> "." + extension)
                        .anyMatch(lowerCasePath::endsWith);

utils/src/test/java/com/cloud/utils/UriUtilsTest.java

@@ -19,13 +19,13 @@
 
 package com.cloud.utils;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.Assert;
+import org.junit.Test;
+
 public class UriUtilsTest {
     @Test
     public void encodeURIComponent() {
@@ -265,4 +265,12 @@ public void testGetUriInfoIpv6() {
         testGetUriInfoInternal(url11, host);
         testGetUriInfoInternal(url12, host);
     }
+
+    @Test
+    public void testIsUrlForCompressedFile() {
+        Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.bz2"));
+        Assert.assertTrue(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.zip"));
+        Assert.assertTrue(UriUtils.isUrlForCompressedFile("https://abc.com/xyz.gz"));
+        Assert.assertFalse(UriUtils.isUrlForCompressedFile("http://abc.com/xyz.qcow2"));
+    }
 }