From 277f0341b1281a65a0d7a406b8ca54e4a9e6323d Mon Sep 17 00:00:00 2001 From: Dulitha Wijewantha Date: Fri, 23 Jan 2015 18:29:28 +0530 Subject: [PATCH 1/2] * Add device type to the feature * Added method to operation manager to get features by type * Added an exception for feature management --- .../carbon/device/mgt/common/Feature.java | 9 +++ .../common/FeatureManagementException.java | 58 +++++++++++++++++++ .../device/mgt/common/OperationManager.java | 8 +++ 3 files changed, 75 insertions(+) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManagementException.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java index 388edbb402..dccefdd4bd 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java @@ -21,6 +21,7 @@ public class Feature { private int id; private String name; + private String deviceType; private List metadataEntries; public int getId() { @@ -47,6 +48,14 @@ public class Feature { this.metadataEntries = metadataEntries; } + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + public static class MetadataEntry { private int id; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManagementException.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManagementException.java new file mode 100644 index 0000000000..a040caf7de --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManagementException.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.common; + + +public class FeatureManagementException extends Exception { + + private static final long serialVersionUID = 4527364660451105710L; + + private String errorMessage; + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + + public FeatureManagementException(String msg, Exception nestedEx) { + super(msg, nestedEx); + setErrorMessage(msg); + } + + public FeatureManagementException(String message, Throwable cause) { + super(message, cause); + setErrorMessage(message); + } + + public FeatureManagementException(String msg) { + super(msg); + setErrorMessage(msg); + } + + public FeatureManagementException() { + super(); + } + + public FeatureManagementException(Throwable cause) { + super(cause); + } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationManager.java index 09a14021f1..633f370e05 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/OperationManager.java @@ -54,4 +54,12 @@ public interface OperationManager { public List getPendingOperations(DeviceIdentifier deviceId) throws OperationManagementException; + /** + * TODO: Move this into a separate FeatureManager + * @param deviceType - Device type + * @return a list of Feature objects. + * @throws FeatureManagementException + */ + public List getFeaturesForDeviceType(String deviceType) throws FeatureManagementException; + } \ No newline at end of file From 7f3516b2a6f6b9b814b66f8ab4664358dd676c09 Mon Sep 17 00:00:00 2001 From: Dulitha Wijewantha Date: Fri, 23 Jan 2015 21:52:00 +0530 Subject: [PATCH 2/2] * Added a description to the feature object * Added the COMMAND enum to the Operation class --- .../java/org/wso2/carbon/device/mgt/common/Feature.java | 9 +++++++++ .../org/wso2/carbon/device/mgt/common/Operation.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java index dccefdd4bd..dcc4626c3e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java @@ -21,6 +21,7 @@ public class Feature { private int id; private String name; + private String description; private String deviceType; private List metadataEntries; @@ -56,6 +57,14 @@ public class Feature { this.deviceType = deviceType; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public static class MetadataEntry { private int id; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Operation.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Operation.java index 755be0b5cc..c1e39ba89a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Operation.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Operation.java @@ -24,7 +24,7 @@ import java.util.Properties; public class Operation { public enum Type { - CONFIG, MESSAGE, INFO + CONFIG, MESSAGE, INFO, COMMAND } private String code;