Fix the validation issue when the APK file and screenshot names contain spaces

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

@@ -483,8 +483,6 @@ public class APIUtil {
         return application;
     }
 
-    private static final String FILE_NAME_PARAM = "?fileName=";
-
     public static ApplicationRelease releaseDtoToRelease(ApplicationReleaseDTO applicationReleaseDTO)
             throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
@@ -507,28 +505,28 @@ public class APIUtil {
         applicationRelease.setSupportedOsVersions(applicationReleaseDTO.getSupportedOsVersions());
         applicationRelease.setRating(applicationReleaseDTO.getRating());
         applicationRelease.setIconPath(
-                basePath + Constants.ICON_ARTIFACT + FILE_NAME_PARAM +
+                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 + FILE_NAME_PARAM +
+                    basePath + Constants.BANNER_ARTIFACT + Constants.FILE_NAME_PARAM +
                             URLEncoder.encode(applicationReleaseDTO.getBannerName(), StandardCharsets.UTF_8));
         }
         applicationRelease.setInstallerPath(
                 constructInstallerPath(applicationReleaseDTO.getInstallerName(), applicationReleaseDTO.getAppHashValue()));
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName1())) {
             screenshotPaths.add(
-                    basePath + Constants.SCREENSHOT_ARTIFACT + 1 + FILE_NAME_PARAM +
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 1 + Constants.FILE_NAME_PARAM +
                             URLEncoder.encode(applicationReleaseDTO.getScreenshotName1(), StandardCharsets.UTF_8));
         }
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName2())) {
             screenshotPaths.add(
-                    basePath + Constants.SCREENSHOT_ARTIFACT + 2 + FILE_NAME_PARAM +
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 2 + Constants.FILE_NAME_PARAM +
                             URLEncoder.encode(applicationReleaseDTO.getScreenshotName2(), StandardCharsets.UTF_8));
         }
         if (!StringUtils.isEmpty(applicationReleaseDTO.getScreenshotName3())) {
             screenshotPaths.add(
-                    basePath + Constants.SCREENSHOT_ARTIFACT + 3 + FILE_NAME_PARAM +
+                    basePath + Constants.SCREENSHOT_ARTIFACT + 3 + Constants.FILE_NAME_PARAM +
                             URLEncoder.encode(applicationReleaseDTO.getScreenshotName3(), StandardCharsets.UTF_8));
         }
         applicationRelease.setScreenshots(screenshotPaths);
@@ -549,7 +547,7 @@ public class APIUtil {
                 appHash + Constants.FORWARD_SLASH;
         return urlValidator.isValid(installerName)
                 ? installerName
-                : basePath + Constants.APP_ARTIFACT + FILE_NAME_PARAM +
+                : basePath + Constants.APP_ARTIFACT + Constants.FILE_NAME_PARAM +
                 URLEncoder.encode(installerName, StandardCharsets.UTF_8);
     }
 

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.
      */