diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ApplicationManagementAPI.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ApplicationManagementAPI.java index 722c79974a..c849837f78 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ApplicationManagementAPI.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ApplicationManagementAPI.java @@ -195,7 +195,12 @@ public interface ApplicationManagementAPI { name = "uuid", value = "UUID of the application", required = true) - @PathParam("uuid") String uuid + @PathParam("uuid") String uuid, + @ApiParam( + name = "isWithImages", + value = "Whether to return application with images", + required = false) + @QueryParam("isWithImages") Boolean IsWithImages ); @PUT diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java index 74d8b4fb87..b4032bcc96 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ApplicationManagementAPIImpl.java @@ -72,6 +72,8 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI { public Response getApplications(@QueryParam("offset") int offset, @QueryParam("limit") int limit, @QueryParam("query") String searchQuery) { ApplicationManager applicationManager = APIUtil.getApplicationManager(); + ApplicationStorageManager applicationStorageManager = APIUtil.getApplicationStorageManager(); + try { if (limit == 0) { limit = DEFAULT_LIMIT; @@ -82,6 +84,12 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI { filter.setSearchQuery(searchQuery); ApplicationList applications = applicationManager.getApplications(filter); + + for (Application application : applications.getApplications()) { + ImageArtifact imageArtifact = applicationStorageManager.getImageArtifact(application.getUuid(), + "icon", 0); + application.setIcon(imageArtifact); + } return Response.status(Response.Status.OK).entity(applications).build(); } catch (NotFoundException e) { return Response.status(Response.Status.NOT_FOUND).build(); @@ -95,7 +103,7 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI { @GET @Consumes("application/json") @Path("/{uuid}") - public Response getApplication(@PathParam("uuid") String uuid) { + public Response getApplication(@PathParam("uuid") String uuid, @QueryParam("isWithImages") Boolean isWithImages) { ApplicationManager applicationManager = APIUtil.getApplicationManager(); ApplicationStorageManager applicationStorageManager = APIUtil.getApplicationStorageManager(); try { @@ -104,8 +112,18 @@ public class ApplicationManagementAPIImpl implements ApplicationManagementAPI { return Response.status(Response.Status.NOT_FOUND) .entity("Application with UUID " + uuid + " not found").build(); } - ImageArtifact icon = applicationStorageManager.getImageArtifact(uuid, "icon", 0); - application.setIcon(icon); + + if (isWithImages != null && isWithImages) { + ImageArtifact icon = applicationStorageManager.getImageArtifact(uuid, "icon", 0); + ImageArtifact banner = applicationStorageManager.getImageArtifact(uuid, "banner", 0); + int screenShotCount = application.getScreenShotCount(); + for (int count = 1; count < screenShotCount; count++) { + ImageArtifact screenShot = applicationStorageManager.getImageArtifact(uuid, "screenshot", count); + application.addScreenShot(screenShot); + } + application.setIcon(icon); + application.setBanner(banner); + } return Response.status(Response.Status.OK).entity(application).build(); } catch (NotFoundException e) { return Response.status(Response.Status.NOT_FOUND).build(); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Application.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Application.java index 0f76dd36e5..a6468de326 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Application.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/Application.java @@ -22,6 +22,7 @@ package org.wso2.carbon.device.application.mgt.common; import org.wso2.carbon.device.application.mgt.common.jaxrs.Exclude; import java.awt.*; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -72,6 +73,10 @@ public class Application { private ImageArtifact icon; + private ImageArtifact banner; + + private List screenShots = new ArrayList<>(); + public int getId() { return id; } @@ -228,6 +233,14 @@ public class Application { this.icon = icon; } + public void setBanner(ImageArtifact banner) { + this.banner = banner; + } + + public void addScreenShot(ImageArtifact screenShot) { + this.screenShots.add(screenShot); + } + @Override public String toString() { String app = "UUID : " + uuid + "\tName : " + name + "\tShort Description : " diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java index 2d076c1d37..4b085f8427 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Configuration.java @@ -53,15 +53,6 @@ public class Configuration { public void setExtensions(List extensions) { this.extensions = extensions; } - - @XmlElement(name = "Artifacts") - public Artifacts getArtifacts() { - return artifacts; - } - - public void setArtifacts(Artifacts artifacts) { - this.artifacts = artifacts; - } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java index 5ad1d05440..9ce5c282f7 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/config/Extension.java @@ -80,7 +80,6 @@ public class Extension { public enum Name { ApplicationManager, ApplicationReleaseManager, - ApplicationUploadManager, CategoryManager, CommentsManager, LifecycleStateManager, diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java index 97d0af2352..cbf3e935ce 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java @@ -54,13 +54,26 @@ import java.util.List; */ public class ApplicationStorageManagerImpl implements ApplicationStorageManager { private static final Log log = LogFactory.getLog(ApplicationStorageManagerImpl.class); + private String storagePath; + private int screenShotMaxCount; + + /** + * Create a new ApplicationStorageManager Instance + * + * @param storagePath Storage Path to save the binary and image files. + * @param screenShotMaxCount Maximum Screen-shots count + */ + public ApplicationStorageManagerImpl(String storagePath, String screenShotMaxCount) { + this.storagePath = storagePath; + this.screenShotMaxCount = Integer.parseInt(screenShotMaxCount); + } @Override public void uploadImageArtifacts(String applicationUUID, InputStream iconFileStream, InputStream bannerFileStream, List screenShotStreams) throws ApplicationStorageManagementException { int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); Application application = validateApplication(applicationUUID); - String artifactDirectoryPath = Constants.artifactPath + application.getId(); + String artifactDirectoryPath = storagePath + application.getId(); if (log.isDebugEnabled()) { log.debug("Artifact Directory Path for saving the artifacts related with application " + applicationUUID + " is " + artifactDirectoryPath); @@ -86,12 +99,29 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager } if (screenShotStreams != null) { int count = application.getScreenShotCount() + 1; + boolean maxCountReached = false; + + if (count > screenShotMaxCount) { + log.error("Maximum limit for the screen-shot is " + screenShotMaxCount + + " Cannot upload another screenshot for the application with the UUID " + applicationUUID); + maxCountReached = true; + } String screenshotName; + + if (maxCountReached) { + return; + } for (InputStream screenshotStream : screenShotStreams) { try { screenshotName = Constants.IMAGE_ARTIFACTS[2] + count; saveFile(screenshotStream, artifactDirectoryPath + File.separator + screenshotName); count++; + if (count > screenShotMaxCount) { + log.error("Maximum limit for the screen-shot is " + screenShotMaxCount + + " Cannot upload another screenshot for the application with the UUID " + + applicationUUID); + break; + } } catch (IOException e) { throw new ApplicationStorageManagementException( "IO Exception while saving the screens hots for the " + "application " + applicationUUID, @@ -127,7 +157,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager public void uploadReleaseArtifacts(String applicationUUID, String versionName, InputStream binaryFile) throws ApplicationStorageManagementException { Application application = validateApplication(applicationUUID); - String artifactDirectoryPath = Constants.artifactPath + application.getId(); + String artifactDirectoryPath = storagePath + application.getId(); if (log.isDebugEnabled()) { log.debug("Artifact Directory Path for saving the application release related artifacts related with " + "application " + applicationUUID + " is " + artifactDirectoryPath); @@ -150,7 +180,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager public InputStream getReleasedArtifacts(String applicationUUID, String versionName) throws ApplicationStorageManagementException { Application application = validateApplication(applicationUUID); - String artifactPath = Constants.artifactPath + application.getId() + File.separator + versionName; + String artifactPath = storagePath + application.getId() + File.separator + versionName; if (log.isDebugEnabled()) { log.debug("ApplicationRelease artifacts are searched in the location " + artifactPath); @@ -173,7 +203,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager @Override public void deleteApplicationArtifacts(String applicationUUID) throws ApplicationStorageManagementException { Application application = validateApplication(applicationUUID); - String artifactDirectoryPath = Constants.artifactPath + application.getId(); + String artifactDirectoryPath = storagePath + application.getId(); File artifactDirectory = new File(artifactDirectoryPath); if (artifactDirectory.exists()) { @@ -185,7 +215,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager public void deleteApplicationReleaseArtifacts(String applicationUUID, String version) throws ApplicationStorageManagementException { Application application = validateApplication(applicationUUID); - String artifactPath = Constants.artifactPath + application.getId() + File.separator + version; + String artifactPath = storagePath + application.getId() + File.separator + version; File artifact = new File(artifactPath); if (artifact.exists()) { @@ -215,7 +245,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager ApplicationStorageManagementException { Application application = validateApplication(applicationUUID); validateImageArtifactNames(name); - String imageArtifactPath = Constants.artifactPath + application.getId() + File.separator + name.toLowerCase(); + String imageArtifactPath = storagePath + application.getId() + File.separator + name.toLowerCase(); if (name.equalsIgnoreCase(Constants.IMAGE_ARTIFACTS[2])) { imageArtifactPath += count; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ServiceComponent.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ServiceComponent.java index 3ea5dcf23f..bc0919d8e6 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ServiceComponent.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/internal/ServiceComponent.java @@ -77,8 +77,6 @@ public class ServiceComponent { String datasourceName = ConfigurationManager.getInstance().getConfiguration().getDatasourceName(); DAOFactory.init(datasourceName); - Constants.artifactPath = ConfigurationManager.getInstance().getConfiguration().getArtifacts() - .getBinaryLocation(); ApplicationManager applicationManager = ApplicationManagementUtil.getApplicationManagerInstance(); DataHolder.getInstance().setApplicationManager(applicationManager); bundleContext.registerService(ApplicationManager.class.getName(), applicationManager, null); diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java index 9c6992b204..76d01d6e83 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/Constants.java @@ -54,10 +54,6 @@ public class Constants { public static final String[] LIFE_CYCLES = {"CREATED", "IN REVIEW", "APPROVED", "REJECTED", "PUBLISHED", "UNPUBLISHED", "RETIRED"}; - /** - * Path to save the Application related artifacts. - */ - public static String artifactPath = ""; /** * Name of the image artifacts that are saved in the file system. diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml index cd8091d261..9807db661e 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml @@ -22,12 +22,6 @@ jdbc/APPM_DS - - org.wso2.carbon.device.application.mgt.core.impl.ApplicationUploadManagerImpl - - repository/resources/mobileapps - - org.wso2.carbon.device.application.mgt.core.impl.ApplicationManagerImpl @@ -57,10 +51,10 @@ org.wso2.carbon.device.application.mgt.core.impl.ApplicationStorageManagerImpl + + repository/resources/mobileapps + 6 + - - - repository/resources/mobileapps/ - \ No newline at end of file