From 660935e0d69a54d2cd8b4aa379f5cfbb70c90b4a Mon Sep 17 00:00:00 2001 From: "tcdlpds@gmail.com" Date: Thu, 14 May 2020 23:37:12 +0530 Subject: [PATCH] Improve bean structure in policy UI config --- .../ui/{ConditionList.java => Condition.java} | 22 +++++---- .../mgt/common/policy/mgt/ui/Content.java | 9 ---- .../mgt/common/policy/mgt/ui/Input.java | 25 +++------- .../device/mgt/common/policy/mgt/ui/Item.java | 20 ++++---- .../device/mgt/common/policy/mgt/ui/Key.java | 46 ------------------- .../policy/mgt/ui/NotificationList.java | 37 --------------- .../device/mgt/common/policy/mgt/ui/Rule.java | 40 ++++++++++++++++ .../mgt/common/policy/mgt/ui/SubContent.java | 13 +++--- 8 files changed, 79 insertions(+), 133 deletions(-) rename components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/{ConditionList.java => Condition.java} (66%) delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Key.java delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/NotificationList.java create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Rule.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/ConditionList.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Condition.java similarity index 66% rename from components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/ConditionList.java rename to components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Condition.java index 31015d0c3f..a70f47039e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/ConditionList.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Condition.java @@ -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 conditions; + String key; + List values; @XmlElement(name = "Key") - public List getConditions() { - return conditions; - } + public String getKey() { return key; } - public void setConditions(List conditions) { - this.conditions = conditions; - } + public void setKey(String key) { this.key = key; } + + @XmlElementWrapper(name = "Values") + @XmlElement(name = "Value") + public List getValues() { return values; } + + public void setValues(List values) { this.values = values; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Content.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Content.java index 77de28d8f2..5b950b2231 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Content.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Content.java @@ -29,7 +29,6 @@ public class Content { private String key; private List items; private List subContents; - private ConditionList conditionList; @XmlAttribute(name = "key", required = true) public String getKey() { @@ -56,12 +55,4 @@ public class Content { public void setSubContents(List subContents) { this.subContents = subContents; } - @XmlElement(name = "ConditionList") - public ConditionList getConditionList() { - return conditionList; - } - - public void setConditionList(ConditionList conditionList) { - this.conditionList = conditionList; - } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Input.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Input.java index 664a5299b2..6aaa54a8e3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Input.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Input.java @@ -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 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 getRules() { return rules; } - @XmlElement(name = "ValidationMsg") - public String getValidationMessage() { - return validationMessage; - } - - public void setValidationMessage(String validationMessage) { - this.validationMessage = validationMessage; - } + public void setRules(List rules) { this.rules = rules; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Item.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Item.java index fd905ff0af..d760d6ccc8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Item.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Item.java @@ -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 conditions; private Checkbox checkbox; private Select select; private Input input; private TimeSelector timeSelector; private Table table; private RadioGroup radioGroup; - private NotificationList notificationList; + private List 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 getConditions() { return conditions; } - public void setConditionList(ConditionList conditionList) { this.conditionList = conditionList; } + public void setConditions(List 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 getNotifications() { return notifications; } - public void setNotificationList(NotificationList notificationList) { this.notificationList = notificationList; } + public void setNotifications(List notifications) { this.notifications = notifications; } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Key.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Key.java deleted file mode 100644 index 303d634d26..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Key.java +++ /dev/null @@ -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; - } -} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/NotificationList.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/NotificationList.java deleted file mode 100644 index cc63fe4a40..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/NotificationList.java +++ /dev/null @@ -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; - - @XmlElement(name = "Notification") - public List getConditions() { - return notification; - } - - public void setConditions(List notification) { - this.notification = notification; - } -} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Rule.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Rule.java new file mode 100644 index 0000000000..5a8df96bd1 --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/Rule.java @@ -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; } +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/SubContent.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/SubContent.java index b3981ee7d4..c9eba46873 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/SubContent.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/ui/SubContent.java @@ -28,7 +28,7 @@ public class SubContent { private String key; private List items; - private ConditionList conditionList; + private List conditions; private List 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 getConditions() { + return conditions; } - public void setConditionList(ConditionList conditionList) { - this.conditionList = conditionList; + public void setConditions(List conditions) { + this.conditions = conditions; } @XmlElementWrapper(name = "SubContents")