Merge branch 'application-mgt-new' into 'application-mgt-new'

Fix SQL issues

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

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

@@ -18,52 +18,51 @@
  */
 package org.wso2.carbon.device.application.mgt.common;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 /**
  * Filter represents a criteria that can be used for searching applications.
  */
-
-@ApiModel(value = "Filter", description = "This is related to the application filtering.")
 public class Filter {
 
-    @ApiModelProperty(
-            name = "appName",
-            value = "Name of the application",
-            required = false)
+    /**
+     * Name of the application
+     */
     private String appName;
 
-    @ApiModelProperty(
-            name = "appType",
-            value = "Type of the application",
-            required = false)
+    /**
+     * Type of the application
+     */
     private String appType;
 
-    @ApiModelProperty(
-            name = "isFullMatch",
-            value = "Checking the application name matches fully with given name",
-            required = false)
+    /**
+     * Category of the application
+     */
+    private String appCategory;
+
+    /**
+     * Checking the application name matches fully with given name
+     */
     private boolean isFullMatch;
 
-    @ApiModelProperty(
-            name = "limit",
-            value = "Limit of the applications",
-            required = false)
+    /**
+     * Limit of the applications
+     */
     private int limit;
 
-    @ApiModelProperty(
-            name = "offset",
-            value = "Started from",
-            required = false)
+    /**
+     * Started from
+     */
     private int offset;
 
-    @ApiModelProperty(
-            name = "sortBy",
-            value = "Ascending or descending order",
-            required = false)
+    /**
+     * Ascending or descending order
+     */
     private String sortBy;
 
+    /**
+     * Set as True if required to have only published application release, otherwise set to False
+     */
+    private boolean requirePublishedRelease;
+
     public int getLimit() {
         return limit;
     }
@@ -111,4 +110,20 @@ public class Filter {
     public void setAppType(String appType) {
         this.appType = appType;
     }
+
+    public String getAppCategory() {
+        return appCategory;
+    }
+
+    public void setAppCategory(String appCategory) {
+        this.appCategory = appCategory;
+    }
+
+    public boolean isRequirePublishedRelease() {
+        return requirePublishedRelease;
+    }
+
+    public void setRequirePublishedRelease(boolean requirePublishedRelease) {
+        this.requirePublishedRelease = requirePublishedRelease;
+    }
 }

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

@@ -90,10 +90,11 @@ public interface ApplicationManager {
      * To get Application with the given Id.
      *
      * @param id id of the Application
+     * @param requirePublishedReleases If it is required to have only published application release set to True, otherwise set to false
      * @return the Application identified by the UUID
      * @throws ApplicationManagementException Application Management Exception.
      */
-    Application getApplicationById(int id) throws ApplicationManagementException;
+    Application getApplicationById(int id, boolean requirePublishedReleases) throws ApplicationManagementException;
 
     /**
      * To get an application associated with the release.
@@ -121,14 +122,15 @@ public interface ApplicationManager {
      */
     Boolean isUserAllowable(List<UnrestrictedRole> unrestrictedRoles, String userName) throws ApplicationManagementException;
 
-    /**
-     * To get all the releases of a particular Application.
-     *
-     * @param applicationId ID of the Application to get all the releases.
-     * @return the List of the Application releases related with the particular Application.
-     * @throws ApplicationManagementException Application Management Exception.
-     */
-    List<ApplicationRelease> getReleases(int applicationId) throws ApplicationManagementException;
+//    todo
+//    /**
+//     * To get all the releases of a particular Application.
+//     *
+//     * @param applicationId ID of the Application to get all the releases.
+//     * @return the List of the Application releases related with the particular Application.
+//     * @throws ApplicationManagementException Application Management Exception.
+//     */
+//    List<ApplicationRelease> getinstallableReleases(int applicationId) throws ApplicationManagementException;
 
     /**
      * To get all the releases of a particular Application.

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

@@ -58,13 +58,12 @@ public interface ApplicationReleaseDAO {
     /**
      * To get all the releases of a particular application.
      *
-     * @param applicationName Name of the Application
-     * @param applicationType Type of the Application
+     * @param applicationId Id of the Application
      * @param tenantId tenant id of the application
      * @return list of the application releases
      * @throws ApplicationManagementDAOException Application Management DAO Exception.
      */
-    List<ApplicationRelease> getReleases(String applicationName, String applicationType, int tenantId) throws
+    List<ApplicationRelease> getReleases(int applicationId, 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

@@ -147,11 +147,17 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             throw new ApplicationManagementDAOException("Filter need to be instantiated");
         }
 
-        if (filter.getAppType() != null) {
+        if (filter.getAppType() != null && !filter.getAppType().isEmpty()) {
             sql += " AND AP_APP.TYPE ";
             sql += "= ?";
         }
-        if (filter.getAppName() != null) {
+
+        if (filter.getAppCategory() != null && !filter.getAppCategory().isEmpty()) {
+            sql += " AND AP_APP.APP_CATEGORY ";
+            sql += "= ?";
+        }
+
+        if (filter.getAppName() != null && !filter.getAppName().isEmpty()) {
             sql += " AND LOWER (AP_APP.NAME) ";
             if (filter.isFullMatch()) {
                 sql += "= ?";
@@ -175,10 +181,13 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
             stmt.setInt(paramIndex++, tenantId);
             stmt.setString(paramIndex++, AppLifecycleState.REMOVED.toString());
 
-            if (filter.getAppType() != null) {
+            if (filter.getAppType() != null && !filter.getAppType().isEmpty()) {
                 stmt.setString(paramIndex++, filter.getAppType());
             }
-            if (filter.getAppName() != null) {
+            if (filter.getAppCategory() != null && !filter.getAppCategory().isEmpty()) {
+                stmt.setString(paramIndex++, filter.getAppCategory());
+            }
+            if (filter.getAppName() != null && !filter.getAppName().isEmpty()) {
                 if (filter.isFullMatch()) {
                     stmt.setString(paramIndex++, filter.getAppName().toLowerCase());
                 } else {

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

@@ -118,7 +118,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         Connection connection;
         PreparedStatement statement = null;
         ResultSet resultSet = null;
-        String sql = "SELECT AR.ID AS RELESE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID AS UUID, AR.RELEASE_TYPE AS "
+        String sql = "SELECT AR.ID AS RELEASE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID AS UUID, AR.RELEASE_TYPE AS "
                 + "RELEASE_TYPE, AR.PACKAGE_NAME AS PACKAGE_NAME, AR.APP_PRICE AS APP_PRICE, AR.STORED_LOCATION AS "
                 + "STORED_LOCATION, AR.BANNER_LOCATION AS BANNER_LOCATION, AR.SC_1_LOCATION AS SCREEN_SHOT_1, "
                 + "AR.SC_2_LOCATION AS SCREEN_SHOT_2, AR.SC_3_LOCATION AS SCREEN_SHOT_3, AR.APP_HASH_VALUE AS "
@@ -169,7 +169,7 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
         Connection connection;
         PreparedStatement statement = null;
         ResultSet resultSet = null;
-        String sql = "SELECT AR.ID AS RELESE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID, AR.RELEASE_TYPE, AR.APP_PRICE,"
+        String sql = "SELECT AR.ID AS RELEASE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID, AR.RELEASE_TYPE, AR.APP_PRICE,"
                 + " AR.STORED_LOCATION, AR.BANNER_LOCATION, AR.SC_1_LOCATION AS SCREEN_SHOT_1, "
                 + "AR.SC_2_LOCATION AS SCREEN_SHOT_2, AR.SC_3_LOCATION AS SCREEN_SHOT_3, AR.APP_HASH_VALUE AS " +
                 "HASH_VALUE, AR.SHARED_WITH_ALL_TENANTS AS SHARED, AR.APP_META_INFO, AR.CREATED_BY, AR.CREATED_AT, AR" +
@@ -208,33 +208,29 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
     /**
      * To insert the application release properties.
      *
-     * @param applicationName Name of the application.
-     * @param applicationType Type of the application.
+     * @param applicationId Id of the application.
      * @param tenantId Tenant Id
      * @throws ApplicationManagementDAOException Application Management DAO Exception.
      */
     @Override
-    public List<ApplicationRelease> getReleases(String applicationName, String applicationType, int tenantId)
+    public List<ApplicationRelease> getReleases(int applicationId, int tenantId)
             throws ApplicationManagementDAOException {
         Connection connection;
         PreparedStatement statement = null;
         ResultSet resultSet = null;
         List<ApplicationRelease> applicationReleases = new ArrayList<>();
-        String sql = "SELECT AR.ID AS RELESE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID, AR.RELEASE_TYPE "
+        String sql = "SELECT AR.ID AS RELEASE_ID, AR.VERSION AS RELEASE_VERSION, AR.UUID, AR.RELEASE_TYPE "
                 + "AS RELEASE_TYPE, AR.PACKAGE_NAME AS PACKAGE_NAME, AR.APP_PRICE, AR.STORED_LOCATION, "
                 + "AR.BANNER_LOCATION, AR.SC_1_LOCATION AS SCREEN_SHOT_1, AR.SC_2_LOCATION AS SCREEN_SHOT_2, "
                 + "AR.SC_3_LOCATION AS SCREEN_SHOT_3, AR.APP_HASH_VALUE AS HASH_VALUE, "
                 + "AR.SHARED_WITH_ALL_TENANTS AS SHARED, AR.APP_META_INFO AS APP_META_INFO, "
-                + "AR.RATING AS RATING FROM AP_APP_RELEASE AS AR where AR.AP_APP_ID=(SELECT ID FROM AP_APP "
-                + "WHERE NAME = ? AND TYPE = ? AND TENANT_ID = ?) AND AR.TENANT_ID = ?;";
+                + "AR.RATING AS RATING FROM AP_APP_RELEASE AS AR where AR.AP_APP_ID=? AND AR.TENANT_ID = ?;";
 
         try {
             connection = this.getDBConnection();
             statement = connection.prepareStatement(sql);
-            statement.setString(1, applicationName);
-            statement.setString(2, applicationType);
-            statement.setInt(3, tenantId);
-            statement.setInt(4, tenantId);
+            statement.setInt(1, applicationId);
+            statement.setInt(2, tenantId);
             resultSet = statement.executeQuery();
 
             while (resultSet.next()) {
@@ -245,10 +241,10 @@ public class GenericApplicationReleaseDAOImpl extends AbstractDAOImpl implements
             return applicationReleases;
         } catch (DBConnectionException e) {
             throw new ApplicationManagementDAOException("Database connection exception while trying to get the "
-                    + "release details of the application with Name " + applicationName, e);
+                    + "release details of the application with app ID: " + applicationId, e);
         } catch (SQLException e) {
             throw new ApplicationManagementDAOException(
-                    "Error while getting all the release details of the " + applicationName + " application"
+                    "Error while getting all the release details of the app ID: " + applicationId
                             + ", while executing the query " + sql, e);
         } finally {
             Util.cleanupResources(statement, resultSet);

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

@@ -31,7 +31,6 @@ import org.wso2.carbon.device.application.mgt.common.ApplicationSubscriptionType
 import org.wso2.carbon.device.application.mgt.common.ApplicationType;
 import org.wso2.carbon.device.application.mgt.common.Filter;
 import org.wso2.carbon.device.application.mgt.common.LifecycleState;
-import org.wso2.carbon.device.application.mgt.common.SortingOrder;
 import org.wso2.carbon.device.application.mgt.common.Tag;
 import org.wso2.carbon.device.application.mgt.common.UnrestrictedRole;
 import org.wso2.carbon.device.application.mgt.common.User;
@@ -51,7 +50,6 @@ import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;
 import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManger;
 import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.user.api.UserRealm;
@@ -214,13 +212,13 @@ public class ApplicationManagerImpl implements ApplicationManager {
         try {
             ConnectionManagerUtil.getDBConnection();
             applicationList = applicationDAO.getApplications(filter, tenantId);
-            if(applicationList != null && applicationList.getApplications() != null && applicationList
-                    .getApplications().size() > 0) {
+            if(applicationList != null && applicationList.getApplications() != null && !applicationList
+                    .getApplications().isEmpty()) {
                 if (!isAdminUser(userName, tenantId, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION)) {
                     applicationList = getRoleRestrictedApplicationList(applicationList, userName);
                 }
                 for (Application application : applicationList.getApplications()) {
-                    applicationReleases = getReleases(application.getId());
+                    applicationReleases = getReleases(application, filter.isRequirePublishedRelease());
                     application.setApplicationReleases(applicationReleases);
                 }
             }
@@ -277,7 +275,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
     }
 
     @Override
-    public Application getApplicationById(int id) throws ApplicationManagementException {
+    public Application getApplicationById(int id, boolean requirePublishedReleases) throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String userName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
         Application application;
@@ -288,7 +286,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             application = ApplicationManagementDAOFactory.getApplicationDAO()
                     .getApplicationById(id, tenantId);
             if (isAdminUser(userName, tenantId, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION)) {
-                applicationReleases = getReleases(application.getId());
+                applicationReleases = getReleases(application, requirePublishedReleases);
                 application.setApplicationReleases(applicationReleases);
                 return application;
             }
@@ -305,7 +303,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                 return null;
             }
 
-            applicationReleases = getReleases(application.getId());
+            applicationReleases = getReleases(application, requirePublishedReleases);
             application.setApplicationReleases(applicationReleases);
             return application;
         } catch (UserStoreException e) {
@@ -352,7 +350,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             application = ApplicationManagementDAOFactory.getApplicationDAO()
                     .getApplication(appName, appType, tenantId);
             if (isAdminUser(userName, tenantId, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION)) {
-                applicationReleases = getReleases(application.getId());
+                applicationReleases = getReleases(application, false);
                 application.setApplicationReleases(applicationReleases);
                 return application;
             }
@@ -369,7 +367,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                 return null;
             }
 
-            applicationReleases = getReleases(application.getId());
+            applicationReleases = getReleases(application, false);
             application.setApplicationReleases(applicationReleases);
             return application;
         } catch (UserStoreException e) {
@@ -424,11 +422,38 @@ public class ApplicationManagerImpl implements ApplicationManager {
         }
     }
 
-    @Override
-    public List<ApplicationRelease> getReleases(int applicationId) throws ApplicationManagementException {
+//    todo
+//    public List<ApplicationRelease> getinstallableReleases(int applicationId) throws ApplicationManagementException {
+//        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+//
+//        Application application = getApplicationIfAccessible(applicationId);
+//        List<ApplicationRelease> applicationReleases;
+//        List<ApplicationRelease> filteredApplicationReleases = new ArrayList<>();
+//        if (log.isDebugEnabled()) {
+//            log.debug("Request is received to retrieve all the releases related with the application " + application
+//                    .toString());
+//        }
+//        ConnectionManagerUtil.getDBConnection();
+//        applicationReleases = this.applicationReleaseDAO.getReleases(application.getName(), application.getType(), tenantId);
+//        for (ApplicationRelease applicationRelease : applicationReleases) {
+//            LifecycleState lifecycleState = ApplicationManagementDAOFactory.getLifecycleStateDAO().
+//                    getLatestLifeCycleStateByReleaseID(applicationRelease.getId());
+//            if (lifecycleState != null) {
+//                applicationRelease.setLifecycleState(lifecycleState);
+//
+//                if (!AppLifecycleState.REMOVED.toString()
+//                        .equals(applicationRelease.getLifecycleState().getCurrentState())) {
+//                    filteredApplicationReleases.add(applicationRelease);
+//                }
+//            }
+//        }
+//        return filteredApplicationReleases;
+//
+//    }
+
+    private List<ApplicationRelease> getReleases(Application application, boolean requirePublishedRelease)
+            throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-
-        Application application = getApplicationIfAccessible(applicationId);
         List<ApplicationRelease> applicationReleases;
         List<ApplicationRelease> filteredApplicationReleases = new ArrayList<>();
         if (log.isDebugEnabled()) {
@@ -436,7 +461,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     .toString());
         }
         ConnectionManagerUtil.getDBConnection();
-        applicationReleases = this.applicationReleaseDAO.getReleases(application.getName(), application.getType(), tenantId);
+        applicationReleases = this.applicationReleaseDAO.getReleases(application.getId(), tenantId);
         for (ApplicationRelease applicationRelease : applicationReleases) {
             LifecycleState lifecycleState = ApplicationManagementDAOFactory.getLifecycleStateDAO().
                     getLatestLifeCycleStateByReleaseID(applicationRelease.getId());
@@ -445,19 +470,34 @@ public class ApplicationManagerImpl implements ApplicationManager {
 
                 if (!AppLifecycleState.REMOVED.toString()
                         .equals(applicationRelease.getLifecycleState().getCurrentState())) {
-                    filteredApplicationReleases.add(applicationRelease);
+                    if (requirePublishedRelease){
+                        if (AppLifecycleState.PUBLISHED.toString()
+                                .equals(applicationRelease.getLifecycleState().getCurrentState())){
+                            filteredApplicationReleases.add(applicationRelease);
+                        }
+                    }else{
+                        filteredApplicationReleases.add(applicationRelease);
+                    }
                 }
             }
         }
+
+        if (requirePublishedRelease && filteredApplicationReleases.size() > 1) {
+            log.error("There are more than one published application releases for application ID: " + application
+                    .getId());
+        }
         return filteredApplicationReleases;
 
     }
 
+
+
     @Override
     public List<String> deleteApplication(int applicationId) throws ApplicationManagementException {
         String userName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         List<String> storedLocations = new ArrayList<>();
+        Application application;
 
         try {
             if (!isAdminUser(userName, tenantId, CarbonConstants.UI_ADMIN_PERMISSION_COLLECTION)) {
@@ -466,10 +506,11 @@ public class ApplicationManagerImpl implements ApplicationManager {
                                 "need to have admin permission");
             }
 
-            if (getApplicationIfAccessible(applicationId) == null) {
+            application = getApplicationIfAccessible(applicationId);
+            if ( application == null) {
                 throw new ApplicationManagementException("Invalid Application");
             }
-            List<ApplicationRelease> applicationReleases = getReleases(applicationId);
+            List<ApplicationRelease> applicationReleases = getReleases(application, false);
             if (log.isDebugEnabled()) {
                 log.debug("Request is received to delete applications which are related with the application id " +
                                   applicationId);

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

@@ -39,6 +39,7 @@ import java.util.List;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -125,10 +126,25 @@ public interface ApplicationManagementAPI {
             })
     Response getApplications(
             @ApiParam(
-                    name = "filter",
-                    value = "Filter to get application list",
-                    required = true)
-            @Valid Filter filter,
+                    name = "name",
+                    value = "Name of the application")
+            @QueryParam("name") String appName,
+            @ApiParam(
+                    name = "type",
+                    value = "Type of the application")
+            @QueryParam("type") String appType,
+            @ApiParam(
+                    name = "category",
+                    value = "Category of the application")
+            @QueryParam("category") String appCategory,
+            @ApiParam(
+                    name = "exact-match",
+                    value = "Is it requesting exactly matching application or partially matching application.")
+            @QueryParam("exact-match") boolean isFullMatch,
+            @ApiParam(
+                    name = "published-release",
+                    value = "If set to True, only get published release for the application")
+            @QueryParam("published-release") boolean requirePublishedReleases,
             @ApiParam(
                     name = "offset",
                     value = "offset",
@@ -138,11 +154,16 @@ public interface ApplicationManagementAPI {
                     name = "limit",
                     value = "limit",
                     defaultValue = "20")
-            @QueryParam("limit") int limit
+            @QueryParam("limit") int limit,
+            @ApiParam(
+                    name = "sort",
+                    value = "Sorting type",
+                    defaultValue = "AES")
+            @QueryParam("sort") String sortBy
     );
 
     @GET
-    @Path("/{appType}")
+    @Path("/{appId}")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @ApiOperation(
@@ -173,6 +194,10 @@ public interface ApplicationManagementAPI {
                             response = ErrorResponse.class)
             })
     Response getApplication(
+            @ApiParam(
+                    name = "published-release",
+                    value = "If set to True, only get published release for the application")
+            @QueryParam("published-release") boolean requirePublishedReleases,
             @ApiParam(
                     name = "appId",
                     value = "application Id",

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

@@ -41,6 +41,7 @@ import java.util.UUID;
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -48,7 +49,6 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 /**
@@ -64,14 +64,32 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI {
     @Override
     @Consumes("application/json")
     public Response getApplications(
-            @Valid Filter filter,
-            @QueryParam("offset") int offset,
-            @QueryParam("limit") int limit) {
+            @QueryParam("name") String appName,
+            @QueryParam("type") String appType,
+            @QueryParam("category") String appCategory,
+            @QueryParam("exact-match") boolean isFullMatch,
+            @QueryParam("published-release") boolean requirePublishedReleases,
+            @DefaultValue("0") @QueryParam("offset") int offset,
+            @DefaultValue("20") @QueryParam("limit") int limit,
+            @DefaultValue("ASC") @QueryParam("sort") String sortBy) {
         ApplicationManager applicationManager = APIUtil.getApplicationManager();
 
         try {
+            Filter filter = new Filter();
             filter.setOffset(offset);
             filter.setLimit(limit);
+            filter.setSortBy(sortBy);
+            filter.setFullMatch(isFullMatch);
+            filter.setRequirePublishedRelease(requirePublishedReleases);
+            if (appName != null && !appName.isEmpty()) {
+                filter.setAppName(appName);
+            }
+            if (appType != null && !appType.isEmpty()) {
+                filter.setAppType(appType);
+            }
+            if (appCategory != null && !appCategory.isEmpty()) {
+                filter.setAppCategory(appCategory);
+            }
             ApplicationList applications = applicationManager.getApplications(filter);
             if (applications.getApplications().isEmpty()) {
                 return Response.status(Response.Status.NOT_FOUND).entity
@@ -90,10 +108,11 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI {
     @Consumes("application/json")
     @Path("/{appId}")
     public Response getApplication(
+            @QueryParam("published-release") boolean requirePublishedReleases,
             @PathParam("appId") int appId) {
         ApplicationManager applicationManager = APIUtil.getApplicationManager();
         try {
-            Application application = applicationManager.getApplicationById(appId);
+            Application application = applicationManager.getApplicationById(appId,  requirePublishedReleases);
             if (application == null) {
                 return Response.status(Response.Status.NOT_FOUND).entity
                         ("Application with application id: " + appId + " not found").build();

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

@@ -20,17 +20,18 @@ CREATE TABLE IF NOT EXISTS AP_APP (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS AP_APP_RELEASE (
   ID INT(11) NOT NULL AUTO_INCREMENT,
-  VERSION VARCHAR(10) NOT NULL,
+  VERSION VARCHAR(25) NOT NULL,
   TENANT_ID VARCHAR(45) NOT NULL,
   UUID VARCHAR(200) NOT NULL,
   RELEASE_TYPE VARCHAR(45) NOT NULL,
+  PACKAGE_NAME VARCHAR(45) NOT NULL,
   APP_PRICE DECIMAL(6,2) NULL DEFAULT NULL,
-  STORED_LOCATION VARCHAR(45) NOT NULL,
-  BANNER_LOCATION VARCHAR(45) NOT NULL,
-  SC_1_LOCATION VARCHAR(45) NOT NULL,
-  SC_2_LOCATION VARCHAR(45) NULL DEFAULT NULL,
-  SC_3_LOCATION VARCHAR(45) NULL DEFAULT NULL,
-  APP_HASH_VALUE VARCHAR(1000) NOT NULL,
+  STORED_LOCATION VARCHAR(100) NOT NULL,
+  BANNER_LOCATION VARCHAR(100) NOT NULL,
+  SC_1_LOCATION VARCHAR(100) NOT NULL,
+  SC_2_LOCATION VARCHAR(100) NULL DEFAULT NULL,
+  SC_3_LOCATION VARCHAR(100) NULL DEFAULT NULL,
+  APP_HASH_VALUE VARCHAR(100) NOT NULL,
   SHARED_WITH_ALL_TENANTS INT(11) NULL DEFAULT NULL,
   APP_META_INFO VARCHAR(20000) NULL DEFAULT NULL,
   RATING DOUBLE NULL DEFAULT NULL,

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

@@ -32,17 +32,18 @@ CREATE TABLE IF NOT EXISTS `AP_APP` (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `AP_APP_RELEASE` (
   `ID` INT(11) NOT NULL AUTO_INCREMENT,
-  `VERSION` VARCHAR(10) NOT NULL,
+  `VERSION` VARCHAR(25) NOT NULL,
   `TENANT_ID` VARCHAR(45) NOT NULL,
   `UUID` VARCHAR(200) NOT NULL,
   `RELEASE_TYPE` VARCHAR(45) NOT NULL,
+  `PACKAGE_NAME` VARCHAR(45) NOT NULL,
   `APP_PRICE` DECIMAL(6,2) NULL DEFAULT NULL,
-  `STORED_LOCATION` VARCHAR(45) NOT NULL,
-  `BANNER_LOCATION` VARCHAR(45) NOT NULL,
-  `SC_1_LOCATION` VARCHAR(45) NOT NULL,
-  `SC_2_LOCATION` VARCHAR(45) NULL DEFAULT NULL,
-  `SC_3_LOCATION` VARCHAR(45) NULL DEFAULT NULL,
-  `APP_HASH_VALUE` VARCHAR(1000) NOT NULL,
+  `STORED_LOCATION` VARCHAR(100) NOT NULL,
+  `BANNER_LOCATION` VARCHAR(100) NOT NULL,
+  `SC_1_LOCATION` VARCHAR(100) NOT NULL,
+  `SC_2_LOCATION` VARCHAR(100) NULL DEFAULT NULL,
+  `SC_3_LOCATION` VARCHAR(100) NULL DEFAULT NULL,
+  `APP_HASH_VALUE` VARCHAR(100) NOT NULL,
   `SHARED_WITH_ALL_TENANTS` INT(11) NULL DEFAULT NULL,
   `APP_META_INFO` VARCHAR(20000) NULL DEFAULT NULL,
   `RATING` DOUBLE NULL DEFAULT NULL,