From a8ae030fe7c2a5c1c9e41407315fb11188ee0d99 Mon Sep 17 00:00:00 2001 From: manoj Date: Mon, 6 Jul 2015 13:20:34 +0530 Subject: [PATCH 1/2] Remove updateApplication List method from ApplicationManager interface. This is not need to implement for plugins --- .../device/mgt/common/app/mgt/ApplicationManager.java | 3 --- .../core/app/mgt/ApplicationManagerProviderServiceImpl.java | 2 +- .../carbon/device/mgt/core/TestDeviceManagementService.java | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java index 747dc681040..a341768d17f 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ApplicationManager.java @@ -69,8 +69,5 @@ public interface ApplicationManager { void installApplication(Operation operation, List deviceIdentifiers) throws ApplicationManagementException; - void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, - List applications) throws ApplicationManagementException; - } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java index f2f6102fd68..72d08261c1e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java @@ -116,7 +116,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem } } - @Override + public void updateInstalledApplicationListOfDevice( DeviceIdentifier deviceIdentifier, List applications) throws ApplicationManagementException { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java index e320327524a..f074adc2e50 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java @@ -123,10 +123,4 @@ public class TestDeviceManagementService implements DeviceManagementService { throws ApplicationManagementException { } - - @Override - public void updateInstalledApplicationListOfDevice(DeviceIdentifier deviceIdentifier, - List applications) throws ApplicationManagementException { - - } } From 66afd0be4b04f60aecf9b2ce8bdf6215caf73d99 Mon Sep 17 00:00:00 2001 From: manoj Date: Mon, 6 Jul 2015 14:03:37 +0530 Subject: [PATCH 2/2] Change updateApplicationList method --- .../api/mgt/ApplicationManagementProviderService.java | 8 ++++++++ .../app/mgt/ApplicationManagerProviderServiceImpl.java | 1 + 2 files changed, 9 insertions(+) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/ApplicationManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/ApplicationManagementProviderService.java index 7ed2af3ba64..70ff9225f93 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/ApplicationManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/api/mgt/ApplicationManagementProviderService.java @@ -1,7 +1,15 @@ package org.wso2.carbon.device.mgt.core.api.mgt; +import org.wso2.carbon.device.mgt.common.DeviceIdentifier; +import org.wso2.carbon.device.mgt.common.app.mgt.Application; +import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager; +import java.util.List; + public interface ApplicationManagementProviderService extends ApplicationManager { + public void updateApplicationListInstallInDevice(DeviceIdentifier deviceIdentifier, + List applications) throws ApplicationManagementException; + } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java index 72d08261c1e..82529a25b1b 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java @@ -166,6 +166,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem return pluginRepository; } + @Override public void updateApplicationListInstallInDevice( DeviceIdentifier deviceIdentifier, List applications) throws ApplicationManagementException {