From 64d656b5e72a9ea91a5de4677dcb27457a3b0b0d Mon Sep 17 00:00:00 2001 From: Milan Perera Date: Tue, 9 May 2017 15:09:21 +0530 Subject: [PATCH] Removed unnecessary interace methods from Device Manager --- .../device/type/deployer/template/DeviceTypeManager.java | 3 +-- .../org/wso2/carbon/device/mgt/common/DeviceManager.java | 9 --------- .../wso2/carbon/device/mgt/core/TestDeviceManager.java | 5 ----- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java index 87795967f1..602dc81b07 100644 --- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java +++ b/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java @@ -389,8 +389,7 @@ public class DeviceTypeManager implements DeviceManager { return requiredDeviceTypeAuthorization; } - @Override - public PlatformConfiguration getDefaultConfiguration() throws DeviceManagementException { + private PlatformConfiguration getDefaultConfiguration() throws DeviceManagementException { if (log.isDebugEnabled()) { log.debug("Loading default " + deviceType + " platform configuration from " + deviceType + diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java index 3c97fa81ce..060865c726 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java @@ -157,13 +157,4 @@ public interface DeviceManager { */ boolean requireDeviceAuthorization(); - /** - * This method returns the default configuration values which is stored in the configuration file - * rather than fetching from the registry. - * - * @return Returns Default PlatformConfiguration - * @throws DeviceManagementException - */ - PlatformConfiguration getDefaultConfiguration() throws DeviceManagementException; - } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java index 7b07c0a62b..a1a17b47e3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java @@ -121,9 +121,4 @@ public class TestDeviceManager implements DeviceManager { return false; } - @Override - public PlatformConfiguration getDefaultConfiguration() throws DeviceManagementException { - return null; - } - }