community
/
device-mgt-core
12
0
Fork 45
Code Issues Pull Requests 24 Packages Projects Releases Wiki Activity

Improve bean structure in policy UI config

Browse Source
merge-requests/542/head
tcdlpds@gmail.com 5 years ago
parent 8414679608
commit 660935e0d6
8 changed files with 79 additions and 133 deletions
Show Stats Download Patch File Download Diff File

22
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/ConditionList.java → components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Condition.java
Unescape View File

@ -18,20 +18,24 @@
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "ConditionList")
public class ConditionList {
@XmlRootElement(name = "Condition")
public class Condition {
List<Key> conditions;
String key;
List<String> values;
@XmlElement(name = "Key")
public List<Key> getConditions() {
return conditions;
}
public String getKey() { return key; }
public void setConditions(List<Key> conditions) {
this.conditions = conditions;
}
public void setKey(String key) { this.key = key; }
@XmlElementWrapper(name = "Values")
@XmlElement(name = "Value")
public List<String> getValues() { return values; }
public void setValues(List<String> values) { this.values = values; }
}

9
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Content.java
Unescape View File

@ -29,7 +29,6 @@ public class Content {
private String key;
private List<Item> items;
private List<SubContent> subContents;
private ConditionList conditionList;
@XmlAttribute(name = "key", required = true)
public String getKey() {
@ -56,12 +55,4 @@ public class Content {
public void setSubContents(List<SubContent> subContents) { this.subContents = subContents; }
@XmlElement(name = "ConditionList")
public ConditionList getConditionList() {
return conditionList;
}
public void setConditionList(ConditionList conditionList) {
this.conditionList = conditionList;
}
}

25
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Input.java
Unescape View File

@ -18,15 +18,16 @@
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "Input")
public class Input {
private String type;
private String placeholderValue;
private String regEx;
private String validationMessage;
private List<Rule> rules;
@XmlElement(name = "Type")
public String getType() {
@ -46,21 +47,9 @@ public class Input {
this.placeholderValue = placeholderValue;
}
@XmlElement(name = "Regex")
public String getRegEx() {
return regEx;
}
public void setRegEx(String regEx) {
this.regEx = regEx;
}
@XmlElementWrapper(name = "Rules")
@XmlElement(name = "Rule")
public List<Rule> getRules() { return rules; }
@XmlElement(name = "ValidationMsg")
public String getValidationMessage() {
return validationMessage;
}
public void setValidationMessage(String validationMessage) {
this.validationMessage = validationMessage;
}
public void setRules(List<Rule> rules) { this.rules = rules; }
}

20
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Item.java
Unescape View File

@ -18,7 +18,9 @@
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "Item")
public class Item {
@ -29,14 +31,14 @@ public class Item {
private String value;
private boolean isRequired;
private String subTitle;
private ConditionList conditionList;
private List<Condition> conditions;
private Checkbox checkbox;
private Select select;
private Input input;
private TimeSelector timeSelector;
private Table table;
private RadioGroup radioGroup;
private NotificationList notificationList;
private List<Notification> notifications;
@XmlElement(name = "Label")
public String getLabel() {
@ -88,10 +90,11 @@ public class Item {
public void setSubTitle(String subTitle) { this.subTitle = subTitle; }
@XmlElement(name = "ConditionList")
public ConditionList getConditionList() { return conditionList; }
@XmlElementWrapper(name = "Conditions")
@XmlElement(name = "Condition")
public List<Condition> getConditions() { return conditions; }
public void setConditionList(ConditionList conditionList) { this.conditionList = conditionList; }
public void setConditions(List<Condition> conditions) { this.conditions = conditions; }
@XmlElement(name = "Checkbox")
public Checkbox getCheckbox() {
@ -139,8 +142,9 @@ public class Item {
this.radioGroup = radioGroup;
}
@XmlElement(name = "NotificationList")
public NotificationList getNotificationList() { return notificationList; }
@XmlElementWrapper(name = "Notifications")
@XmlElement(name = "Notification")
public List<Notification> getNotifications() { return notifications; }
public void setNotificationList(NotificationList notificationList) { this.notificationList = notificationList; }
public void setNotifications(List<Notification> notifications) { this.notifications = notifications; }
}

46
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Key.java
Unescape View File

@ -1,46 +0,0 @@
/* 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.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Key")
public class Key {
private String name;
private String value;
@XmlAttribute(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@XmlAttribute(name = "value")
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}

37
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/NotificationList.java
Unescape View File

@ -1,37 +0,0 @@
/* 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.common.policy.mgt.ui;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
@XmlRootElement(name = "NotificationList")
public class NotificationList {
List<Notification> notification;
@XmlElement(name = "Notification")
public List<Notification> getConditions() {
return notification;
}
public void setConditions(List<Notification> notification) {
this.notification = notification;
}
}

40
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Rule.java
Unescape View File

@ -0,0 +1,40 @@
package org.wso2.carbon.device.mgt.common.policy.mgt.ui;/* 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.
*/
import javax.xml.bind.annotation.XmlElement;
public class Rule {
private String type;
private String logic;
private String validationMessage;
@XmlElement(name = "Type")
public String getType() { return type; }
public void setType(String type) { this.type = type; }
@XmlElement(name = "Logic")
public String getLogic() { return logic; }
public void setLogic(String logic) { this.logic = logic; }
@XmlElement(name = "ValidationMsg")
public String getValidationMessage() { return validationMessage; }
public void setValidationMessage(String validationMessage) { this.validationMessage = validationMessage; }
}

13
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/SubContent.java
Unescape View File

@ -28,7 +28,7 @@ public class SubContent {
private String key;
private List<Item> items;
private ConditionList conditionList;
private List<Condition> conditions;
private List<SubContent> subContents;
@XmlAttribute(name = "key", required = true)
@ -50,13 +50,14 @@ public class SubContent {
this.items = items;
}
@XmlElement(name = "ConditionList")
public ConditionList getConditionList() {
return conditionList;
@XmlElementWrapper(name = "Conditions")
@XmlElement(name = "Condition")
public List<Condition> getConditions() {
return conditions;
}
public void setConditionList(ConditionList conditionList) {
this.conditionList = conditionList;
public void setConditions(List<Condition> conditions) {
this.conditions = conditions;
}
@XmlElementWrapper(name = "SubContents")

Write Preview
Loading…
Cancel
Save