Merge branch 'publisher-fix' into 'master'

Fix app name validation issue for webclips

Closes product-iots#509

See merge request entgra/carbon-device-mgt!539

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -1894,16 +1894,23 @@ public class ApplicationManagerImpl implements ApplicationManager {
         DeviceManagementProviderService deviceManagementProviderService = DataHolder.getInstance()
                 .getDeviceManagementService();
         try {
-            DeviceType deviceType = deviceManagementProviderService.getDeviceType(deviceTypeName);
-            if (deviceType == null) {
-                String msg = "Device type doesn't exist. Hence check the application name existence with valid "
-                        + "device type name.";
-                log.error(msg);
-                throw new BadRequestException(msg);
+            int deviceTypeId;
+            if (!deviceTypeName.equals(Constants.ALL)) {
+                DeviceType deviceType = deviceManagementProviderService.getDeviceType(deviceTypeName);
+                deviceTypeId = deviceType.getId();
+                if (deviceType == null) {
+                    String msg = "Device type doesn't exist. Hence check the application name existence with valid "
+                            + "device type name.";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
+            } else {
+                //For web-clips device type = 'ALL'
+                deviceTypeId = 0;
             }
             try {
                 ConnectionManagerUtil.openDBConnection();
-                if (applicationDAO.isExistingAppName(appName, deviceType.getId(), tenantId)) {
+                if (applicationDAO.isExistingAppName(appName, deviceTypeId, tenantId)) {
                     return true;
                 }
             } catch (DBConnectionException e) {

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java

@@ -48,6 +48,7 @@ public class Constants {
     public static final String FORWARD_SLASH = "/";
     public static final String ANY = "ANY";
     public static final String DEFAULT_PCK_NAME = "default.app.com";
+    public static final String ALL = "ALL";
 
     public static final String GOOGLE_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=";
     public static final String APPLE_STORE_URL = "https://itunes.apple.com/country/app/app-name/id";