Minor fixes to mysql script and refactoring

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java

@@ -433,6 +433,7 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI {
     @Override
     @GET
     @Path("/image-artifacts/{uuid}")
+    @Produces(MediaType.APPLICATION_OCTET_STREAM)
     public Response getApplicationImageArtifacts(@PathParam("uuid") String applicationUUID,
             @QueryParam("name") String name, @QueryParam("count") int count) {
         if (name == null || name.isEmpty()) {

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationReleaseManager.java

@@ -25,7 +25,7 @@ import java.util.List;
 
 /**
  * ApplicationReleaseManager is responsible for handling all the operations related with
- * {@link org.wso2.carbon.device.application.mgt.common.ApplicationRelease} which involving addition, updation ,
+ * {@link org.wso2.carbon.device.application.mgt.common.ApplicationRelease} which involving addition, updating ,
  * deletion and viewing.
  *
  */

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/common/Util.java

@@ -27,7 +27,6 @@ import org.wso2.carbon.device.application.mgt.common.Lifecycle;
 import org.wso2.carbon.device.application.mgt.common.LifecycleState;
 import org.wso2.carbon.device.application.mgt.common.Platform;
 import org.wso2.carbon.device.application.mgt.common.User;
-import org.wso2.carbon.device.application.mgt.core.util.JSONUtil;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

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

@@ -138,7 +138,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
                     + "LS.DESCRIPTION AS LS_DESCRIPTION FROM APPM_APPLICATION AS APP INNER JOIN APPM_PLATFORM AS "
                     + "APL ON APP.PLATFORM_ID = APL.ID INNER JOIN APPM_APPLICATION_CATEGORY AS CAT ON "
                     + "APP.APPLICATION_CATEGORY_ID = CAT.ID INNER JOIN APPM_LIFECYCLE_STATE AS "
-                    + "LS ON APP.LIFECYCLE_STATE_ID = LS.ID WHERE APP.TENANT_ID = ?";
+                    + "LS ON APP.LIFECYCLE_STATE_ID = LS.ID WHERE APP.TENANT_ID = ? ";
 
             if (filter.getSearchQuery() != null && !filter.getSearchQuery().isEmpty()) {
                 sql += "AND APP.NAME LIKE ? ";
@@ -181,11 +181,14 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             applicationList.setApplications(applications);
             applicationList.setPagination(pagination);
         } catch (SQLException e) {
-            throw new ApplicationManagementDAOException("Error occurred while getting application List", e);
+            throw new ApplicationManagementDAOException("Error occurred while getting application list for the tenant"
+                    + " " + tenantId + ". While executing " + sql, e);
         } catch (JSONException e) {
-            throw new ApplicationManagementDAOException("Error occurred while parsing JSON", e);
+            throw new ApplicationManagementDAOException("Error occurred while parsing JSON, while getting application"
+                    + " list for the tenant " + tenantId, e);
         } catch (DBConnectionException e) {
-            throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection.", e);
+            throw new ApplicationManagementDAOException("Error occurred while obtaining the DB connection while "
+                    + "getting application list for the tenant " + tenantId, e);
         } finally {
             Util.cleanupResources(stmt, rs);
         }
@@ -385,7 +388,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             statement.setInt(1, count);
             statement.setString(2, applicationUUID);
             statement.setInt(3, tenantId);
-
+            statement.executeUpdate();
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Database connection while trying to update the screen-shot "
                     + "count for the application with UUID " + applicationUUID + " for the tenant " + tenantId);

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

@@ -96,20 +96,25 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager
             }
             try {
                 ConnectionManagerUtil.beginDBTransaction();
-                DAOFactory.getApplicationDAO().updateScreenShotCount(applicationUUID, tenantId, count);
+                DAOFactory.getApplicationDAO().updateScreenShotCount(applicationUUID, tenantId, count - 1);
-                ConnectionManagerUtil.closeDBConnection();
+                ConnectionManagerUtil.commitDBTransaction();
             } catch (TransactionManagementException e) {
+                ConnectionManagerUtil.rollbackDBTransaction();
                 throw new ApplicationStorageManagementException("Transaction Management exception while trying to "
                         + "update the screen-shot count of the application " + applicationUUID + " for the tenant "
                         + tenantId, e);
             } catch (DBConnectionException e) {
+                ConnectionManagerUtil.rollbackDBTransaction();
                 throw new ApplicationStorageManagementException("Database connection management exception while "
                         + "trying to update the screen-shot count for the application " + applicationUUID + " for the"
                         + " tenant " + tenantId, e);
             } catch (ApplicationManagementDAOException e) {
+                ConnectionManagerUtil.rollbackDBTransaction();
                 throw new ApplicationStorageManagementException("Application Management DAO exception while trying to"
                         + " update the screen-shot count for the application " + applicationUUID + " for the tenant "
                         + tenantId, e);
+            } finally {
+                ConnectionManagerUtil.closeDBConnection();
             }
         }
     }

features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql

@@ -305,8 +305,8 @@ CREATE TABLE IF NOT EXISTS `APPM_PLATFORM_TENANT_MAPPING` (
   CONSTRAINT `fk_APPM_PLATFORM_TENANT_MAPPING_APPM_SUPPORTED_PLATFORM1`
   FOREIGN KEY (`PLATFORM_ID`)
   REFERENCES `APPM_PLATFORM` (`ID`)
-    ON DELETE NO ACTION
+    ON DELETE CASCADE
-    ON UPDATE NO ACTION)
+    ON UPDATE CASCADE )
   ENGINE = InnoDB
   COMMENT = 'This table contains the data related relationship between application platofrm and appication mappings';