Merge branch 'corrective-policy' into 'corrective-policy'

Improve Select class with APISelect class changes in policy mgt ui pack

See merge request entgra/carbon-device-mgt!662
corrective-policy
Dharmakeerthi Lasantha 4 years ago
commit 454f83570e

@ -1,65 +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;
@XmlRootElement(name = "APISelect")
public class APISelect {
private String apiUrl; // may be need to change
private String defineValueKey;
private String displayValueKey;
private String arrayPath;
@XmlElement(name = "Url")
public String getUrl() {
return apiUrl;
}
public void setUrl(String url) {
this.apiUrl = url;
}
@XmlElement(name = "DefineValueKey")
public String getDefineValueKey() {
return defineValueKey;
}
public void setDefineValueKey(String defineValueKey) {
this.defineValueKey = defineValueKey;
}
@XmlElement(name = "DisplayValueKey")
public String getDisplayValueKey() {
return displayValueKey;
}
public void setDisplayValueKey(String displayValueKey) {
this.displayValueKey = displayValueKey;
}
@XmlElement(name = "ArrayPath")
public String getArrayPath() {
return arrayPath;
}
public void setArrayPath(String arrayPath) {
this.arrayPath = arrayPath;
}
}

@ -45,7 +45,6 @@ public class Item {
private InputList inputList; private InputList inputList;
private String nullableValue; private String nullableValue;
private String divider; private String divider;
private APISelect apiSelect;
@XmlElement(name = "Label") @XmlElement(name = "Label")
public String getLabel() { public String getLabel() {
@ -208,13 +207,4 @@ public class Item {
public void setDivider(String divider) { public void setDivider(String divider) {
this.divider = divider; this.divider = divider;
} }
@XmlElement(name = "APISelect")
public APISelect getApiSelect() {
return apiSelect;
}
public void setApiSelect(APISelect apiSelect) {
this.apiSelect = apiSelect;
}
} }

@ -28,6 +28,10 @@ public class Select {
private String valueType; private String valueType;
private List<Option> options; private List<Option> options;
private String mode; private String mode;
private String apiUrl;
private String defineValueKey;
private String displayValueKey;
private String arrayPath;
@XmlElement(name = "ValueType", required = true) @XmlElement(name = "ValueType", required = true)
public String getValueType() { public String getValueType() {
@ -56,4 +60,40 @@ public class Select {
public void setMode(String mode) { public void setMode(String mode) {
this.mode = mode; this.mode = mode;
} }
@XmlElement(name = "Url")
public String getUrl() {
return apiUrl;
}
public void setUrl(String url) {
this.apiUrl = url;
}
@XmlElement(name = "DefineValueKey")
public String getDefineValueKey() {
return defineValueKey;
}
public void setDefineValueKey(String defineValueKey) {
this.defineValueKey = defineValueKey;
}
@XmlElement(name = "DisplayValueKey")
public String getDisplayValueKey() {
return displayValueKey;
}
public void setDisplayValueKey(String displayValueKey) {
this.displayValueKey = displayValueKey;
}
@XmlElement(name = "ArrayPath")
public String getArrayPath() {
return arrayPath;
}
public void setArrayPath(String arrayPath) {
this.arrayPath = arrayPath;
}
} }

Loading…
Cancel
Save