Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core

Jenkinsfile

@@ -5,7 +5,6 @@ pipeline {
     environment {
         def isPendingUpstreamDependenciesExists = false
         def triggeredViaPush = false
-        SCANNER_HOME = tool 'sonar-scanner'
         JAVA_HOME = '/usr/lib/jvm/java-11-openjdk'
         PATH = "${JAVA_HOME}/bin:${env.PATH}" 
     }
@@ -49,22 +48,6 @@ pipeline {
             }
         }
 
-       stage('Check SonarQube Installation') {
-	steps {
-        script {
-            echo "Initial JAVA_HOME: ${env.JAVA_HOME}"
-            echo "Initial PATH: ${env.PATH}"
-            
-            withEnv(["JAVA_HOME=${env.JAVA_HOME}", "PATH=${env.JAVA_HOME}/bin:${env.PATH}"]) {
-                sh """
-                java -version
-                ${SCANNER_HOME}/bin/sonar-scanner --version
-                """
-            }
-        }
-    }
-}
-
         stage('Fetch Pending Upstream Dependencies') {
             steps {
                 script {
@@ -112,24 +95,6 @@ pipeline {
             }
         }
 
-       stage('Code Quality Check') {
-    steps {
-        script {
-            def projectName = "device-mgt-core-${env.CHANGE_ID}"
-            def projectKey = "device-mgt-core-${env.CHANGE_ID}"
-            
-            withSonarQubeEnv('sonar') {
-                sh """
-                    $SCANNER_HOME/bin/sonar-scanner \
-                    -Dsonar.projectName=${projectName} \
-                    -Dsonar.projectKey=${projectKey} \
-                    -Dsonar.java.binaries=target
-                """
-            }
-        }
-    }
-}
-
         stage('Report Job Status') {
             steps {
                 script {

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java

@@ -48,6 +48,8 @@ import org.apache.commons.validator.routines.UrlValidator;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.ws.rs.core.Response;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -503,31 +505,29 @@ public class APIUtil {
         applicationRelease.setSupportedOsVersions(applicationReleaseDTO.getSupportedOsVersions());
         applicationRelease.setRating(applicationReleaseDTO.getRating());
         applicationRelease.setIconPath(
-                basePath + Constants.ICON_ARTIFACT + Constants.FORWARD_SLASH + applicationReleaseDTO.getIconName());
+                basePath + Constants.ICON_ARTIFACT + Constants.FILE_NAME_PARAM +
-
+                        URLEncoder.encode(applicationReleaseDTO.getIconName(), StandardCharsets.UTF_8));
         if (!StringUtils.isEmpty(applicationReleaseDTO.getBannerName())) {
             applicationRelease.setBannerPath(
-                    basePath + Constants.BANNER_ARTIFACT + Constants.FORWARD_SLASH + applicationReleaseDTO
+                    basePath + Constants.BANNER_ARTIFACT + Constants.FILE_NAME_PARAM +
-                            .getBannerName());
+                            URLEncoder.encode(applicationReleaseDTO.getBannerName(), StandardCharsets.UTF_8));
         }
-
+        applicationRelease.setInstallerPath(
-        applicationRelease.setInstallerPath(constructInstallerPath(applicationReleaseDTO.getInstallerName(),
+                constructInstallerPath(applicationReleaseDTO.getInstallerName(), applicationReleaseDTO.getAppHashValue()));
-                applicationReleaseDTO.getAppHashValue()));
-
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName1())) {
-            screenshotPaths
+            screenshotPaths.add(
-                    .add(basePath + Constants.SCREENSHOT_ARTIFACT + 1 + Constants.FORWARD_SLASH + applicationReleaseDTO
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 1 + Constants.FILE_NAME_PARAM +
-                            .getScreenshotName1());
+                            URLEncoder.encode(applicationReleaseDTO.getScreenshotName1(), StandardCharsets.UTF_8));
         }
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName2())) {
-            screenshotPaths
+            screenshotPaths.add(
-                    .add(basePath + Constants.SCREENSHOT_ARTIFACT + 2 + Constants.FORWARD_SLASH + applicationReleaseDTO
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 2 + Constants.FILE_NAME_PARAM +
-                            .getScreenshotName2());
+                            URLEncoder.encode(applicationReleaseDTO.getScreenshotName2(), StandardCharsets.UTF_8));
         }
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName3())) {
-            screenshotPaths
+            screenshotPaths.add(
-                    .add(basePath + Constants.SCREENSHOT_ARTIFACT + 3 + Constants.FORWARD_SLASH + applicationReleaseDTO
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 3 + Constants.FILE_NAME_PARAM +
-                            .getScreenshotName3());
+                            URLEncoder.encode(applicationReleaseDTO.getScreenshotName3(), StandardCharsets.UTF_8));
         }
         applicationRelease.setScreenshots(screenshotPaths);
         return applicationRelease;
@@ -543,9 +543,12 @@ public class APIUtil {
     public static String constructInstallerPath(String installerName, String appHash) throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         UrlValidator urlValidator = new UrlValidator();
-        String basePath = getArtifactDownloadBaseURL() + tenantId + Constants.FORWARD_SLASH + appHash + Constants.FORWARD_SLASH;
+        String basePath = getArtifactDownloadBaseURL() + tenantId + Constants.FORWARD_SLASH +
-        return urlValidator.isValid(installerName) ? installerName
+                appHash + Constants.FORWARD_SLASH;
-                : basePath + Constants.APP_ARTIFACT + Constants.FORWARD_SLASH + installerName;
+        return urlValidator.isValid(installerName)
+                ? installerName
+                : basePath + Constants.APP_ARTIFACT + Constants.FILE_NAME_PARAM +
+                URLEncoder.encode(installerName, StandardCharsets.UTF_8);
     }
 
     public static String getArtifactDownloadBaseURL() throws ApplicationManagementException {

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/Constants.java

@@ -140,6 +140,11 @@ public class Constants {
         public static final String DB_TYPE_POSTGRESQL = "PostgreSQL";
     }
 
+    /**
+     * Query parameter for specifying the filename in the App artifact URL.
+     */
+    public static final String FILE_NAME_PARAM = "?fileName=";
+
     /**
      * Directory name of the icon artifact that are saved in the file system.
      */