Improve life cycle manager

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

@@ -80,33 +80,4 @@ public interface ConfigRetrieveAPI {
                             response = ErrorResponse.class)
             })
     Response getUiConfig();
-
-    @GET
-    @Path("/lifecycle-config")
-    @Produces(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "GET",
-            value = "get application management UI configuration",
-            notes = "This will get all UI configuration of application management"
-    )
-    @ApiResponses(
-            value = {
-                    @ApiResponse(
-                            code = 200,
-                            message = "OK. \n Successfully got Lifecycle Config.",
-                            response = ApplicationList.class),
-                    @ApiResponse(
-                            code = 404,
-                            message = "Not Found. There doesn't have an defined <LifecycleStates> in app management "
-                                    + "configuration file." +
-                                    "query."),
-                    @ApiResponse(
-                            code = 500,
-                            message = "Internal Server Error. \n Error occurred while getting the lifecycle config.",
-                            response = ErrorResponse.class)
-            })
-    Response getLifecycleConfig();
-
 }

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

@@ -54,19 +54,4 @@ public class ConfigRetrieveAPIImpl implements ConfigRetrieveAPI {
         }
         return Response.status(Response.Status.OK).entity(uiConfiguration).build();
     }
-
-    @GET
-    @Override
-    @Consumes("application/json")
-    @Path("/lifecycle-config")
-    public Response getLifecycleConfig() {
-        AppmDataHandler dataHandler = APIUtil.getDataHandler();
-        try {
-            return Response.status(Response.Status.OK).entity(dataHandler.getLifecycleConfiguration()).build();
-        } catch (LifecycleManagementException e) {
-            String msg = "Error Occurred while accessing lifecycle manager.";
-            log.error(msg);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
-        }
-    }
 }

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

@@ -23,6 +23,6 @@ package org.wso2.carbon.device.application.mgt.common;
  * States of the Application.
  */
 public enum AppLifecycleState {
-    CREATED, IN_REVIEW, PUBLISHED, APPROVED, UNPUBLISHED, REJECTED, DEPRECATED, REMOVED
+    CREATED, IN_REVIEW, PUBLISHED, APPROVED, BLOCKED, REJECTED, DEPRECATED, RETIRED
 }
 

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

@@ -1,51 +0,0 @@
-package org.wso2.carbon.device.application.mgt.common;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * This class represents the state of the lifecycle
- */
-public class State {
-
-    private Set<String> proceedingStates;
-    private String stateName;
-    private String permission;
-    private boolean isAppUpdatable;
-    private boolean isAppInstallable;
-    private boolean isInitialState;
-    private boolean isEndState;
-
-    public State(String stateName, List<String> states, String permission, boolean isAppUpdatable,
-                 boolean isAppInstallable, boolean isInitialState, boolean isEndState) {
-        this.stateName = stateName;
-        this.permission = permission;
-        this.isAppUpdatable=isAppUpdatable;
-        this.isAppInstallable=isAppInstallable;
-        this.isInitialState=isInitialState;
-        this.isEndState=isEndState;
-        if (states != null && !states.isEmpty()) {
-            proceedingStates = new HashSet<>(states);
-        }
-    }
-
-    public String getState() {
-        return stateName;
-    }
-
-    public Set<String> getProceedingStates() {
-        return proceedingStates;
-    }
-
-    public String getPermission(){ return permission;}
-
-    public boolean isAppUpdatable(){ return isAppUpdatable;}
-
-    public boolean isAppInstallable(){ return isAppInstallable;}
-
-    public boolean isInitialState(){ return isInitialState;}
-
-    public boolean isEndState(){ return isEndState;}
-
-}

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/config/LifecycleState.java

@@ -19,6 +19,7 @@ public class LifecycleState {
     private boolean isAppUpdatable;
     private boolean isInitialState;
     private boolean isEndState;
+    private boolean isDeletableState;
 
     @XmlAttribute(name = "name")
     public String getName() {
@@ -84,4 +85,8 @@ public class LifecycleState {
         this.isEndState = isEndState;
     }
 
+    @XmlElement(name = "IsDeletableState")
+    public boolean isDeletableState() { return isDeletableState; }
+
+    public void setDeletableState(boolean deletableState) { isDeletableState = deletableState; }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/dto/ApplicationDTO.java

@@ -86,7 +86,7 @@ public class ApplicationDTO {
     @ApiModelProperty(name = "status",
             value = "Application status",
             required = true,
-            example = "REMOVED, ACTIVE")
+            example = "RETIRED, ACTIVE")
     private String status;
 
     @ApiModelProperty(name = "applicationReleaseDTOs",

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

@@ -69,14 +69,21 @@ public interface ApplicationManager {
      */
     void deleteApplication(int applicationId) throws ApplicationManagementException;
 
+    /**
+     * Retire an application identified by the unique ID.
+     *
+     * @param applicationId ID for tha application
+     * @throws ApplicationManagementException ApplicationDTO Management Exception
+     */
+    void retireApplication(int applicationId) throws ApplicationManagementException;
+
     /**
      * Delete an application identified by the unique ID.
      *
-     * @param applicationId ID of tha application
      * @param releaseUuid UUID of tha application release
      * @throws ApplicationManagementException ApplicationDTO Management Exception
      */
-    void deleteApplicationRelease(int applicationId, String releaseUuid) throws ApplicationManagementException;
+    void deleteApplicationRelease(String releaseUuid) throws ApplicationManagementException;
 
     /**
      * To get the applications based on the search filter.

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

@@ -17,7 +17,7 @@
 
 package org.wso2.carbon.device.application.mgt.common.services;
 
-import org.wso2.carbon.device.application.mgt.common.State;
+import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
 import org.wso2.carbon.device.application.mgt.common.config.UIConfiguration;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
@@ -33,7 +33,7 @@ public interface AppmDataHandler {
      */
     UIConfiguration getUIConfiguration();
 
-    Map<String, State> getLifecycleConfiguration() throws LifecycleManagementException;
+    Map<String, LifecycleState> getLifecycleConfiguration() throws LifecycleManagementException;
 
     InputStream getArtifactStream(String uuid, String artifactName) throws ApplicationManagementException;
 }

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

@@ -176,7 +176,7 @@ public interface ApplicationDAO {
      * @param appId     ID of the application.
      * @throws ApplicationManagementDAOException ApplicationDTO Management DAO Exception.
      */
-    void deleteApplication(int appId) throws ApplicationManagementDAOException;
+    void retireApplication(int appId) throws ApplicationManagementDAOException;
 
     /**
      * To get the application count that satisfies gives search query.

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

@@ -19,7 +19,6 @@
 package org.wso2.carbon.device.application.mgt.core.dao;
 
 import org.wso2.carbon.device.application.mgt.common.dto.ApplicationReleaseDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationReleaseArtifactPaths;
 import org.wso2.carbon.device.application.mgt.common.Rating;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 
@@ -112,10 +111,9 @@ public interface ApplicationReleaseDAO {
      * To delete a particular release.
      *
      * @param id      ID of the ApplicationDTO which the release need to be deleted.
-     * @param version Version of the ApplicationDTO Release
      * @throws ApplicationManagementDAOException ApplicationDTO Management DAO Exception.
      */
-    void deleteRelease(int id, String version) throws ApplicationManagementDAOException;
+    void deleteRelease(int id) throws ApplicationManagementDAOException;
 
     /**
      * To get release details of a specific application.

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

@@ -69,12 +69,12 @@ public interface LifecycleStateDAO {
             throws LifeCycleManagementDAOException;
 
     /**
-     * To delete a specific lifecycle state for application release.
+     * To delete lifecycle state data of specific application release.
-     * @param identifier Id of the LifecycleStateDTO.
+     * @param releaseId Id of the LifecycleStateDTO.
      *
      * @throws LifeCycleManagementDAOException Lifecycle Management DAO Exception.
      */
-    void deleteLifecycleState(int identifier) throws LifeCycleManagementDAOException;
+    void deleteLifecycleStateByReleaseId(int releaseId) throws LifeCycleManagementDAOException;
 
     /***
      *

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

@@ -88,7 +88,7 @@ public interface SubscriptionDAO {
     void subscribeGroupToApplication(int tenantId, String subscribedBy, List<DeviceGroup> groupList, int appId,
             int releaseId) throws ApplicationManagementDAOException;
 
-    public List<DeviceSubscriptionDTO> getDeviceSubscriptions(int appReleaseId, int tenantId) throws
+    List<DeviceSubscriptionDTO> getDeviceSubscriptions(int appReleaseId, int tenantId) throws
             ApplicationManagementDAOException;
 
 }

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

@@ -456,7 +456,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, releaseUuid);
             stmt.setInt(2, tenantId);
-            stmt.setString(3, AppLifecycleState.REMOVED.toString());
+            stmt.setString(3, AppLifecycleState.RETIRED.toString());
             rs = stmt.executeQuery();
 
             if (log.isDebugEnabled()) {
@@ -619,14 +619,14 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
     }
 
     @Override
-    public void deleteApplication(int appId) throws ApplicationManagementDAOException {
+    public void retireApplication(int appId) throws ApplicationManagementDAOException {
         Connection conn;
         PreparedStatement stmt = null;
         try {
             conn = this.getDBConnection();
             String sql = "UPDATE AP_APP SET STATUS = ? WHERE ID = ? ";
             stmt = conn.prepareStatement(sql);
-            stmt.setString(1, AppLifecycleState.REMOVED.toString());
+            stmt.setString(1, AppLifecycleState.RETIRED.toString());
             stmt.setInt(2, appId);
             stmt.executeUpdate();
 

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

@@ -490,30 +490,25 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         return applicationReleaseDTO;
     }
 
-    /**
+    @Override
-     * To delete an application release.
+    public void deleteRelease(int id) throws ApplicationManagementDAOException {
-     *
-     * @param id      Id of the application Release.
-     * @param version version name of the application release.
-     * @throws ApplicationManagementDAOException ApplicationDTO Management DAO Exception.
-     */
-    @Override public void deleteRelease(int id, String version) throws ApplicationManagementDAOException {
         Connection connection;
         PreparedStatement statement = null;
-        String sql = "DELETE FROM AP_APP_RELEASE WHERE ID = ? AND VERSION = ?";
+        String sql = "DELETE "
+                + "FROM AP_APP_RELEASE "
+                + "WHERE ID = ?";
         try {
             connection = this.getDBConnection();
             statement = connection.prepareStatement(sql);
             statement.setInt(1, id);
-            statement.setString(2, version);
             statement.executeUpdate();
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException(
-                    "Database connection exception while trying to delete the release with version " + version, e);
+                    "Database connection exception while trying to delete the release fore release ID: " + id, e);
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
-                    "SQL exception while deleting the release with version " + version + ",while executing the query "
+                    "SQL exception while deleting the release for release ID: " + id  + ",while executing the query sql"
-                            + "sql", e);
+                    , e);
         } finally {
             Util.cleanupResources(statement, null);
         }

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

@@ -193,23 +193,22 @@ public class GenericLifecycleStateDAOImpl extends AbstractDAOImpl implements Lif
     }
 
     @Override
-    public void deleteLifecycleState(int identifier) throws LifeCycleManagementDAOException {
+    public void deleteLifecycleStateByReleaseId(int releaseId) throws LifeCycleManagementDAOException {
-        Connection conn = null;
+        Connection conn;
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
         try {
             conn = this.getDBConnection();
-            String sql = "DELETE FROM AP_APP_LIFECYCLE_STATE WHERE ID = ?";
+            String sql = "DELETE FROM " +
-            stmt = conn.prepareStatement(sql);
+                    "AP_APP_LIFECYCLE_STATE " +
-            stmt.setInt(1, identifier);
+                    "WHERE AP_APP_RELEASE_ID = ?";
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+                stmt.setInt(1, releaseId);
                 stmt.executeUpdate();
-
+            }
         } catch (DBConnectionException e) {
             throw new LifeCycleManagementDAOException("Error occurred while obtaining the DB connection.", e);
         } catch (SQLException e) {
-            throw new LifeCycleManagementDAOException("Error occurred while deleting lifecycle: " + identifier, e);
+            throw new LifeCycleManagementDAOException("Error occurred while deleting lifecycle for application "
-        } finally {
+                    + "release ID: " + releaseId, e);
-            Util.cleanupResources(stmt, rs);
         }
     }
 

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/exception/ApplicationManagementDAOException.java

@@ -21,7 +21,7 @@ import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManage
 /**
  * Exception thrown during the ApplicationDTO Management DAO operations.
  */
-public class ApplicationManagementDAOException extends ApplicationManagementException {
+public class ApplicationManagementDAOException extends Exception {
 
     public ApplicationManagementDAOException(String message, Throwable throwable) {
         super(message, throwable);

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

@@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.AppLifecycleState;
 import org.wso2.carbon.device.application.mgt.common.ApplicationArtifact;
 import org.wso2.carbon.device.application.mgt.common.ApplicationInstaller;
 import org.wso2.carbon.device.application.mgt.common.Pagination;
@@ -873,6 +872,10 @@ public class ApplicationManagerImpl implements ApplicationManager {
             String msg = "User-store exception while getting application with the application id " + appId;
             log.error(msg);
             throw new ApplicationManagementException(msg, e);
+        } catch (ApplicationManagementDAOException e) {
+            String msg = "Error occured when getting, either application tags or application categories";
+            log.error(msg);
+            throw new ApplicationManagementException(msg);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -919,6 +922,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
             String msg = "User-store exception while getting application with the application release UUID: " + uuid;
             log.error(msg);
             throw new ApplicationManagementException(msg, e);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -961,6 +967,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
         } catch (UserStoreException e) {
             throw new ApplicationManagementException(
                     "User-store exception while getting application with the application release UUID " + uuid);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -1057,6 +1066,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
         } catch (UserStoreException e) {
             throw new ApplicationManagementException(
                     "User-store exception while getting application with the " + "application name " + appName);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -1078,6 +1090,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
         } catch (UserStoreException e) {
             throw new ApplicationManagementException(
                     "User-store exception while getting application with the application UUID " + appReleaseUUID);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -1092,7 +1107,14 @@ public class ApplicationManagerImpl implements ApplicationManager {
             log.debug("Request is received to retrieve all the releases related with the application " + application
                     .toString());
         }
+        //todo
+        applicationReleases = null;
+        try {
             applicationReleases = this.applicationReleaseDAO.getReleases(application.getId(), tenantId);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
+        }
         for (ApplicationReleaseDTO applicationRelease : applicationReleases) {
             LifecycleStateDTO lifecycleState = null;
             try {
@@ -1169,7 +1191,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                 log.error(msg);
                 throw new ForbiddenException(msg);
             }
-            this.applicationDAO.deleteApplication(applicationId);
+            this.applicationDAO.retireApplication(applicationId);
             ConnectionManagerUtil.commitDBTransaction();
             applicationStorageManager.deleteAllApplicationReleaseArtifacts(storedLocations);
         } catch (ApplicationManagementDAOException e) {
@@ -1186,6 +1208,45 @@ public class ApplicationManagerImpl implements ApplicationManager {
         }
     }
 
+    @Override
+    public void retireApplication(int applicationId) throws ApplicationManagementException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+        ApplicationDTO applicationDTO;
+        if (log.isDebugEnabled()) {
+            log.debug("Request is received to delete applications which are related with the application id "
+                    + applicationId);
+        }
+        try {
+            ConnectionManagerUtil.beginDBTransaction();
+            applicationDTO = this.applicationDAO.getApplicationById(applicationId, tenantId);
+
+            if (applicationDTO == null) {
+                throw new NotFoundException("Couldn't found an application for Application ID: " + applicationId);
+            }
+            List<ApplicationReleaseDTO> applicationReleaseDTOs = applicationDTO.getApplicationReleaseDTOs();
+            List<ApplicationReleaseDTO> activeApplicationReleaseDTOs = new ArrayList<>();
+            for (ApplicationReleaseDTO applicationReleaseDTO : applicationReleaseDTOs) {
+                if (!applicationReleaseDTO.getCurrentState().equals(lifecycleStateManager.getEndState())) {
+                    activeApplicationReleaseDTOs.add(applicationReleaseDTO);
+                }
+            }
+            if (!activeApplicationReleaseDTOs.isEmpty()) {
+                String msg = "There are application releases which are not in the state " + lifecycleStateManager
+                        .getEndState() + ". Hence you are not allowed to delete the application";
+                log.error(msg);
+                throw new ForbiddenException(msg);
+            }
+            this.applicationDAO.retireApplication(applicationId);
+            ConnectionManagerUtil.commitDBTransaction();
+        } catch (ApplicationManagementDAOException e) {
+            String msg = "Error occurred when getting application data for application id: " + applicationId;
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
+        } finally {
+            ConnectionManagerUtil.closeDBConnection();
+        }
+    }
+
     private List<String> searchLifecycleStateFlow(String start, String finish) throws ApplicationManagementException {
         Map<String, String> nextNodeMap = new HashMap<>();
         List<String> directions = new LinkedList<>();
@@ -1201,7 +1262,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             if (currentNode.equals(finish)) {
                 break;
             } else {
-                Set<String> nextStates = lifecycleStateManager.getNextLifecycleStates(currentNode);
+                List<String> nextStates = lifecycleStateManager.getNextLifecycleStates(currentNode);
                 if (nextStates.contains(finish)) {
                     queue = new LinkedList<>();
                     queue.add(finish);
@@ -1234,7 +1295,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     @Override
-    public void deleteApplicationRelease(int applicationId, String releaseUuid)
+    public void deleteApplicationRelease(String releaseUuid)
             throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         ApplicationStorageManager applicationStorageManager = Util.getApplicationStorageManager();
@@ -1248,9 +1309,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
                 throw new NotFoundException(msg);
             }
 
-            if (!applicationReleaseDTO.getCurrentState().equals(lifecycleStateManager.getInitialState())) {
+            if (!lifecycleStateManager.isDeletableState(applicationReleaseDTO.getCurrentState())) {
-                String msg = "Application state is not in the initial state: " + lifecycleStateManager.getInitialState()
+                String msg = "Application state is not in the deletable state. Therefore you are not permitted to "
-                        + ". Therefore you are not permitted to delete the application release.";
+                        + "delete the application release.";
                 log.error(msg);
                 throw new ForbiddenException(msg);
             }
@@ -1264,61 +1325,22 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     throw new ForbiddenException(msg);
                 }
             }
-            //todo delete application release data ON delete cascade
             applicationStorageManager.deleteApplicationReleaseArtifacts(applicationReleaseDTO.getAppHashValue());
-
+            lifecycleStateDAO.deleteLifecycleStateByReleaseId(applicationReleaseDTO.getId());
-            //            LifecycleStateDTO appLifecycleState = this.lifecycleStateDAO
+            applicationReleaseDAO.deleteRelease(applicationReleaseDTO.getId());
-//                    .getLatestLifeCycleState(applicationId, releaseUuid);
-//            if (appLifecycleState == null) {
-//                throw new NotFoundException(
-//                        "Couldn't find an lifecycle sate for application ID: " + applicationId + " and UUID: "
-//                                + releaseUuid);
-//            }
-//            String currentState = appLifecycleState.getCurrentState();
-//            if (AppLifecycleState.DEPRECATED.toString().equals(currentState) || AppLifecycleState.REJECTED.toString()
-//                    .equals(currentState) || AppLifecycleState.UNPUBLISHED.toString().equals(currentState)) {
-//                LifecycleStateDTO newAppLifecycleState = getLifecycleStateInstance(AppLifecycleState.REMOVED.toString(),
-//                        appLifecycleState.getCurrentState());
-//                if (lifecycleStateManager.isValidStateChange(newAppLifecycleState.getPreviousState(),
-//                        newAppLifecycleState.getCurrentState(), userName, tenantId)) {
-//                    this.lifecycleStateDAO
-//                            .addLifecycleState(newAppLifecycleState, applicationId, applicationRelease.getUuid(),
-//                                    tenantId);
-//                    ConnectionManagerUtil.commitDBTransaction();
-//                } else {
-//                    List<String> lifecycleFlow = searchLifecycleStateFlow(currentState,
-//                            AppLifecycleState.REMOVED.toString());
-//                    for (String nextState : lifecycleFlow) {
-//                        LifecycleStateDTO lifecycleState = getLifecycleStateInstance(nextState, currentState);
-//                        if (lifecycleStateManager.isValidStateChange(currentState, nextState, userName, tenantId)) {
-//                            this.lifecycleStateDAO
-//                                    .addLifecycleState(lifecycleState, applicationId, applicationRelease.getUuid(),
-//                                            tenantId);
-//                        } else {
-//                            ConnectionManagerUtil.rollbackDBTransaction();
-//                            throw new ApplicationManagementException(
-//                                    "Can't delete the application release, You have to move the "
-//                                            + "lifecycle state from " + currentState + " to " + nextState);
-//                        }
-//                        currentState = nextState;
-//                    }
-//                }
-//            } else {
-//                throw new ApplicationManagementException(
-//                        "Can't delete the application release, You have to move the " + "lifecycle state from "
-//                                + currentState + " to acceptable " + "state");
-//            }
-//            return applicationReleaseDTO.getAppHashValue();
         } catch (ApplicationManagementDAOException e) {
             ConnectionManagerUtil.rollbackDBTransaction();
-            String msg = "Error ocured when getting application data or application release data for application id of "
+            String msg = "Error occurred when application release data for application release UUID: " + releaseUuid;
-                    + applicationId + " application release UUID of the " + releaseUuid;
+            throw new ApplicationManagementException(msg, e);
-            throw new ApplicationManagementDAOException(msg, e);
         } catch (ApplicationStorageManagementException e) {
-            ConnectionManagerUtil.rollbackDBTransaction();
+            String msg = "Error occurred when deleting the application release artifact from the file system. "
-            String msg = "Error occured when deleteing the application release artifact from the file system. Application release UUID: " + releaseUuid;
+                    + "Application release UUID: " + releaseUuid;
             log.error(msg);
             throw new ApplicationManagementException(msg, e);
+        } catch (LifeCycleManagementDAOException e) {
+            ConnectionManagerUtil.rollbackDBTransaction();
+            String msg = "Error occurred when dleting lifecycle data for application release UUID: " + releaseUuid;
+            throw new ApplicationManagementException(msg, e);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -1596,6 +1618,9 @@ public class ApplicationManagerImpl implements ApplicationManager {
             throw new ApplicationManagementException(
                     "Failed to add lifecycle state. ApplicationDTO Id: " + applicationId + " ApplicationDTO release UUID: "
                             + releaseUuid, e);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.application.mgt.core.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.State;
+import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
@@ -60,7 +60,7 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
     }
 
     @Override
-    public Map<String, State> getLifecycleConfiguration() throws LifecycleManagementException {
+    public Map<String, LifecycleState> getLifecycleConfiguration() throws LifecycleManagementException {
         return lifecycleStateManager.getLifecycleConfig();
     }
 

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

@@ -28,6 +28,7 @@ import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager
 import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager;
 import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
+import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;
 import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.application.mgt.core.util.HelperUtil;
@@ -109,6 +110,9 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             ConnectionManagerUtil.openDBConnection();
             subscriptionDAO.subscribeUserToApplication(tenantId, subscriber, userList, application.getId(),
                     applicationReleaseId);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -150,6 +154,9 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             ConnectionManagerUtil.openDBConnection();
             subscriptionDAO.subscribeRoleToApplication(tenantId, subscriber, roleList, application.getId(),
                     applicationReleaseId);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -194,6 +201,9 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             ConnectionManagerUtil.openDBConnection();
             subscriptionDAO.subscribeGroupToApplication(tenantId, subscriber, groupList, application.getId(),
                     applicationReleaseId);
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -252,6 +262,9 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             }
             subscriptionDAO.subscribeDeviceToApplication(tenantId, subscriber, deviceList, application.getId(),
                     applicationReleaseId, String.valueOf(AppOperation.InstallState.UNINSTALLED));
+        } catch (ApplicationManagementDAOException e) {
+            //todo
+            throw new ApplicationManagementException("");
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/lifecycle/LifecycleStateManager.java

@@ -19,7 +19,6 @@ package org.wso2.carbon.device.application.mgt.core.lifecycle;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.application.mgt.common.State;
 import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
 import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;
 import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
@@ -33,37 +32,35 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * This class represents the activities related to lifecycle management
  */
 public class LifecycleStateManager {
 
-    private Map<String, State> lifecycleStates;
+    private Map<String, LifecycleState> lifecycleStates;
     private static Log log = LogFactory.getLog(LifecycleStateManager.class);
 
     public void init(List<LifecycleState> states) throws LifecycleManagementException {
         lifecycleStates = new HashMap<>();
-        for (LifecycleState s : states) {
+        for (LifecycleState lifecycleState : states) {
-            if (s.getProceedingStates() != null) {
+            if (lifecycleState.getProceedingStates() != null) {
-                s.getProceedingStates().replaceAll(String::toUpperCase);
+                lifecycleState.getProceedingStates().replaceAll(String::toUpperCase);
             }
-            lifecycleStates.put(s.getName().toUpperCase(), new State(s.getName().toUpperCase(),
+            lifecycleStates.put(lifecycleState.getName(), lifecycleState);
-                    s.getProceedingStates(), s.getPermission(), s.isAppUpdatable(), s.isAppInstallable(),
-                    s.isInitialState(), s.isEndState()));
             try {
-                PermissionUtils.putPermission(s.getPermission());
+                PermissionUtils.putPermission(lifecycleState.getPermission());
             } catch (PermissionManagementException e) {
-                String msg = "Error when adding permission " + s.getPermission() + "  related to the state: "
+                String msg =
-                        + s.getName();
+                        "Error when adding permission " + lifecycleState.getPermission() + "  related to the state: "
+                                + lifecycleState.getName();
                 log.error(msg, e);
                 throw new LifecycleManagementException(msg, e);
             }
         }
     }
 
-    public Map<String, State> getLifecycleConfig() throws LifecycleManagementException {
+    public Map<String, LifecycleState> getLifecycleConfig() throws LifecycleManagementException {
         if (lifecycleStates == null) {
             String msg = "Lifecycle configuration in not initialized.";
             log.error(msg);
@@ -72,29 +69,27 @@ public class LifecycleStateManager {
         return lifecycleStates;
     }
 
-
+    public List<String> getNextLifecycleStates(String currentLifecycleState) {
-    public Set<String> getNextLifecycleStates(String currentLifecycleState) {
         return lifecycleStates.get(currentLifecycleState.toUpperCase()).getProceedingStates();
     }
 
-    public boolean isValidStateChange(String currentState, String nextState, String username, int tenantId) throws
+    public boolean isValidStateChange(String currentState, String nextState, String username, int tenantId)
-            LifecycleManagementException {
+            throws LifecycleManagementException {
-
         UserRealm userRealm;
         String permission = getPermissionForStateChange(nextState);
         if (permission != null) {
             try {
                 userRealm = DataHolder.getInstance().getRealmService().getTenantUserRealm(tenantId);
-                if (userRealm != null && userRealm.getAuthorizationManager() != null &&
+                if (userRealm != null && userRealm.getAuthorizationManager() != null && userRealm
-                        userRealm.getAuthorizationManager().isUserAuthorized(username,
+                        .getAuthorizationManager()
-                                PermissionUtils.getAbsolutePermissionPath(permission),
+                        .isUserAuthorized(username, PermissionUtils.getAbsolutePermissionPath(permission),
                                 Constants.UI_EXECUTE)) {
                     if (currentState.equalsIgnoreCase(nextState)) {
                         return true;
                     }
-                    State state = getMatchingState(currentState);
+                    LifecycleState matchingState = getMatchingState(currentState);
-                    if (state != null) {
+                    if (matchingState != null) {
-                        return getMatchingNextState(state.getProceedingStates(), nextState);
+                        return getMatchingNextState(matchingState.getProceedingStates(), nextState);
                     }
                     return false;
                 }
@@ -105,24 +100,22 @@ public class LifecycleStateManager {
                                 + nextState + " with username : " + username + " and tenant Id : " + tenantId, e);
             }
         } else {
-            throw new LifecycleManagementException(
+            throw new LifecycleManagementException("Required permissions cannot be found for the state : " + nextState);
-                    "Required permissions cannot be found for the state : " + nextState);
         }
     }
 
-    private State getMatchingState(String currentState) {
+    private LifecycleState getMatchingState(String currentState) {
-        for (Map.Entry<String, State> stringStateEntry : lifecycleStates.entrySet()) {
+        for (Map.Entry<String, LifecycleState> lifecycyleState : lifecycleStates.entrySet()) {
-            if (stringStateEntry.getKey().equalsIgnoreCase(currentState)) {
+            if (lifecycyleState.getKey().equalsIgnoreCase(currentState)) {
-                return lifecycleStates.get(stringStateEntry.getKey());
+                return lifecycyleState.getValue();
             }
         }
         return null;
     }
 
-
+    private boolean getMatchingNextState(List<String> proceedingStates, String nextState) {
-    private boolean getMatchingNextState(Set<String> proceedingStates, String nextState) {
+        for (String stateName : proceedingStates) {
-        for (String state : proceedingStates) {
+            if (stateName.equalsIgnoreCase(nextState)) {
-            if (state.equalsIgnoreCase(nextState)) {
                 return true;
             }
         }
@@ -131,7 +124,7 @@ public class LifecycleStateManager {
 
     private String getPermissionForStateChange(String nextState) {
         Iterator it = lifecycleStates.entrySet().iterator();
-        State nextLifecycleState;
+        LifecycleState nextLifecycleState;
         while (it.hasNext()) {
             Map.Entry pair = (Map.Entry) it.next();
             if (pair.getKey().toString().equalsIgnoreCase(nextState)) {
@@ -143,8 +136,19 @@ public class LifecycleStateManager {
         return null;
     }
 
+    public boolean isDeletableState(String state) throws LifecycleManagementException {
+        LifecycleState currentState = getMatchingState(state);
+        if (currentState != null) {
+            return currentState.isDeletableState();
+        } else {
+            String msg = "Couldn't find a lifecycle state that matches with " + state + " state.";
+            log.error(msg);
+            throw new LifecycleManagementException(msg);
+        }
+    }
+
     public boolean isUpdatableState(String state) throws LifecycleManagementException {
-        State currentState = getMatchingState(state);
+        LifecycleState currentState = getMatchingState(state);
         if (currentState != null) {
             return currentState.isAppUpdatable();
         } else {
@@ -155,7 +159,7 @@ public class LifecycleStateManager {
     }
 
     public boolean isInstallableState(String state) throws LifecycleManagementException {
-        State currentState = getMatchingState(state);
+        LifecycleState currentState = getMatchingState(state);
         if (currentState != null) {
             return currentState.isAppInstallable();
         } else {
@@ -166,7 +170,7 @@ public class LifecycleStateManager {
     }
 
     public boolean isInitialState(String state) throws LifecycleManagementException {
-        State currentState = getMatchingState(state);
+        LifecycleState currentState = getMatchingState(state);
         if (currentState != null) {
             return currentState.isInitialState();
         } else {
@@ -177,7 +181,7 @@ public class LifecycleStateManager {
     }
 
     public boolean isEndState(String state) throws LifecycleManagementException {
-        State currentState = getMatchingState(state);
+        LifecycleState currentState = getMatchingState(state);
         if (currentState != null) {
             return currentState.isEndState();
         } else {
@@ -188,25 +192,22 @@ public class LifecycleStateManager {
     }
 
     public String getInitialState() throws LifecycleManagementException {
-        String initialState = null;
+        String initialState;
-        for (Map.Entry<String, State> stringStateEntry : lifecycleStates.entrySet()) {
+        for (Map.Entry<String, LifecycleState> lifecycleState : lifecycleStates.entrySet()) {
-            if (stringStateEntry.getValue().isInitialState()) {
+            if (lifecycleState.getValue().isInitialState()) {
-                initialState = stringStateEntry.getKey();
+                initialState = lifecycleState.getKey();
-                break;
+                return initialState;
             }
         }
-        if (initialState == null){
         String msg = "Haven't defined the initial state in the application-manager.xml. Please add initial state "
                 + "to the <LifecycleStates> section in the app-manager.xml";
         log.error(msg);
         throw new LifecycleManagementException(msg);
     }
-        return initialState;
-    }
 
     public String getEndState() throws LifecycleManagementException {
         String endState = null;
-        for (Map.Entry<String, State> stringStateEntry : lifecycleStates.entrySet()) {
+        for (Map.Entry<String, LifecycleState> stringStateEntry : lifecycleStates.entrySet()) {
             if (stringStateEntry.getValue().isEndState()) {
                 endState = stringStateEntry.getKey();
                 break;
@@ -223,7 +224,7 @@ public class LifecycleStateManager {
 
     public String getInstallableState() throws LifecycleManagementException {
         String installableState = null;
-        for (Map.Entry<String, State> stringStateEntry : lifecycleStates.entrySet()) {
+        for (Map.Entry<String, LifecycleState> stringStateEntry : lifecycleStates.entrySet()) {
             if (stringStateEntry.getValue().isAppInstallable()) {
                 installableState = stringStateEntry.getKey();
                 break;
@@ -239,7 +240,7 @@ public class LifecycleStateManager {
     }
 
     public boolean isStateExist(String currentState) {
-        for (Map.Entry<String, State> stringStateEntry : lifecycleStates.entrySet()) {
+        for (Map.Entry<String, LifecycleState> stringStateEntry : lifecycleStates.entrySet()) {
             if (stringStateEntry.getKey().equalsIgnoreCase(currentState)) {
                 return true;
             }
@@ -247,8 +248,7 @@ public class LifecycleStateManager {
         return false;
     }
 
-
+    public void setLifecycleStates(Map<String, LifecycleState> lifecycleStates) {
-    public void setLifecycleStates(Map<String, State> lifecycleStates) {
         this.lifecycleStates = lifecycleStates;
     }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifeCycleStateManagerTest.java

@@ -1,25 +1,22 @@
 package org.wso2.carbon.device.application.mgt.core;
 
 import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManager;
-import org.wso2.carbon.device.application.mgt.common.State;
 import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
 
 import java.util.HashMap;
 import java.util.List;
 
 
-public class LifeCycleStateManagerTest extends LifecycleStateManager {
+class LifeCycleStateManagerTest extends LifecycleStateManager {
 
-    public void initializeLifeCycleDetails(List<LifecycleState> states) {
+    void initializeLifeCycleDetails(List<LifecycleState> lifecycleStates) {
-        HashMap<String, State> lifecycleStates = new HashMap<>();
+        HashMap<String, LifecycleState> lifecycleStatesMap = new HashMap<>();
-        for (LifecycleState s : states) {
+        for (LifecycleState lifecycleState : lifecycleStates) {
-            if (s.getProceedingStates() != null) {
+            if (lifecycleState.getProceedingStates() != null) {
-                s.getProceedingStates().replaceAll(String::toUpperCase);
+                lifecycleState.getProceedingStates().replaceAll(String::toUpperCase);
             }
-            lifecycleStates.put(s.getName().toUpperCase(), new State(s.getName().toUpperCase(),
+            lifecycleStatesMap.put(lifecycleState.getName().toUpperCase(), lifecycleState);
-                    s.getProceedingStates(), s.getPermission(), s.isAppUpdatable(), s.isAppInstallable(),
-                    s.isInitialState(), s.isEndState()));
         }
-        setLifecycleStates(lifecycleStates);
+        setLifecycleStates(lifecycleStatesMap);
     }
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/LifecycleManagementTest.java

@@ -10,7 +10,6 @@ import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManag
 import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
 
 import java.util.List;
-import java.util.Set;
 
 public class LifecycleManagementTest {
 
@@ -19,17 +18,16 @@ public class LifecycleManagementTest {
 
     private final String CURRENT_STATE = "Approved";
     private final String NEXT_STATE = "Published";
-    private final String BOGUS_STATE = "Removed";
+    private final String BOGUS_STATE = "Retired";
     private final String UPDATABLE_STATE = "Created";
-    private final String NON_UPDATABLE_STATE = "Removed";
+    private final String NON_UPDATABLE_STATE = "Retired";
     private final String INSTALLABLE_STATE = "Published";
-    private final String UNINSTALlABLE_STATE = "Removed";
     private final String INITIAL_STATE = "Created";
-    private final String END_STATE = "Removed";
+    private final String END_STATE = "Retired";
 
 
     @BeforeClass
-    public void init() throws LifecycleManagementException {
+    public void init() {
         ConfigurationManager configurationManager = ConfigurationManager.getInstance();
         Configuration configuration = configurationManager.getConfiguration();
         lifecycleStates = configuration.getLifecycleStates();
@@ -39,14 +37,14 @@ public class LifecycleManagementTest {
 
     @Test
     public void checkValidNextLifecycleState() {
-        Set<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
+        List<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
         Assert.assertTrue("Invalid proceeding state of: " + CURRENT_STATE,
                 proceedingStates.contains(NEXT_STATE.toUpperCase()));
     }
 
     @Test
     public void checkInvalidNextLifecycleState() {
-        Set<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
+        List<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
         Assert.assertFalse("Invalid proceeding state of: " + CURRENT_STATE,
                 proceedingStates.contains(BOGUS_STATE.toUpperCase()));
     }
@@ -70,12 +68,6 @@ public class LifecycleManagementTest {
         Assert.assertTrue("Installable state: " + INSTALLABLE_STATE, isInstallable);
     }
 
-    @Test
-    public void CheckUnInstallableState() throws LifecycleManagementException {
-        boolean isInstallable = lifecycleStateManager.isInstallableState(UNINSTALlABLE_STATE);
-        Assert.assertFalse("UnInstallable state: " + UNINSTALlABLE_STATE, isInstallable);
-    }
-
     @Test
     public void CheckGetInitialState() throws LifecycleManagementException {
         boolean isInitialState = lifecycleStateManager.getInitialState().equalsIgnoreCase(INITIAL_STATE);
@@ -126,7 +118,7 @@ public class LifecycleManagementTest {
 
     @Test
     public void check() {
-        Set<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
+        List<String> proceedingStates = lifecycleStateManager.getNextLifecycleStates(CURRENT_STATE);
         Assert.assertFalse("Invalid proceeding state of: " + CURRENT_STATE,
                 proceedingStates.contains(BOGUS_STATE.toUpperCase()));
     }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/resources/application-mgt.xml

@@ -76,58 +76,59 @@
         <LifecycleState name="Created">
             <IsAppUpdatable>true</IsAppUpdatable>
             <IsInitialState>true</IsInitialState>
-            <Permission>/device-mgt/applications/life-cycle/create</Permission>
+            <IsDeletableState>true</IsDeletableState>
+            <Permission>/app-mgt/life-cycle/application/create</Permission>
             <ProceedingStates>
                 <State>In-Review</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="In-Review">
-            <Permission>/device-mgt/applications/life-cycle/in-review</Permission>
+            <Permission>/app-mgt/life-cycle/application/review</Permission>
             <ProceedingStates>
                 <State>Rejected</State>
                 <State>Approved</State>
+                <State>Created</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Approved">
-            <Permission>/device-mgt/applications/life-cycle/approve</Permission>
+            <Permission>/app-mgt/life-cycle/application/approve</Permission>
             <ProceedingStates>
+                <State>In-Review</State>
                 <State>Published</State>
-                <State>Created</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Rejected">
-            <Permission>/device-mgt/applications/life-cycle/reject</Permission>
+            <IsDeletableState>true</IsDeletableState>
+            <Permission>/app-mgt/life-cycle/application/reject</Permission>
             <ProceedingStates>
-                <State>Created</State>
+                <State>In-Review</State>
-                <State>Removed</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Published">
             <IsAppInstallable>true</IsAppInstallable>
-            <Permission>/device-mgt/applications/life-cycle/publish</Permission>
+            <Permission>/app-mgt/life-cycle/application/publish</Permission>
             <ProceedingStates>
-                <State>Unpublished</State>
+                <State>Blocked</State>
                 <State>Deprecated</State>
             </ProceedingStates>
         </LifecycleState>
-        <LifecycleState name="Unpublished">
+        <LifecycleState name="Blocked">
-            <Permission>/device-mgt/applications/life-cycle/unpublish</Permission>
+            <Permission>/app-mgt/life-cycle/application/block</Permission>
             <ProceedingStates>
                 <State>Published</State>
-                <State>In-Review</State>
+                <State>Deprecated</State>
-                <State>Removed</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Deprecated">
-            <Permission>/device-mgt/applications/life-cycle/deprecate</Permission>
+            <Permission>/app-mgt/life-cycle/application/deprecate</Permission>
             <ProceedingStates>
-                <State>Removed</State>
+                <State>Published</State>
-                <State>In-Review</State>
+                <State>Retired</State>
             </ProceedingStates>
         </LifecycleState>
-        <LifecycleState name="Removed">
+        <LifecycleState name="Retired">
             <IsEndState>true</IsEndState>
-            <Permission>/device-mgt/applications/life-cycle/remove</Permission>
+            <Permission>/app-mgt/life-cycle/application/retire</Permission>
         </LifecycleState>
     </LifecycleStates>
 

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/ApplicationManagementPublisherAPI.java

@@ -45,7 +45,6 @@ import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper;
 import java.util.List;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -416,15 +415,15 @@ public interface ApplicationManagementPublisherAPI {
             @Multipart(value = "screenshot3") Attachment screenshot3
     );
 
-    @DELETE
+    @PUT
     @Consumes("application/json")
-    @Path("/{appId}")
+    @Path("/retire/{appId}")
     @ApiOperation(
             consumes = MediaType.APPLICATION_JSON,
             produces = MediaType.APPLICATION_JSON,
-            httpMethod = "DELETE",
+            httpMethod = "PUT",
-            value = "Delete the application with the given UUID",
+            value = "Retire the application with the given UUID",
-            notes = "This will delete the application with the given UUID",
+            notes = "This will retire the application with the given UUID",
             tags = "ApplicationDTO Management",
             extensions = {
                     @Extension(properties = {
@@ -449,8 +448,7 @@ public interface ApplicationManagementPublisherAPI {
                             code = 404,
                             message = "Application not found"),
             })
-    //todo add new scope and permission
+    Response retireApplication(
-    Response deleteApplication(
             @ApiParam(
                     name = "UUID",
                     value = "Unique identifier of the ApplicationDTO",
@@ -592,7 +590,7 @@ public interface ApplicationManagementPublisherAPI {
             httpMethod = "PUT",
             value = "Update an application release",
             notes = "This will update a new application release",
-            tags = "ApplicationDTO Management",
+            tags = "Application Management",
             extensions = {
                     @Extension(properties = {
                             @ExtensionProperty(name = SCOPE, value = "perm:app:publisher:update")
@@ -750,4 +748,39 @@ public interface ApplicationManagementPublisherAPI {
                     required = true)
             @QueryParam("action") String action
     );
+
+    @GET
+    @Path("/lifecycle-config")
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(
+            consumes = MediaType.APPLICATION_JSON,
+            produces = MediaType.APPLICATION_JSON,
+            httpMethod = "GET",
+            value = "get application management UI configuration",
+            notes = "This will get all UI configuration of application management",
+            tags = "Application Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = SCOPE, value = "perm:app:publisher:update")
+                    })
+            }
+    )
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            code = 200,
+                            message = "OK. \n Successfully got Lifecycle Config.",
+                            response = ApplicationList.class),
+                    @ApiResponse(
+                            code = 404,
+                            message = "Not Found. There doesn't have an defined <LifecycleStates> in app management "
+                                    + "configuration file." +
+                                    "query."),
+                    @ApiResponse(
+                            code = 500,
+                            message = "Internal Server Error. \n Error occurred while getting the lifecycle config.",
+                            response = ErrorResponse.class)
+            })
+    Response getLifecycleConfig();
+
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/java/org/wso2/carbon/device/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java

@@ -77,7 +77,7 @@ public interface ApplicationManagementPublisherAdminAPI {
     String SCOPE = "scope";
 
     @DELETE
-    @Path("/release/{appId}/{uuid}")
+    @Path("/release/{uuid}")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @ApiOperation(
@@ -108,11 +108,6 @@ public interface ApplicationManagementPublisherAdminAPI {
                             message = "Internal Server Error. \n Error occurred while deleting application release.",
                             response = ErrorResponse.class)
             }) Response deleteApplicationRelease(
-            @ApiParam(
-                    name = "appId",
-                    value = "application Id",
-                    required = true)
-            @PathParam("appId") int applicationId,
             @ApiParam(
                     name = "uuid",
                     value = "application release UUID",

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

@@ -24,10 +24,11 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import org.wso2.carbon.device.application.mgt.common.*;
 import org.wso2.carbon.device.application.mgt.common.dto.LifecycleStateDTO;
-import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException;
+import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
 import org.wso2.carbon.device.application.mgt.common.response.Application;
 import org.wso2.carbon.device.application.mgt.common.response.ApplicationRelease;
+import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler;
 import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationReleaseWrapper;
 import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationUpdateWrapper;
 import org.wso2.carbon.device.application.mgt.common.wrapper.ApplicationWrapper;
@@ -37,7 +38,6 @@ import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
 import org.wso2.carbon.device.application.mgt.publisher.api.services.ApplicationManagementPublisherAPI;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager;
-import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
 
 import java.io.IOException;
@@ -49,7 +49,6 @@ import java.util.Map;
 import javax.activation.DataHandler;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -433,12 +432,13 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
     }
 
 
-    @DELETE
+    @PUT
-    @Path("/{appId}")
+    @Path("/retire/{appId}")
-    public Response deleteApplication(@PathParam("appId") int applicationId) {
+    public Response retireApplication(
+            @PathParam("appId") int applicationId) {
         ApplicationManager applicationManager = APIUtil.getApplicationManager();
         try {
-            applicationManager.deleteApplication(applicationId);
+            applicationManager.retireApplication(applicationId);
             return Response.status(Response.Status.OK)
                     .entity("Successfully deleted the application for application ID: " + applicationId).build();
         } catch (NotFoundException e) {
@@ -513,6 +513,21 @@ public class ApplicationManagementPublisherAPIImpl implements ApplicationManagem
         return Response.status(Response.Status.CREATED).entity("Lifecycle state added successfully.").build();
     }
 
+    @GET
+    @Override
+    @Consumes("application/json")
+    @Path("/lifecycle-config")
+    public Response getLifecycleConfig() {
+        AppmDataHandler dataHandler = APIUtil.getDataHandler();
+        try {
+            return Response.status(Response.Status.OK).entity(dataHandler.getLifecycleConfiguration()).build();
+        } catch (LifecycleManagementException e) {
+            String msg = "Error Occurred while accessing lifecycle manager.";
+            log.error(msg);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        }
+    }
+
     /***
      *
      * @param binaryFile binary file of the application release

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

@@ -74,28 +74,27 @@ public class ApplicationManagementPublisherAdminAPIImpl implements ApplicationMa
     private static Log log = LogFactory.getLog(ApplicationManagementPublisherAdminAPIImpl.class);
 
         @DELETE
-        @Path("/release/{appId}/{uuid}")
+        @Path("/release/{uuid}")
         public Response deleteApplicationRelease(
-                @PathParam("appId") int applicationId,
                 @PathParam("uuid") String releaseUuid) {
             ApplicationManager applicationManager = APIUtil.getApplicationManager();
             try {
-                applicationManager.deleteApplicationRelease(applicationId, releaseUuid);
+                applicationManager.deleteApplicationRelease(releaseUuid);
                 String responseMsg = "Successfully deleted the application release for uuid: " + releaseUuid + "";
                 return Response.status(Response.Status.OK).entity(responseMsg).build();
             } catch (NotFoundException e) {
-                String msg = "Couldn't found application release which is having application id: " + applicationId
+                String msg =
-                        + " and application release UUID:" + releaseUuid;
+                        "Couldn't found application release which is having application release UUID:" + releaseUuid;
                 log.error(msg, e);
                 return Response.status(Response.Status.NOT_FOUND).entity(msg).build();
             } catch (ForbiddenException e) {
-                String msg =
+                String msg = "You don't have require permission to delete the application release which has UUID "
-                        "You don't have require permission to delete the application release which has UUID " + releaseUuid
+                        + releaseUuid;
-                                + " and application ID " + applicationId;
                 log.error(msg, e);
                 return Response.status(Response.Status.FORBIDDEN).entity(msg).build();
             } catch (ApplicationManagementException e) {
-                String msg = "Error occurred while deleting the application: " + applicationId;
+                String msg = "Error occurred while deleting the application release for application release UUID:: "
+                        + releaseUuid;
                 log.error(msg, e);
                 return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
             }

features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml

@@ -76,58 +76,59 @@
         <LifecycleState name="Created">
             <IsAppUpdatable>true</IsAppUpdatable>
             <IsInitialState>true</IsInitialState>
-            <Permission>/device-mgt/applications/life-cycle/create</Permission>
+            <IsDeletableState>true</IsDeletableState>
+            <Permission>/app-mgt/life-cycle/application/create</Permission>
             <ProceedingStates>
                 <State>In-Review</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="In-Review">
-            <Permission>/device-mgt/applications/life-cycle/in-review</Permission>
+            <Permission>/app-mgt/life-cycle/application/review</Permission>
             <ProceedingStates>
                 <State>Rejected</State>
                 <State>Approved</State>
+                <State>Created</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Approved">
-            <Permission>/device-mgt/applications/life-cycle/approve</Permission>
+            <Permission>/app-mgt/life-cycle/application/approve</Permission>
             <ProceedingStates>
+                <State>In-Review</State>
                 <State>Published</State>
-                <State>Created</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Rejected">
-            <Permission>/device-mgt/applications/life-cycle/reject</Permission>
+            <IsDeletableState>true</IsDeletableState>
+            <Permission>/app-mgt/life-cycle/application/reject</Permission>
             <ProceedingStates>
-                <State>Created</State>
+                <State>In-Review</State>
-                <State>Removed</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Published">
             <IsAppInstallable>true</IsAppInstallable>
-            <Permission>/device-mgt/applications/life-cycle/publish</Permission>
+            <Permission>/app-mgt/life-cycle/application/publish</Permission>
             <ProceedingStates>
-                <State>Unpublished</State>
+                <State>Blocked</State>
                 <State>Deprecated</State>
             </ProceedingStates>
         </LifecycleState>
-        <LifecycleState name="Unpublished">
+        <LifecycleState name="Blocked">
-            <Permission>/device-mgt/applications/life-cycle/unpublish</Permission>
+            <Permission>/app-mgt/life-cycle/application/block</Permission>
             <ProceedingStates>
                 <State>Published</State>
-                <State>In-Review</State>
+                <State>Deprecated</State>
-                <State>Removed</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Deprecated">
-            <Permission>/device-mgt/applications/life-cycle/deprecate</Permission>
+            <Permission>/app-mgt/life-cycle/application/deprecate</Permission>
             <ProceedingStates>
-                <State>Removed</State>
+                <State>Published</State>
-                <State>In-Review</State>
+                <State>Retired</State>
             </ProceedingStates>
         </LifecycleState>
-        <LifecycleState name="Removed">
+        <LifecycleState name="Retired">
             <IsEndState>true</IsEndState>
-            <Permission>/device-mgt/applications/life-cycle/remove</Permission>
+            <Permission>/app-mgt/life-cycle/application/retire</Permission>
         </LifecycleState>
     </LifecycleStates>
 

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

@@ -157,7 +157,7 @@ VALUES ('PUBLISHED', 'PUBLISHED', 'State in which Application is in published st
 /
 
 INSERT INTO APPM_LIFECYCLE_STATE (NAME, IDENTIFIER, DESCRIPTION)
-VALUES ('UNPUBLISHED', 'UNPUBLISHED', 'State in which Application is in un published state.')
+VALUES ('BLOCKED', 'BLOCKED', 'State in which Application is in un published state.')
 /
 
 INSERT INTO APPM_LIFECYCLE_STATE (NAME, IDENTIFIER, DESCRIPTION)

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

@@ -87,7 +87,7 @@ VALUES ('REJECTED', 'REJECTED', 'State in which Application is rejected after re
 INSERT INTO APPM_LIFECYCLE_STATE (NAME, IDENTIFIER, DESCRIPTION)
 VALUES ('PUBLISHED', 'PUBLISHED', 'State in which Application is in published state.');
 INSERT INTO APPM_LIFECYCLE_STATE (NAME, IDENTIFIER, DESCRIPTION)
-VALUES ('UNPUBLISHED', 'UNPUBLISHED', 'State in which Application is in un published state.');
+VALUES ('BLOCKED', 'BLOCKED', 'State in which Application is in un published state.');
 INSERT INTO APPM_LIFECYCLE_STATE (NAME, IDENTIFIER, DESCRIPTION)
 VALUES ('RETIRED', 'RETIRED', 'Retiring an application to indicate end of life state,');