RANGER-4350: removed @Xml annotations since only Json serde is supported in REST APIs
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java
index bb329fa..6113020 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java
@@ -33,9 +33,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,8 +43,6 @@
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
// This class needs above annotations for policy-engine unit tests involving RangerTagForEval objects that are initialized
// from JSON specification
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/AuditFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/AuditFilter.java
index 57116d4..4d6d7a1 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/AuditFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/AuditFilter.java
@@ -24,9 +24,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,8 +32,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class AuditFilter {
public enum AccessResult { DENIED, ALLOWED, NOT_DETERMINED }
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/GroupInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/GroupInfo.java
index 2799722..8ee0786 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/GroupInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/GroupInfo.java
@@ -24,17 +24,12 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.HashMap;
import java.util.Map;
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class GroupInfo extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
index 9196d86..e59ea23 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
@@ -22,10 +22,6 @@
import java.util.Date;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.authorization.utils.StringUtil;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,8 +31,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerMetrics.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerMetrics.java
index ab52a1f..9273dad 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerMetrics.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerMetrics.java
@@ -21,10 +21,6 @@
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -33,8 +29,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerMetrics {
private Map<String, Object> data;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
index 8a5734b..396896c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
@@ -25,9 +25,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
@@ -36,8 +33,6 @@
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPluginInfo implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
index e52b0d6..9e5a94b 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java
@@ -25,10 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.authorization.utils.StringUtil;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -40,8 +36,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPolicy extends RangerBaseModelObject implements java.io.Serializable {
public static final int POLICY_TYPE_ACCESS = 0;
public static final int POLICY_TYPE_DATAMASK = 1;
@@ -781,8 +775,6 @@ public int compare(RangerPolicy me, RangerPolicy other) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyResource implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -953,8 +945,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1264,8 +1254,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerDataMaskPolicyItem extends RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1351,8 +1339,6 @@ public StringBuilder toString(StringBuilder sb) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerRowFilterPolicyItem extends RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1438,8 +1424,6 @@ public StringBuilder toString(StringBuilder sb) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItemAccess implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1546,8 +1530,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItemCondition implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1669,8 +1651,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItemDataMaskInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1778,8 +1758,6 @@ public StringBuilder toString(StringBuilder sb) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyItemRowFilterInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyDelta.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyDelta.java
index e4d9b3a..6eae590 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyDelta.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyDelta.java
@@ -19,10 +19,6 @@
package org.apache.ranger.plugin.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -34,8 +30,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPolicyDelta implements java.io.Serializable {
public static final int CHANGE_TYPE_POLICY_CREATE = 0;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerRole.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerRole.java
index c7b3699..1643771 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerRole.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerRole.java
@@ -24,9 +24,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -36,8 +33,6 @@
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerRole extends RangerBaseModelObject implements java.io.Serializable {
public static final String KEY_USER = "user";
public static final String KEY_GROUP = "group";
@@ -139,8 +134,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RoleMember implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
index bd10ff1..71d64ca 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZone.java
@@ -23,9 +23,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,8 +31,6 @@
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerSecurityZone extends RangerBaseModelObject implements java.io.Serializable {
public static final long RANGER_UNZONED_SECURITY_ZONE_ID = 1L;
private static final long serialVersionUID = 1L;
@@ -150,8 +145,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerSecurityZoneService implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private List<HashMap<String, List<String>>> resources;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZoneHeaderInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZoneHeaderInfo.java
index 30214d3..02927b0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZoneHeaderInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerSecurityZoneHeaderInfo.java
@@ -17,18 +17,12 @@
package org.apache.ranger.plugin.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerSecurityZoneHeaderInfo extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private String name;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
index 326c91c..0cb58ba 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
@@ -23,10 +23,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -37,8 +33,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerService extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
index e70a165..fea224f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
@@ -27,10 +27,6 @@
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.authorization.utils.StringUtil;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -41,8 +37,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceDef extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -594,8 +588,6 @@ public StringBuilder toString(StringBuilder sb) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerEnumDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -770,8 +762,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerEnumElementDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -925,8 +915,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerServiceConfigDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1328,8 +1316,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerResourceDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -1920,8 +1906,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerAccessTypeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -2129,8 +2113,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerPolicyConditionDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -2498,8 +2480,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerContextEnricherDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -2655,8 +2635,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerDataMaskDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -2852,8 +2830,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerDataMaskTypeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -3113,8 +3089,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RangerRowFilterDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
index 9891c06..b9ea28b 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceHeaderInfo.java
@@ -17,18 +17,12 @@
package org.apache.ranger.plugin.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceHeaderInfo extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
index b7cf7ce..bc7bc1f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
@@ -24,16 +24,11 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Map;
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceResource extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceTags.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceTags.java
index c278692..a069451 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceTags.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceTags.java
@@ -26,9 +26,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -38,8 +35,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceTags implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTag.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTag.java
index fae8c86..3d00b01 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTag.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTag.java
@@ -24,17 +24,12 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.Map;
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerTag extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
index 8ace556..f0f64f0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
@@ -24,9 +24,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -40,8 +37,6 @@
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerTagDef extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
@@ -135,9 +130,6 @@ public boolean equals(Object obj) {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
-
public static class RangerTagAttributeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagResourceMap.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagResourceMap.java
index e72df41..f8bc068 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagResourceMap.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagResourceMap.java
@@ -23,15 +23,9 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerTagResourceMap extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java
index 41f1955..9d6eae6 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java
@@ -23,24 +23,16 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
@JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class RangerValidityRecurrence implements Serializable {
@JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class ValidityInterval {
private final int days;
private final int hours;
@@ -83,8 +75,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RecurrenceSchedule {
static final String PERMITTED_SPECIAL_CHARACTERS = "*,-";
static final String PERMITTED_SPECIAL_CHARACTERS_FOR_MINUTES = ",";
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java
index d092006..a6dfa65 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java
@@ -20,10 +20,6 @@
package org.apache.ranger.plugin.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -37,9 +33,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class RangerValiditySchedule implements Serializable {
public static final String VALIDITY_SCHEDULE_DATE_STRING_SPECIFICATION = "yyyy/MM/dd HH:mm:ss";
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/ServiceDeleteResponse.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/ServiceDeleteResponse.java
index 9069402..3f377f6 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/ServiceDeleteResponse.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/ServiceDeleteResponse.java
@@ -19,10 +19,6 @@
package org.apache.ranger.plugin.model;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -31,8 +27,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class ServiceDeleteResponse implements java.io.Serializable {
/**
*
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/UserInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/UserInfo.java
index 382e006..caecb58 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/UserInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/UserInfo.java
@@ -24,16 +24,11 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.*;
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class UserInfo extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceACLs.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceACLs.java
index 51afef4..f8554d5 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceACLs.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceACLs.java
@@ -28,9 +28,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
@@ -246,8 +243,6 @@ private void finalizeAcls(Map<String, Map<String, AccessResult>> acls) {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class AccessResult {
private int result;
private boolean isFinal;
@@ -317,8 +312,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class DataMaskResult implements Serializable {
private static final long serialVersionUID = 1L;
@@ -434,8 +427,6 @@ public StringBuilder toString(StringBuilder sb) {
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class RowFilterResult implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
index 0191be0..8e6f70b 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/ResourceLookupContext.java
@@ -22,10 +22,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -34,8 +30,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class ResourceLookupContext {
private String userInput;
private String resourceName;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/StoredServiceResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/StoredServiceResource.java
index 0d1378d..778636e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/StoredServiceResource.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/StoredServiceResource.java
@@ -24,17 +24,11 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Map;
@JsonAutoDetect(fieldVisibility=JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class StoredServiceResource implements java.io.Serializable {
private final Map<String, RangerPolicy.RangerPolicyResource> resourceElements;
private final String ownerName;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
index 6749818..3da2152 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
@@ -27,10 +27,6 @@
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -40,8 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class GrantRevokeRequest implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRoleRequest.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRoleRequest.java
index f10041c..7b84278 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRoleRequest.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRoleRequest.java
@@ -24,9 +24,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;
@@ -35,8 +32,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class GrantRevokeRoleRequest implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java
index 3d62c72..f75d046 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java
@@ -26,9 +26,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -36,9 +33,6 @@
@JsonAutoDetect(getterVisibility= JsonAutoDetect.Visibility.NONE, setterVisibility= JsonAutoDetect.Visibility.NONE, fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class RangerRequestedResources {
private List<RangerAccessResource> requestedResources = new ArrayList<>();
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRoles.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRoles.java
index 507b908..2ff4bd0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRoles.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRoles.java
@@ -24,9 +24,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Date;
import java.util.Set;
@@ -34,8 +31,6 @@
@JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerRoles implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerUserStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerUserStore.java
index 5436227..4869068 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerUserStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerUserStore.java
@@ -29,9 +29,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
@@ -41,8 +38,6 @@
@JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerUserStore implements Serializable {
private static final long serialVersionUID = 1L;
public static final String CLOUD_IDENTITY_NAME = "cloud_id";
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
index e022a1b..dd64a67 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServicePolicies.java
@@ -28,10 +28,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.commons.collections.MapUtils;
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.plugin.model.RangerPolicy;
@@ -49,8 +45,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class ServicePolicies implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private static final Logger LOG = LoggerFactory.getLogger(ServicePolicies.class);
@@ -229,8 +223,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class TagPolicies implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -365,8 +357,6 @@ public String toString() {
@JsonAutoDetect(fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown = true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class SecurityZoneInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private String zoneName;
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
index 96fd028..3f981e5 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceTags.java
@@ -28,10 +28,6 @@
import java.util.HashMap;
import java.util.ArrayList;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.plugin.model.RangerServiceResource;
import org.apache.ranger.plugin.model.RangerTag;
@@ -45,8 +41,6 @@
@JsonAutoDetect(fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_EMPTY)
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class ServiceTags implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
index 4c78a95..cced013 100644
--- a/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/kms/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -31,10 +31,8 @@
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
@MappedSuperclass
-@XmlRootElement
public abstract class XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
public static final int CLASS_TYPE_NONE = 0;
diff --git a/kms/src/main/java/org/apache/ranger/entity/XXRangerKeyStore.java b/kms/src/main/java/org/apache/ranger/entity/XXRangerKeyStore.java
index 8defdf6..6b541ec 100755
--- a/kms/src/main/java/org/apache/ranger/entity/XXRangerKeyStore.java
+++ b/kms/src/main/java/org/apache/ranger/entity/XXRangerKeyStore.java
@@ -26,12 +26,10 @@
import javax.persistence.Lob;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable(false)
@Table(name="ranger_keystore")
-@XmlRootElement
public class XXRangerKeyStore extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/kms/src/main/java/org/apache/ranger/entity/XXRangerMasterKey.java b/kms/src/main/java/org/apache/ranger/entity/XXRangerMasterKey.java
index c6c9703..64fdd56 100755
--- a/kms/src/main/java/org/apache/ranger/entity/XXRangerMasterKey.java
+++ b/kms/src/main/java/org/apache/ranger/entity/XXRangerMasterKey.java
@@ -25,11 +25,9 @@
import javax.persistence.Lob;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name="ranger_masterkey")
-@XmlRootElement
public class XXRangerMasterKey extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -81,4 +79,4 @@ public String getMasterKey() {
public void setMasterKey(String masterKey) {
this.masterKey = masterKey;
}
-}
\ No newline at end of file
+}
diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
index e228c92..3e6c8c9 100644
--- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
+++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/json/model/KMSSchedulerResponse.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class KMSSchedulerResponse implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -55,8 +49,6 @@ public List<String> getQueueNames() {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class KMSScheduler implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -74,8 +66,6 @@ public void collectQueueNames(List<String> queueNames) {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class KMSSchedulerInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -102,8 +92,6 @@ public void collectQueueNames(List<String> queueNames, String parentQueueName) {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class KMSQueues implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
index bc39c16..5a9520f 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/json/model/YarnSchedulerResponse.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -34,8 +30,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class YarnSchedulerResponse implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -57,8 +51,6 @@ public List<String> getQueueNames() {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class YarnScheduler implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -76,8 +68,6 @@ public void collectQueueNames(List<String> queueNames) {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class YarnSchedulerInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -104,8 +94,6 @@ public void collectQueueNames(List<String> queueNames, String parentQueueName) {
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
public static class YarnQueues implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
index 630364a..64bf2c4 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnum.java
@@ -21,12 +21,9 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.RangerCommonEnums;
-@XmlRootElement
public class VEnum extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
index bb063da..3597465 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VEnumElement.java
@@ -19,11 +19,8 @@
package org.apache.ranger.common.view;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.RangerCommonEnums;
-@XmlRootElement
public class VEnumElement extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
index 1f956a2..6a622bb 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VList.java
@@ -22,9 +22,7 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-@XmlRootElement
public abstract class VList extends ViewBaseBean implements
java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
index c6ead4a..8c86a92 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/VTrxLogAttr.java
@@ -21,11 +21,8 @@
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
-@XmlRootElement
public class VTrxLogAttr extends ViewBaseBean implements Serializable{
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
index 9badaa1..263586a 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/view/ViewBaseBean.java
@@ -19,8 +19,6 @@
package org.apache.ranger.common.view;
-import javax.xml.bind.annotation.XmlTransient;
-
import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.entity.XXDBBase;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -34,7 +32,6 @@ public class ViewBaseBean implements java.io.Serializable {
/**
* @return the gjObj
*/
- @XmlTransient
@JsonIgnore
public XXDBBase getMObj() {
return mObj;
@@ -48,9 +45,8 @@ public void setMObj(XXDBBase gjObj) {
this.mObj = gjObj;
}
- @XmlTransient
@JsonIgnore
public int getMyClassType() {
return RangerCommonEnums.CLASS_TYPE_NONE;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
index da9b526..0b0c1e4 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAudit.java
@@ -27,11 +27,9 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name="xa_access_audit")
-@XmlRootElement
public class XXAccessAudit extends XXAccessAuditBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
index 76da309..c00a69d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditBase.java
@@ -34,14 +34,12 @@
import javax.persistence.SequenceGenerator;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
import org.apache.ranger.common.RangerConstants;
@MappedSuperclass
-@XmlRootElement
public class XXAccessAuditBase extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
index 5dd6861..d6aee1c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV4.java
@@ -21,12 +21,10 @@
import javax.persistence.Entity;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
-@XmlRootElement
@Table(name = "xa_access_audit")
public class XXAccessAuditV4 extends XXAccessAuditBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
index b9b5c45..b82bc05 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessAuditV5.java
@@ -27,12 +27,10 @@
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
-@XmlRootElement
@Table(name = "xa_access_audit")
public class XXAccessAuditV5 extends XXAccessAuditBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
index db1878a..200a51d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_access_type_def")
public class XXAccessTypeDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -362,4 +360,4 @@ public String toString() {
+ ", rowFilterOptions=" + rowFilterOptions + ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
index 258e8a9..4024a50 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAccessTypeDefGrants.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_access_type_def_grants")
public class XXAccessTypeDefGrants extends XXDBBase implements
java.io.Serializable {
@@ -173,4 +171,4 @@ public String toString() {
+ ", atdId=" + atdId + ", impliedGrant=" + impliedGrant + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
index ac42ceb..9683db0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAsset.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
@@ -39,7 +38,6 @@
@Entity
@Table(name="x_asset")
-@XmlRootElement
public class XXAsset extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
index 5f51278..60695af 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuditMap.java
@@ -31,14 +31,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_audit_map")
-@XmlRootElement
public class XXAuditMap extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
index 079cda5..c03bb11 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXAuthSession.java
@@ -35,7 +35,6 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@@ -44,7 +43,6 @@
@Entity
@Table(name="x_auth_sess")
-@XmlRootElement
public class XXAuthSession extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
index be4faf5..98ae4a3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXContextEnricherDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_context_enricher_def")
public class XXContextEnricherDef extends XXDBBase implements
java.io.Serializable {
@@ -323,4 +321,4 @@ public String toString() {
return str;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
index 596b7c2..cdbf1d8 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXCredentialStore.java
@@ -31,14 +31,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_cred_store")
-@XmlRootElement
public class XXCredentialStore extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
index 4816b02..f70afce 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDBBase.java
@@ -32,14 +32,12 @@
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@MappedSuperclass @EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)
-@XmlRootElement
public abstract class XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
index 57e0154..216eef2 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataHist.java
@@ -21,13 +21,11 @@
import java.util.Date;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.DateUtil;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_data_hist")
public class XXDataHist implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -471,4 +469,4 @@ public String toString() {
+ ", content=" + content + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
index 47b4330..bc893f3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_datamask_type_def")
public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
index 6b8c8b5..a580663 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_enum_def")
public class XXEnumDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -245,4 +243,4 @@ public String toString() {
+ "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
index a681cc4..555984f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXEnumElementDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_enum_element_def")
public class XXEnumElementDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -311,4 +309,4 @@ public String toString() {
+ "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
index fddd5d1..2bec48f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalState.java
@@ -25,12 +25,10 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_ranger_global_state")
public class XXGlobalState extends XXGlobalStateBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
index 46ebc70..a1a39c6 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGlobalStateBase.java
@@ -20,11 +20,9 @@
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@MappedSuperclass
-@XmlRootElement
public abstract class XXGlobalStateBase extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
index 708375f..179b7f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroup.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
@@ -40,7 +39,6 @@
@Entity
@Table(name="x_group")
-@XmlRootElement
public class XXGroup extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
index 9f76da7..bc41001 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupGroup.java
@@ -31,14 +31,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_group_groups")
-@XmlRootElement
public class XXGroupGroup extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupPermission.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupPermission.java
index de555bf..745e609 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupPermission.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupPermission.java
@@ -24,15 +24,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
@Entity
@Table(name="x_group_module_perm")
-@XmlRootElement
-
public class XXGroupPermission extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -158,4 +155,4 @@ public String toString() {
return str;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
index b2fbc64..6ba1b8b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXGroupUser.java
@@ -31,14 +31,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_group_users")
-@XmlRootElement
public class XXGroupUser extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXModuleDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXModuleDef.java
index cacdb51..24f5763 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXModuleDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXModuleDef.java
@@ -24,12 +24,10 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_modules_master")
-@XmlRootElement
public class XXModuleDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
index b53d153..cb524c3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPermMap.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
@@ -39,7 +38,6 @@
@Entity
@Table(name="x_perm_map")
-@XmlRootElement
public class XXPermMap extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPluginInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPluginInfo.java
index 7b07bfc..a15d8d0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPluginInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPluginInfo.java
@@ -31,13 +31,11 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_plugin_info")
public class XXPluginInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
index 154d7cb..a84ecfa 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicy.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy")
public class XXPolicy extends XXPolicyBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -71,4 +69,4 @@ public String toString() {
return "XXPolicy [id=" + id + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
index 6854118..5817352 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyBase.java
@@ -20,10 +20,8 @@
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
@MappedSuperclass
-@XmlRootElement
public abstract class XXPolicyBase extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyChangeLog.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyChangeLog.java
index 8c95fb9..f1c026c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyChangeLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyChangeLog.java
@@ -33,7 +33,6 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@@ -41,7 +40,6 @@
@EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_change_log")
public class XXPolicyChangeLog implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
index bba35b1..393f043 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyConditionDef.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_condition_def")
public class XXPolicyConditionDef extends XXDBBase implements
java.io.Serializable {
@@ -574,4 +572,4 @@ public String toString() {
return str;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
index 4d3d5d7..15f7098 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyExportAudit.java
@@ -35,14 +35,12 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Table(name="x_policy_export_audit")
-@XmlRootElement
public class XXPolicyExportAudit extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
index 9f6e7f0..369b8a0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItem.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item")
public class XXPolicyItem extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -345,4 +343,4 @@ public String toString() {
+ ", delegateAdmin=" + delegateAdmin + ", itemType=" + itemType + ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
index a6e1a21..eca99b8 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemAccess.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_access")
public class XXPolicyItemAccess extends XXDBBase implements
java.io.Serializable {
@@ -279,4 +277,4 @@ public String toString() {
+ ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
index 3ad5161..1830917 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemCondition.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_condition")
public class XXPolicyItemCondition extends XXDBBase implements
java.io.Serializable {
@@ -279,4 +277,4 @@ public String toString() {
+ ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
index 8a93730..cebe4c3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemDataMaskInfo.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_datamask")
public class XXPolicyItemDataMaskInfo extends XXDBBase implements
java.io.Serializable {
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
index cae7200..0a88c0f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemGroupPerm.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_group_perm")
public class XXPolicyItemGroupPerm extends XXDBBase implements
java.io.Serializable {
@@ -210,4 +208,4 @@ public String toString() {
+ ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
index 4518818..8042fe7 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemRowFilterInfo.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_rowfilter")
public class XXPolicyItemRowFilterInfo extends XXDBBase implements
java.io.Serializable {
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
index eb76885..f569149 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyItemUserPerm.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_item_user_perm")
public class XXPolicyItemUserPerm extends XXDBBase implements
java.io.Serializable {
@@ -214,4 +212,4 @@ public String toString() {
return str;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabel.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabel.java
index d000c5b..011af17 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabel.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabel.java
@@ -29,11 +29,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_label")
public class XXPolicyLabel extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabelMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabelMap.java
index 2e9cfb9..af13f09 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabelMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyLabelMap.java
@@ -29,11 +29,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_label_map")
public class XXPolicyLabelMap extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefAccessType.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefAccessType.java
index 6af8f99..f1e8f90 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefAccessType.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefAccessType.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_ref_access_type")
public class XXPolicyRefAccessType extends XXDBBase implements
java.io.Serializable {
@@ -188,4 +186,4 @@ public String toString() {
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefCondition.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefCondition.java
index 4f4409d..fcae3bb 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefCondition.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefCondition.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_ref_condition")
public class XXPolicyRefCondition extends XXDBBase implements
java.io.Serializable {
@@ -188,4 +186,4 @@ public String toString() {
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefDataMaskType.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefDataMaskType.java
index cb92674..e6c40cc 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefDataMaskType.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefDataMaskType.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_ref_datamask_type")
public class XXPolicyRefDataMaskType extends XXDBBase implements
java.io.Serializable {
@@ -189,4 +187,4 @@ public String toString() {
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefGroup.java
index 32a1b9f..1c9adfd 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefGroup.java
@@ -30,7 +30,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -39,7 +38,6 @@
*/
@Entity
@Cacheable
-@XmlRootElement
@Table(name="x_policy_ref_group")
public class XXPolicyRefGroup extends XXDBBase implements Serializable {
@@ -203,4 +201,4 @@ public String toString() {
+ ", groupName=" + groupName + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefResource.java
index 1150646..ddc33e1 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefResource.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_ref_resource")
public class XXPolicyRefResource extends XXDBBase implements
java.io.Serializable {
@@ -188,4 +186,4 @@ public String toString() {
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefRole.java
index 7aee502..f0a9115 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefRole.java
@@ -30,7 +30,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -39,7 +38,6 @@
*/
@Entity
@Cacheable
-@XmlRootElement
@Table(name="x_policy_ref_role")
public class XXPolicyRefRole extends XXDBBase implements Serializable {
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefUser.java
index 8dfb928..8897af9 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyRefUser.java
@@ -19,12 +19,10 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_ref_user")
public class XXPolicyRefUser extends XXDBBase implements
java.io.Serializable {
@@ -188,4 +186,4 @@ public String toString() {
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
index 3c1fd3d..d21e153 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResource.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_resource")
public class XXPolicyResource extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -238,4 +236,4 @@ public String toString() {
+ "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
index 8c692db..393fb63 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyResourceMap.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy_resource_map")
public class XXPolicyResourceMap extends XXDBBase implements
java.io.Serializable {
@@ -210,4 +208,4 @@ public String toString() {
+ ", order=" + order + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyWithAssignedId.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyWithAssignedId.java
index ab70d61..7a1741a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyWithAssignedId.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPolicyWithAssignedId.java
@@ -22,11 +22,9 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_policy")
public class XXPolicyWithAssignedId extends XXPolicyBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
index 2ff3f69..881b181 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUser.java
@@ -33,7 +33,6 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@@ -44,7 +43,6 @@
@Entity
@Table(name="x_portal_user")
-@XmlRootElement
public class XXPortalUser extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
index 2f5e400..8469e61 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXPortalUserRole.java
@@ -31,14 +31,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.RangerConstants;
@Entity
@Table(name="x_portal_user_role")
-@XmlRootElement
public class XXPortalUserRole extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSMappingProvider.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSMappingProvider.java
index 135c275..c16592f 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSMappingProvider.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSMappingProvider.java
@@ -34,12 +34,10 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
@Table(name="x_rms_mapping_provider")
-@XmlRootElement
public class XXRMSMappingProvider implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSNotification.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSNotification.java
index 8ae8293..4768382 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSNotification.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSNotification.java
@@ -33,12 +33,10 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable(false)
@Table(name="x_rms_notification")
-@XmlRootElement
public class XXRMSNotification implements Serializable {
private static final long serialVersionUID = 1L;
@@ -144,4 +142,4 @@ public String toString( ) {
return str;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSResourceMapping.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSResourceMapping.java
index d0192fa..ff220b3 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSResourceMapping.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSResourceMapping.java
@@ -29,14 +29,12 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.Date;
@Entity
@Cacheable(false)
@Table(name="x_rms_resource_mapping")
-@XmlRootElement
public class XXRMSResourceMapping implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSServiceResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSServiceResource.java
index bf88783..9df61dc 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRMSServiceResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRMSServiceResource.java
@@ -30,12 +30,10 @@
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
@Table(name="x_rms_service_resource")
-@XmlRootElement
public class XXRMSServiceResource extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
index a47a530..5b2e19c 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResource.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
@@ -39,7 +38,6 @@
@Entity
@Table(name="x_resource")
-@XmlRootElement
public class XXResource extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
index 09df994..0bf2b78 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXResourceDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_resource_def")
public class XXResourceDef extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRole.java
index 779c3a0..b79e7fa 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRole.java
@@ -25,12 +25,10 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_role")
public class XXRole extends XXRoleBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleBase.java
index 0faad86..6a3728b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleBase.java
@@ -20,11 +20,9 @@
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@MappedSuperclass
-@XmlRootElement
public abstract class XXRoleBase extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefGroup.java
index 22b9447..596b9a1 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefGroup.java
@@ -29,7 +29,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -38,7 +37,6 @@
*/
@Entity
@Cacheable
-@XmlRootElement
@Table(name="x_role_ref_group")
public class XXRoleRefGroup extends XXDBBase implements Serializable {
@@ -231,4 +229,4 @@ public String toString() {
return "XXRoleRefGroup [" + super.toString() + " id=" + id + ", roleId=" + roleId +", groupId=" + groupId
+ ", groupName=" + groupName + ", groupType=" + groupType + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefRole.java
index 30867e2..b2b60ff 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefRole.java
@@ -29,7 +29,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
/**
* The persistent class for the x_role_ref_role database table.
@@ -37,7 +36,6 @@
*/
@Entity
@Cacheable
-@XmlRootElement
@Table(name="x_role_ref_role")
public class XXRoleRefRole extends XXDBBase implements Serializable {
@@ -230,4 +228,4 @@ public String toString() {
return "XXRoleRefRole [" + super.toString() + " id=" + id + ", roleId=" + roleId +", subRoleId=" + subRoleId
+ ", subRoleName=" + subRoleName + ", subRoleType=" + subRoleType + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefUser.java
index a5b17f7..2492650 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXRoleRefUser.java
@@ -29,7 +29,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
/**
@@ -38,7 +37,6 @@
*/
@Entity
@Cacheable
-@XmlRootElement
@Table(name="x_role_ref_user")
public class XXRoleRefUser extends XXDBBase implements Serializable {
@@ -231,4 +229,4 @@ public String toString() {
return "XXRoleRefUser [" + super.toString() + " id=" + id + ", roleId=" + roleId +", userId=" + userId
+ ", userName=" + userName + ", userType=" + userType + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZone.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZone.java
index 2b3ce56..0e082d0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZone.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZone.java
@@ -25,12 +25,10 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone")
public class XXSecurityZone extends XXSecurityZoneBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneBase.java
index 8f22599..ecdaf24 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneBase.java
@@ -20,11 +20,9 @@
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@MappedSuperclass
-@XmlRootElement
public abstract class XXSecurityZoneBase extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
index 0ae6b2f..79e0151 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
@@ -28,11 +28,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_group")
public class XXSecurityZoneRefGroup extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
@@ -213,4 +211,4 @@ public String toString() {
return "XXSecurityZoneRefGroup [" + super.toString() + " id=" + id + ", zoneId=" + zoneId + ", groupId="
+ groupId + ", groupName=" + groupName +", groupType=" + groupType + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
index 3d7197a..a3e6606 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
@@ -28,11 +28,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_resource")
public class XXSecurityZoneRefResource extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
@@ -184,4 +182,4 @@ public String toString() {
return "XXSecurityZoneRefResource [" + super.toString() + " id=" + id + ", zoneId=" + zoneId + ", resourceDefId="
+ resourceDefId + ", resourceName=" + resourceName + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefRole.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefRole.java
index aaf5b89..7da2c4e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefRole.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefRole.java
@@ -27,12 +27,10 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Objects;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_role")
public class XXSecurityZoneRefRole extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
@@ -182,4 +180,4 @@ public String toString() {
return "XXSecurityZoneRefRole [" + super.toString() + " id=" + id + ", zoneId=" + zoneId + ", roleId="
+ roleId + ", roleName=" + roleName + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
index a2cacc6..1464782 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
@@ -28,11 +28,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_service")
public class XXSecurityZoneRefService extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
@@ -185,4 +183,4 @@ public String toString() {
+ serviceId + ", serviceName=" + serviceName + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefTagService.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefTagService.java
index c67a464..d419bc9 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefTagService.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefTagService.java
@@ -28,10 +28,8 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_tag_srvc")
public class XXSecurityZoneRefTagService extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
index 4af242f..68e66c2 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
@@ -28,11 +28,9 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_security_zone_ref_user")
public class XXSecurityZoneRefUser extends XXDBBase implements java.io.Serializable{
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXService.java b/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
index 2d14d48..0ddad21 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXService.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service")
public class XXService extends XXServiceBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -72,4 +70,4 @@ public boolean equals(Object obj) {
return true;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
index 85ce53c..20bca1e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceBase.java
@@ -24,10 +24,8 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
@MappedSuperclass
-@XmlRootElement
public abstract class XXServiceBase extends XXDBBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
index acf1133..b58827a 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service_config_def")
public class XXServiceConfigDef extends XXDBBase implements
java.io.Serializable {
@@ -640,4 +638,4 @@ public String toString() {
+ "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
index 13f0964..094c589 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceConfigMap.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service_config_map")
public class XXServiceConfigMap extends XXDBBase implements
java.io.Serializable {
@@ -210,4 +208,4 @@ public String toString() {
+ ", configValue=" + configValue + "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
index f5b5629..dd6d66d 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDef.java
@@ -19,11 +19,9 @@
package org.apache.ranger.entity;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service_def")
public class XXServiceDef extends XXServiceDefBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
index 7f8d619..0741458 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefBase.java
@@ -22,10 +22,8 @@
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
@MappedSuperclass
-@XmlRootElement
public abstract class XXServiceDefBase extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefWithAssignedId.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefWithAssignedId.java
index 1cab8fe..d4802b7 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefWithAssignedId.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceDefWithAssignedId.java
@@ -22,11 +22,9 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service_def")
public class XXServiceDefWithAssignedId extends XXServiceDefBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
index c784830..937b99b 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResource.java
@@ -30,14 +30,12 @@
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_service_resource")
-@XmlRootElement
public class XXServiceResource extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
index 16dca97..e3480be 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElement.java
@@ -29,14 +29,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_service_resource_element")
-@XmlRootElement
public class XXServiceResourceElement extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
index 82ce8a0..76716ea 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceResourceElementValue.java
@@ -29,14 +29,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_service_resource_element_val")
-@XmlRootElement
public class XXServiceResourceElementValue extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
index cfb0137..369a4de 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceVersionInfo.java
@@ -33,7 +33,6 @@
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@@ -41,7 +40,6 @@
@EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service_version_info")
public class XXServiceVersionInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceWithAssignedId.java b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceWithAssignedId.java
index 257560c..1d1ed66 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXServiceWithAssignedId.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXServiceWithAssignedId.java
@@ -22,11 +22,9 @@
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_service")
public class XXServiceWithAssignedId extends XXServiceBase {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
index 9d5eb61..42a73d9 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTag.java
@@ -30,14 +30,12 @@
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_tag")
-@XmlRootElement
public class XXTag extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
index 1c88288..a9ae637 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttribute.java
@@ -29,14 +29,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_tag_attr")
-@XmlRootElement
public class XXTagAttribute extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
index 5c6ff58..8b7eb23 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagAttributeDef.java
@@ -29,13 +29,11 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_tag_attr_def")
public class XXTagAttributeDef extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagChangeLog.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagChangeLog.java
index 9f1002c..79264f6 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagChangeLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagChangeLog.java
@@ -33,7 +33,6 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
@@ -41,7 +40,6 @@
@EntityListeners( org.apache.ranger.common.db.JPABeanCallbacks.class)
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_tag_change_log")
public class XXTagChangeLog implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
index 88a7633..7aeaf23 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagDef.java
@@ -30,13 +30,11 @@
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Version;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_tag_def")
public class XXTagDef extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
index 4b8b3ec..64625b5 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTagResourceMap.java
@@ -29,14 +29,12 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
@Entity
@Cacheable
@Table(name="x_tag_resource_map")
-@XmlRootElement
public class XXTagResourceMap extends XXDBBase implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
index 4ef5262..c308fba 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXTrxLog.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
@@ -39,7 +38,6 @@
@Entity
@Table(name="x_trx_log")
-@XmlRootElement
public class XXTrxLog extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java
index afacb5d..9449afe 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUgsyncAuditInfo.java
@@ -22,12 +22,10 @@
import org.apache.ranger.common.AppConstants;
import javax.persistence.*;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Date;
@Entity
@Cacheable
-@XmlRootElement
@Table(name = "x_ugsync_audit_info")
public class XXUgsyncAuditInfo extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
index 99bea26..8859734 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUser.java
@@ -31,7 +31,6 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
@@ -40,7 +39,6 @@
@Entity
@Table(name="x_user")
-@XmlRootElement
public class XXUser extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXUserPermission.java b/security-admin/src/main/java/org/apache/ranger/entity/XXUserPermission.java
index fe687e0..ab1a3c0 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXUserPermission.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXUserPermission.java
@@ -24,13 +24,11 @@
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
@Entity
@Table(name = "x_user_module_perm")
-@XmlRootElement
public class XXUserPermission extends XXDBBase implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
index 28d6f03..1dec977 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/view/VXXTrxLog.java
@@ -31,14 +31,12 @@
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.DateUtil;
import org.apache.ranger.common.RangerConstants;
@Entity
@Table(name="vx_trx_log")
-@XmlRootElement
public class VXXTrxLog implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerExportPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerExportPolicyList.java
index 7b40c36..805a93a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerExportPolicyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerExportPolicyList.java
@@ -20,18 +20,12 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerExportPolicyList extends RangerPolicyList implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerExportRoleList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerExportRoleList.java
index 9616c1e..f9fdab9 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerExportRoleList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerExportRoleList.java
@@ -20,18 +20,12 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerExportRoleList extends RangerRoleList implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerPluginInfoList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerPluginInfoList.java
index 52b6bba..ca010b5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerPluginInfoList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerPluginInfoList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerPluginInfo;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPluginInfoList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerPolicyList.java
index 0fdc458..b1a2c35 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerPolicyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerPolicyList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerPolicyList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerRoleList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerRoleList.java
index f6d400f..b26704a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerRoleList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerRoleList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerRole;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerRoleList extends VList{
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerSecurityZoneList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerSecurityZoneList.java
index 8bf40c9..9361b8c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerSecurityZoneList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerSecurityZoneList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerSecurityZone;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerSecurityZoneList extends VList{
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerServiceDefList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerServiceDefList.java
index 4012c12..a4a4c44 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerServiceDefList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerServiceDefList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceDefList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/RangerServiceList.java b/security-admin/src/main/java/org/apache/ranger/view/RangerServiceList.java
index dfa2cea..3f7b78d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/RangerServiceList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/RangerServiceList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.apache.ranger.plugin.model.RangerService;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -32,8 +28,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class RangerServiceList extends VList {
private static final long serialVersionUID = 1L;
@@ -69,4 +63,4 @@ public List<?> getList() {
return services;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
index 4dfd207..cce18fa 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java
@@ -26,8 +26,6 @@
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.DateUtil;
import org.apache.ranger.common.RangerConstants;
@@ -40,7 +38,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXAccessAudit extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
index 04f881a..a20d9b2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAuditList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXAccessAuditList extends VList {
private static final long serialVersionUID = 1L;
List<VXAccessAudit> vXAccessAudits = new ArrayList<VXAccessAudit>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
index d5135c1..5c453ed 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAsset.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXAsset extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
index 60393ae..f944ac9 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAssetList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXAssetList extends VList {
private static final long serialVersionUID = 1L;
List<VXAsset> vXAssets = new ArrayList<VXAsset>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
index 4ecb6ab..3637431 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMap.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXAuditMap extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
index fa34030..6130e46 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditMapList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXAuditMapList extends VList {
private static final long serialVersionUID = 1L;
List<VXAuditMap> vXAuditMaps = new ArrayList<VXAuditMap>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
index 32b62b5..c2abf53 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecord.java
@@ -21,8 +21,6 @@
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -30,7 +28,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
public class VXAuditRecord {
/**
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
index a2c0fb3..0a31e3d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuditRecordList.java
@@ -22,10 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -33,8 +29,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXAuditRecordList extends VList {
/**
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
index 174398d..5e95ad5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSession.java
@@ -26,8 +26,6 @@
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.json.JsonDateSerializer;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -38,7 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXAuthSession extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
index 32a23b8..8529af0 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXAuthSessionList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXAuthSessionList extends VList {
private static final long serialVersionUID = 1L;
List<VXAuthSession> vXAuthSessions = new ArrayList<VXAuthSession>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
index adfb832..9c7ad91 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStore.java
@@ -24,8 +24,6 @@
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXCredentialStore extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
index 93dfd5c..cc073a0 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXCredentialStoreList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXCredentialStoreList extends VList {
private static final long serialVersionUID = 1L;
List<VXCredentialStore> vXCredentialStores = new ArrayList<VXCredentialStore>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
index 5c75f7f..ffd3fb4 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXDataObject.java
@@ -26,8 +26,6 @@
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.apache.ranger.json.JsonDateSerializer;
@@ -39,7 +37,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXDataObject extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java
index 52d94c2..248c7e3 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXFileSyncSourceInfo.java
@@ -29,12 +29,9 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlRootElement;
-
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXFileSyncSourceInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -124,4 +121,4 @@ public StringBuilder toString(StringBuilder sb) {
sb.append("\"}");
return sb;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
index 0106de2..f48c3b7 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroup.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXGroup extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
index d506117..b3744f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroup.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXGroupGroup extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
index 74d3037..829f41a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupGroupList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXGroupGroupList extends VList {
private static final long serialVersionUID = 1L;
List<VXGroupGroup> vXGroupGroups = new ArrayList<VXGroupGroup>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
index 43650bf..34e82b8 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXGroupList extends VList {
private static final long serialVersionUID = 1L;
List<VXGroup> vXGroups = new ArrayList<VXGroup>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermission.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermission.java
index 2e02eb5..4c335dd 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermission.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermission.java
@@ -17,8 +17,6 @@
package org.apache.ranger.view;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -28,8 +26,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-
public class VXGroupPermission extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermissionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermissionList.java
index 2e8a834..25ac6cf 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermissionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupPermissionList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -31,9 +27,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class VXGroupPermissionList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
index b338ce6..4d7053c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUser.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXGroupUser extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserInfo.java
index 9501a21..1fa2222 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserInfo.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.*;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXGroupUserInfo extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -63,4 +60,4 @@ public void setXuserInfo(List<VXUser> xuserInfo) {
this.xuserInfo = xuserInfo;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
index 4b5a5f9..a1495fd 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXGroupUserList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXGroupUserList extends VList {
private static final long serialVersionUID = 1L;
List<VXGroupUser> vXGroupUsers = new ArrayList<VXGroupUser>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
index d7a0b4d..ebef03a 100755
--- a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKey.java
@@ -26,8 +26,6 @@
import java.util.Map;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -37,7 +35,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXKmsKey extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
index ad65e77..f837682 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXKmsKeyList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXKmsKeyList extends VList {
private static final long serialVersionUID = 1L;
List<VXKmsKey> vXKeys = new ArrayList<VXKmsKey>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java
index d349a9e..a1132bf 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXLdapSyncSourceInfo.java
@@ -29,12 +29,9 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlRootElement;
-
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXLdapSyncSourceInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -175,4 +172,4 @@ public StringBuilder toString(StringBuilder sb) {
return sb;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
index d324bc5..3fb5ac3 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXLong.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXLong extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
index 5ee6b97..d7edad5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMessage.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXMessage extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricAuditDetailsCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricAuditDetailsCount.java
index 788c314..da59f15 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricAuditDetailsCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricAuditDetailsCount.java
@@ -16,17 +16,12 @@
*/
package org.apache.ranger.view;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricAuditDetailsCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyCount.java
index bb18775..dcf8ed4 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyCount.java
@@ -18,17 +18,12 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricPolicyCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyWithServiceNameCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyWithServiceNameCount.java
index 963b741..c84959e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyWithServiceNameCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricPolicyWithServiceNameCount.java
@@ -18,17 +18,12 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricPolicyWithServiceNameCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceCount.java
index 4574b5e..a68c85e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceCount.java
@@ -18,17 +18,12 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricServiceCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceNameCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceNameCount.java
index dd1c69f..c7568d6 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceNameCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricServiceNameCount.java
@@ -19,18 +19,12 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricServiceNameCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXMetricUserGroupCount.java b/security-admin/src/main/java/org/apache/ranger/view/VXMetricUserGroupCount.java
index c349a48..b7661ce 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXMetricUserGroupCount.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXMetricUserGroupCount.java
@@ -16,18 +16,12 @@
*/
package org.apache.ranger.view;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXMetricUserGroupCount implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -126,4 +120,4 @@ public String toString() {
+ ", userCountOfSysAdminAuditorRole=" + userCountOfSysAdminAuditorRole
+ ", userTotalCount=" + userTotalCount+ "]";
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXModuleDef.java b/security-admin/src/main/java/org/apache/ranger/view/VXModuleDef.java
index e561ec9..5994e45 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXModuleDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXModuleDef.java
@@ -20,7 +20,6 @@
import java.util.Date;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -29,8 +28,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-
public class VXModuleDef extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXModuleDefList.java b/security-admin/src/main/java/org/apache/ranger/view/VXModuleDefList.java
index 9463b7b..26ece37 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXModuleDefList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXModuleDefList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -31,9 +27,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class VXModuleDefList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXModulePermission.java b/security-admin/src/main/java/org/apache/ranger/view/VXModulePermission.java
index 9830d2f..b2ae56a 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXModulePermission.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXModulePermission.java
@@ -21,8 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -31,8 +29,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
-
public class VXModulePermission extends VXDataObject implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXModulePermissionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXModulePermissionList.java
index 032e044..775cf71 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXModulePermissionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXModulePermissionList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -31,9 +27,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class VXModulePermissionList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
index 6619a7a..ace6128 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPasswordChange.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXPasswordChange extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
index b8ac46a..22e960d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMap.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXPermMap extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
index 777045d..2aa7229 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermMapList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPermMapList extends VList {
private static final long serialVersionUID = 1L;
List<VXPermMap> vXPermMaps = new ArrayList<VXPermMap>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
index d1de837..d305805 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObj.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class VXPermObj implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
index b23b1c9..fa9d731 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPermObjList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPermObjList extends VList {
private static final long serialVersionUID = 1L;
List<VXPermObj> vXPermObjs = new ArrayList<VXPermObj>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
index df9b9c3..887d8e1 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicy.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -37,7 +35,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class VXPolicy extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
index 4c074f7..e441466 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java
@@ -26,8 +26,6 @@
import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.json.JsonDateSerializer;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -38,7 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXPolicyExportAudit extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
index 3e5b5f8..73e711c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAuditList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPolicyExportAuditList extends VList {
private static final long serialVersionUID = 1L;
List<VXPolicyExportAudit> vXPolicyExportAudits = new ArrayList<VXPolicyExportAudit>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabel.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabel.java
index 1c123c2..e2b5003 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabel.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabel.java
@@ -24,8 +24,6 @@
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -34,7 +32,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class VXPolicyLabel extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabelList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabelList.java
index d2392f7..2beaa6e 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabelList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyLabelList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPolicyLabelList extends VList {
private static final long serialVersionUID = 1L;
List<VXPolicyLabel> vxPolicyLabels = new ArrayList<VXPolicyLabel>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
index fc4849c..ffed0ef 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPolicyList extends VList {
private static final long serialVersionUID = 1L;
List<VXPolicy> vXPolicies = new ArrayList<VXPolicy>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
index fdb2709..397cf44 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUser.java
@@ -23,8 +23,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -34,7 +32,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXPortalUser extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
index b74463e..22c5cd6 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXPortalUserList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXPortalUserList extends VList {
private static final long serialVersionUID = 1L;
List<VXPortalUser> vXPortalUsers = new ArrayList<VXPortalUser>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
index a4c456e..bde5e59 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepository.java
@@ -24,8 +24,6 @@
* Repository
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class VXRepository extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
index 5e9c99b..1aee11f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXRepositoryList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXRepositoryList extends VList {
private static final long serialVersionUID = 1L;
List<VXRepository> vXRepositories = new ArrayList<VXRepository>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
index a1420b9..2685613 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResource.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -38,7 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXResource extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
index 338eaf5..51dc360 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResourceList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXResourceList extends VList {
private static final long serialVersionUID = 1L;
List<VXResource> vXResources = new ArrayList<VXResource>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
index c690136..9c7681c 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXResponse.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -38,7 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXResponse extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXString.java b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
index 22cf559..8e7b78d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXString.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXString.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.view.ViewBaseBean;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXString extends ViewBaseBean implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
index 903a0ab..71b82f5 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXStringList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXStringList extends VList {
private static final long serialVersionUID = 1L;
List<VXString> vXStrings = new ArrayList<VXString>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
index 911b133..4e6611d 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLog.java
@@ -24,8 +24,6 @@
*
*/
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.RangerConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -35,7 +33,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXTrxLog extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
index b28f61a..b671257 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXTrxLogList.java
@@ -22,9 +22,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -33,8 +30,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXTrxLogList extends VList {
private static final long serialVersionUID = 1L;
List<VXTrxLog> vXTrxLogs = new ArrayList<VXTrxLog>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java
index ff569a1..ac3675b 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfo.java
@@ -30,7 +30,6 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +37,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXUgsyncAuditInfo extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -156,4 +154,4 @@ public Map<String, String> getSyncSourceInfo() {
public void setSyncSourceInfo(Map<String, String> syncSourceInfo) {
this.syncSourceInfo = syncSourceInfo == null ? new HashMap<String, String>() :syncSourceInfo;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfoList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfoList.java
index c2170e8..d9ef48f 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfoList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUgsyncAuditInfoList.java
@@ -29,16 +29,11 @@
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXUgsyncAuditInfoList extends VList {
private static final long serialVersionUID = 1L;
List<VXUgsyncAuditInfo> vxUgsyncAuditInfoList = new ArrayList<VXUgsyncAuditInfo>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java
index dc87f31..9c581f4 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUnixSyncSourceInfo.java
@@ -29,12 +29,9 @@
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
-import javax.xml.bind.annotation.XmlRootElement;
-
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXUnixSyncSourceInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -154,4 +151,4 @@ public StringBuilder toString(StringBuilder sb) {
sb.append("\"}");
return sb;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
index 59375c4..9865572 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUser.java
@@ -26,8 +26,6 @@
import java.util.Collection;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RangerCommonEnums;
import org.codehaus.jackson.annotate.JsonAutoDetect;
@@ -38,7 +36,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXUser extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
index 5c6e3e7..ee1c3f2 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserGroupInfo.java
@@ -26,8 +26,6 @@
import java.util.List;
-import javax.xml.bind.annotation.*;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -36,7 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
@JsonIgnoreProperties(ignoreUnknown=true)
-@XmlRootElement
public class VXUserGroupInfo extends VXDataObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -63,4 +60,4 @@ public void setXgroupInfo(List<VXGroup> xgroupInfo) {
this.xgroupInfo = xgroupInfo;
}
-}
\ No newline at end of file
+}
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
index 8d5be6a..d66b230 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserList.java
@@ -27,10 +27,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -38,8 +34,6 @@
@JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL )
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
public class VXUserList extends VList {
private static final long serialVersionUID = 1L;
List<VXUser> vXUsers = new ArrayList<VXUser>();
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserPermission.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserPermission.java
index 82b5995..4e308f9 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserPermission.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserPermission.java
@@ -17,8 +17,6 @@
package org.apache.ranger.view;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.AppConstants;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
@@ -28,7 +26,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class VXUserPermission extends VXDataObject implements
java.io.Serializable {
diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXUserPermissionList.java b/security-admin/src/main/java/org/apache/ranger/view/VXUserPermissionList.java
index cc59e18..704a6fa 100644
--- a/security-admin/src/main/java/org/apache/ranger/view/VXUserPermissionList.java
+++ b/security-admin/src/main/java/org/apache/ranger/view/VXUserPermissionList.java
@@ -20,10 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.apache.ranger.common.view.VList;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -31,9 +27,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.FIELD)
-
public class VXUserPermissionList extends VList {
private static final long serialVersionUID = 1L;
diff --git a/ugsync-util/src/main/java/org/apache/ranger/ugsyncutil/model/UsersGroupRoleAssignments.java b/ugsync-util/src/main/java/org/apache/ranger/ugsyncutil/model/UsersGroupRoleAssignments.java
index a3e6c3e..b247000 100644
--- a/ugsync-util/src/main/java/org/apache/ranger/ugsyncutil/model/UsersGroupRoleAssignments.java
+++ b/ugsync-util/src/main/java/org/apache/ranger/ugsyncutil/model/UsersGroupRoleAssignments.java
@@ -22,8 +22,6 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
@@ -32,7 +30,6 @@
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
-@XmlRootElement
public class UsersGroupRoleAssignments {
List<String> users;
@@ -94,4 +91,4 @@ public boolean isReset() {
public void setReset(boolean reset) {
isReset = reset;
}
-}
\ No newline at end of file
+}
