Merge branch 'master' into 'master'

Add attributes to ui parameters

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

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Condition.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. 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.extensions.device.type.template.config;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+@XmlRootElement(name = "Condition")
+public class Condition {
+
+    String id;
+    List<String> values;
+
+    @XmlElement(name = "Id")
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+    @XmlElementWrapper(name = "Values")
+    @XmlElement(name = "Value")
+    public List<String> getValues() {
+        return values;
+    }
+
+    public void setValues(List<String> values) {
+        this.values = values;
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/UIParameter.java

@@ -76,6 +76,13 @@ public class UIParameter {
     @XmlElement(name = "value")
     protected List<String> value;
 
+    @XmlElement(name = "key")
+    protected String key;
+
+    @XmlElementWrapper(name = "Conditions")
+    @XmlElement(name = "Condition")
+    private List<Condition> conditions;
+
     public String getId() {
         return id;
     }
@@ -131,4 +138,21 @@ public class UIParameter {
     public void setOptional(boolean optional) {
         this.optional = optional;
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public List<Condition> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(
+            List<Condition> conditions) {
+        this.conditions = conditions;
+    }
 }