Merge branch 'dev-1' into 'master'

Fix validation of appname when a webclip is created

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

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java

@@ -1737,12 +1737,24 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                 + "AP_APP.NAME = ? AND "
                 + "AP_APP.DEVICE_TYPE_ID = ? AND "
                 + "AP_APP.TENANT_ID = ?";
+        if(deviceTypeId != -1){
+            sql = "SELECT AP_APP.ID AS ID "
+                    + "FROM AP_APP "
+                    + "WHERE "
+                    + "AP_APP.NAME = ? AND "
+                    + "AP_APP.TENANT_ID = ?";
+        }
         try {
             Connection conn = this.getDBConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql)){
+                if(deviceTypeId != -1){
+                    stmt.setString(1, appName);
+                    stmt.setInt(2, tenantId);
+                } else {
                     stmt.setString(1, appName);
                     stmt.setInt(2, deviceTypeId);
                     stmt.setInt(3, tenantId);
+                }
                 try (ResultSet rs = stmt.executeQuery()){
                     return rs.next();
                 }