Merge branch 'master' into 'master'

Add new classes to get rules in UI params

See merge request entgra/carbon-device-mgt!568
revert-70ac1926
Dharmakeerthi Lasantha 4 years ago
commit b021509e94

@ -26,8 +26,8 @@ import java.util.List;
@XmlRootElement(name = "Condition")
public class Condition {
String id;
List<String> values;
private String id;
private List<String> values;
@XmlElement(name = "Id")
public String getId() {

@ -0,0 +1,58 @@
/*
* Copyright (c) 2019, 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.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "conditionLabel")
public class ConditionLabel {
@XmlAttribute(name = "id")
private String conditionID;
@XmlAttribute(name = "value")
private String conditionValue;
@XmlAttribute(name = "label")
private String conditionLabel;
public String getId() {
return conditionID;
}
public void setId(String conditionID) {
this.conditionID = conditionID;
}
public String getValue() {
return conditionValue;
}
public void setValue(String conditionValue) {
this.conditionValue = conditionValue;
}
public String getLabel() {
return conditionLabel;
}
public void setLabel(String conditionLabel) {
this.conditionLabel = conditionLabel;
}
}

@ -0,0 +1,69 @@
/*
* Copyright (c) 2019, 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.XmlRootElement;
@XmlRootElement(name = "Rule")
public class Rule {
@XmlElement(name = "required")
private boolean isRequired;
@XmlElement(name = "regex")
private String regexPattern;
@XmlElement(name = "validationMessage")
private String errorMessage;
@XmlElement(name = "customFunction")
private String customValidation;
public boolean isRequired() {
return isRequired;
}
public void setRequired(boolean isRequired) {
this.isRequired = isRequired;
}
public String getRegex() {
return regexPattern;
}
public void setRegex(String regexPattern) {
this.regexPattern = regexPattern;
}
public String getValidationMessage() {
return errorMessage;
}
public void setValidationMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
public String getCustomFunction() {
return customValidation;
}
public void setCustomFunction(String customValidation) {
this.customValidation = customValidation;
}
}

@ -76,6 +76,10 @@ public class UIParameter {
@XmlElement(name = "value")
protected List<String> value;
@XmlElementWrapper(name = "payloadValues")
@XmlElement(name = "value")
protected List<String> payloadValue;
@XmlElement(name = "key")
protected String key;
@ -83,6 +87,23 @@ public class UIParameter {
@XmlElement(name = "Condition")
private List<Condition> conditions;
@XmlElement(name = "defaultValue")
private String defaultValue;
@XmlElementWrapper(name = "conditionLabels")
@XmlElement(name = "conditionLabel")
private List<ConditionLabel> conditionLabels;
@XmlElementWrapper(name = "rules")
@XmlElement(name = "rule")
private List<Rule> rules;
@XmlElement(name = "isDisplay")
private boolean display;
@XmlElement(name = "payloadKey")
private String payloadKey;
public String getId() {
return id;
}
@ -155,4 +176,53 @@ public class UIParameter {
List<Condition> conditions) {
this.conditions = conditions;
}
public String getDefaultValue() {
return defaultValue;
}
public void setDefaultValue(String defaultValue) {
this.defaultValue = defaultValue;
}
public List<ConditionLabel> getConditionLabels() {
return conditionLabels;
}
public void setConditionLabels(
List<ConditionLabel> conditionLabels) {
this.conditionLabels = conditionLabels;
}
public List<String> getPayloadValue() {
return payloadValue;
}
public void setPayloadValue(List<String> payloadValue) {
this.payloadValue = payloadValue;
}
public List<Rule> getRules() {
return rules;
}
public void setRules(List<Rule> rules) {
this.rules = rules;
}
public boolean isDisplay() {
return display;
}
public void setDisplay(boolean display) {
this.display = display;
}
public String getPayloadKey() {
return payloadKey;
}
public void setPayloadKey(String payloadKey) {
this.payloadKey = payloadKey;
}
}

Loading…
Cancel
Save