From 3d69ff979fbef5a0c099b58b05d3cb05db7f6d0c Mon Sep 17 00:00:00 2001 From: Madhan Neethiraj Date: Thu, 10 Aug 2023 09:19:28 -0700 Subject: [PATCH] RANGER-4350: removed @Xml annotations since only Json serde is supported in REST APIs --- .../contextenricher/RangerTagForEval.java | 5 ---- .../ranger/plugin/model/AuditFilter.java | 5 ---- .../apache/ranger/plugin/model/GroupInfo.java | 5 ---- .../plugin/model/RangerBaseModelObject.java | 6 ----- .../ranger/plugin/model/RangerMetrics.java | 6 ----- .../ranger/plugin/model/RangerPluginInfo.java | 5 ---- .../ranger/plugin/model/RangerPolicy.java | 22 ---------------- .../plugin/model/RangerPolicyDelta.java | 6 ----- .../ranger/plugin/model/RangerRole.java | 7 ----- .../plugin/model/RangerSecurityZone.java | 7 ----- .../model/RangerSecurityZoneHeaderInfo.java | 6 ----- .../ranger/plugin/model/RangerService.java | 6 ----- .../ranger/plugin/model/RangerServiceDef.java | 26 ------------------- .../plugin/model/RangerServiceHeaderInfo.java | 6 ----- .../plugin/model/RangerServiceResource.java | 5 ---- .../plugin/model/RangerServiceTags.java | 5 ---- .../apache/ranger/plugin/model/RangerTag.java | 5 ---- .../ranger/plugin/model/RangerTagDef.java | 8 ------ .../plugin/model/RangerTagResourceMap.java | 6 ----- .../model/RangerValidityRecurrence.java | 10 ------- .../plugin/model/RangerValiditySchedule.java | 7 ----- .../plugin/model/ServiceDeleteResponse.java | 6 ----- .../apache/ranger/plugin/model/UserInfo.java | 5 ---- .../policyengine/RangerResourceACLs.java | 9 ------- .../plugin/service/ResourceLookupContext.java | 6 ----- .../plugin/store/StoredServiceResource.java | 6 ----- .../plugin/util/GrantRevokeRequest.java | 6 ----- .../plugin/util/GrantRevokeRoleRequest.java | 5 ---- .../plugin/util/RangerRequestedResources.java | 6 ----- .../ranger/plugin/util/RangerRoles.java | 5 ---- .../ranger/plugin/util/RangerUserStore.java | 5 ---- .../ranger/plugin/util/ServicePolicies.java | 10 ------- .../ranger/plugin/util/ServiceTags.java | 6 ----- .../org/apache/ranger/entity/XXDBBase.java | 2 -- .../ranger/entity/XXRangerKeyStore.java | 2 -- .../ranger/entity/XXRangerMasterKey.java | 4 +-- .../json/model/KMSSchedulerResponse.java | 12 --------- .../json/model/YarnSchedulerResponse.java | 12 --------- .../org/apache/ranger/common/view/VEnum.java | 3 --- .../ranger/common/view/VEnumElement.java | 3 --- .../org/apache/ranger/common/view/VList.java | 2 -- .../ranger/common/view/VTrxLogAttr.java | 3 --- .../ranger/common/view/ViewBaseBean.java | 6 +---- .../apache/ranger/entity/XXAccessAudit.java | 2 -- .../ranger/entity/XXAccessAuditBase.java | 2 -- .../apache/ranger/entity/XXAccessAuditV4.java | 2 -- .../apache/ranger/entity/XXAccessAuditV5.java | 2 -- .../apache/ranger/entity/XXAccessTypeDef.java | 4 +-- .../ranger/entity/XXAccessTypeDefGrants.java | 4 +-- .../org/apache/ranger/entity/XXAsset.java | 2 -- .../org/apache/ranger/entity/XXAuditMap.java | 2 -- .../apache/ranger/entity/XXAuthSession.java | 2 -- .../ranger/entity/XXContextEnricherDef.java | 4 +-- .../ranger/entity/XXCredentialStore.java | 2 -- .../org/apache/ranger/entity/XXDBBase.java | 2 -- .../org/apache/ranger/entity/XXDataHist.java | 4 +-- .../ranger/entity/XXDataMaskTypeDef.java | 2 -- .../org/apache/ranger/entity/XXEnumDef.java | 4 +-- .../ranger/entity/XXEnumElementDef.java | 4 +-- .../apache/ranger/entity/XXGlobalState.java | 2 -- .../ranger/entity/XXGlobalStateBase.java | 2 -- .../org/apache/ranger/entity/XXGroup.java | 2 -- .../apache/ranger/entity/XXGroupGroup.java | 2 -- .../ranger/entity/XXGroupPermission.java | 5 +--- .../org/apache/ranger/entity/XXGroupUser.java | 2 -- .../org/apache/ranger/entity/XXModuleDef.java | 2 -- .../org/apache/ranger/entity/XXPermMap.java | 2 -- .../apache/ranger/entity/XXPluginInfo.java | 2 -- .../org/apache/ranger/entity/XXPolicy.java | 4 +-- .../apache/ranger/entity/XXPolicyBase.java | 2 -- .../ranger/entity/XXPolicyChangeLog.java | 2 -- .../ranger/entity/XXPolicyConditionDef.java | 4 +-- .../ranger/entity/XXPolicyExportAudit.java | 2 -- .../apache/ranger/entity/XXPolicyItem.java | 4 +-- .../ranger/entity/XXPolicyItemAccess.java | 4 +-- .../ranger/entity/XXPolicyItemCondition.java | 4 +-- .../entity/XXPolicyItemDataMaskInfo.java | 2 -- .../ranger/entity/XXPolicyItemGroupPerm.java | 4 +-- .../entity/XXPolicyItemRowFilterInfo.java | 2 -- .../ranger/entity/XXPolicyItemUserPerm.java | 4 +-- .../apache/ranger/entity/XXPolicyLabel.java | 2 -- .../ranger/entity/XXPolicyLabelMap.java | 2 -- .../ranger/entity/XXPolicyRefAccessType.java | 4 +-- .../ranger/entity/XXPolicyRefCondition.java | 4 +-- .../entity/XXPolicyRefDataMaskType.java | 4 +-- .../ranger/entity/XXPolicyRefGroup.java | 4 +-- .../ranger/entity/XXPolicyRefResource.java | 4 +-- .../apache/ranger/entity/XXPolicyRefRole.java | 2 -- .../apache/ranger/entity/XXPolicyRefUser.java | 4 +-- .../ranger/entity/XXPolicyResource.java | 4 +-- .../ranger/entity/XXPolicyResourceMap.java | 4 +-- .../ranger/entity/XXPolicyWithAssignedId.java | 2 -- .../apache/ranger/entity/XXPortalUser.java | 2 -- .../ranger/entity/XXPortalUserRole.java | 2 -- .../ranger/entity/XXRMSMappingProvider.java | 2 -- .../ranger/entity/XXRMSNotification.java | 4 +-- .../ranger/entity/XXRMSResourceMapping.java | 2 -- .../ranger/entity/XXRMSServiceResource.java | 2 -- .../org/apache/ranger/entity/XXResource.java | 2 -- .../apache/ranger/entity/XXResourceDef.java | 2 -- .../java/org/apache/ranger/entity/XXRole.java | 2 -- .../org/apache/ranger/entity/XXRoleBase.java | 2 -- .../apache/ranger/entity/XXRoleRefGroup.java | 4 +-- .../apache/ranger/entity/XXRoleRefRole.java | 4 +-- .../apache/ranger/entity/XXRoleRefUser.java | 4 +-- .../apache/ranger/entity/XXSecurityZone.java | 2 -- .../ranger/entity/XXSecurityZoneBase.java | 2 -- .../ranger/entity/XXSecurityZoneRefGroup.java | 4 +-- .../entity/XXSecurityZoneRefResource.java | 4 +-- .../ranger/entity/XXSecurityZoneRefRole.java | 4 +-- .../entity/XXSecurityZoneRefService.java | 4 +-- .../entity/XXSecurityZoneRefTagService.java | 2 -- .../ranger/entity/XXSecurityZoneRefUser.java | 2 -- .../org/apache/ranger/entity/XXService.java | 4 +-- .../apache/ranger/entity/XXServiceBase.java | 2 -- .../ranger/entity/XXServiceConfigDef.java | 4 +-- .../ranger/entity/XXServiceConfigMap.java | 4 +-- .../apache/ranger/entity/XXServiceDef.java | 2 -- .../ranger/entity/XXServiceDefBase.java | 2 -- .../entity/XXServiceDefWithAssignedId.java | 2 -- .../ranger/entity/XXServiceResource.java | 2 -- .../entity/XXServiceResourceElement.java | 2 -- .../entity/XXServiceResourceElementValue.java | 2 -- .../ranger/entity/XXServiceVersionInfo.java | 2 -- .../entity/XXServiceWithAssignedId.java | 2 -- .../java/org/apache/ranger/entity/XXTag.java | 2 -- .../apache/ranger/entity/XXTagAttribute.java | 2 -- .../ranger/entity/XXTagAttributeDef.java | 2 -- .../apache/ranger/entity/XXTagChangeLog.java | 2 -- .../org/apache/ranger/entity/XXTagDef.java | 2 -- .../ranger/entity/XXTagResourceMap.java | 2 -- .../org/apache/ranger/entity/XXTrxLog.java | 2 -- .../ranger/entity/XXUgsyncAuditInfo.java | 2 -- .../java/org/apache/ranger/entity/XXUser.java | 2 -- .../ranger/entity/XXUserPermission.java | 2 -- .../apache/ranger/entity/view/VXXTrxLog.java | 2 -- .../ranger/view/RangerExportPolicyList.java | 6 ----- .../ranger/view/RangerExportRoleList.java | 6 ----- .../ranger/view/RangerPluginInfoList.java | 6 ----- .../apache/ranger/view/RangerPolicyList.java | 6 ----- .../apache/ranger/view/RangerRoleList.java | 6 ----- .../ranger/view/RangerSecurityZoneList.java | 6 ----- .../ranger/view/RangerServiceDefList.java | 6 ----- .../apache/ranger/view/RangerServiceList.java | 8 +----- .../org/apache/ranger/view/VXAccessAudit.java | 3 --- .../apache/ranger/view/VXAccessAuditList.java | 6 ----- .../java/org/apache/ranger/view/VXAsset.java | 3 --- .../org/apache/ranger/view/VXAssetList.java | 6 ----- .../org/apache/ranger/view/VXAuditMap.java | 3 --- .../apache/ranger/view/VXAuditMapList.java | 6 ----- .../org/apache/ranger/view/VXAuditRecord.java | 3 --- .../apache/ranger/view/VXAuditRecordList.java | 6 ----- .../org/apache/ranger/view/VXAuthSession.java | 3 --- .../apache/ranger/view/VXAuthSessionList.java | 6 ----- .../apache/ranger/view/VXCredentialStore.java | 3 --- .../ranger/view/VXCredentialStoreList.java | 6 ----- .../org/apache/ranger/view/VXDataObject.java | 3 --- .../ranger/view/VXFileSyncSourceInfo.java | 5 +--- .../java/org/apache/ranger/view/VXGroup.java | 3 --- .../org/apache/ranger/view/VXGroupGroup.java | 3 --- .../apache/ranger/view/VXGroupGroupList.java | 6 ----- .../org/apache/ranger/view/VXGroupList.java | 6 ----- .../apache/ranger/view/VXGroupPermission.java | 4 --- .../ranger/view/VXGroupPermissionList.java | 7 ----- .../org/apache/ranger/view/VXGroupUser.java | 3 --- .../apache/ranger/view/VXGroupUserInfo.java | 5 +--- .../apache/ranger/view/VXGroupUserList.java | 6 ----- .../java/org/apache/ranger/view/VXKmsKey.java | 3 --- .../org/apache/ranger/view/VXKmsKeyList.java | 6 ----- .../ranger/view/VXLdapSyncSourceInfo.java | 5 +--- .../java/org/apache/ranger/view/VXLong.java | 3 --- .../org/apache/ranger/view/VXMessage.java | 3 --- .../view/VXMetricAuditDetailsCount.java | 5 ---- .../ranger/view/VXMetricPolicyCount.java | 5 ---- .../VXMetricPolicyWithServiceNameCount.java | 5 ---- .../ranger/view/VXMetricServiceCount.java | 5 ---- .../ranger/view/VXMetricServiceNameCount.java | 6 ----- .../ranger/view/VXMetricUserGroupCount.java | 8 +----- .../org/apache/ranger/view/VXModuleDef.java | 3 --- .../apache/ranger/view/VXModuleDefList.java | 7 ----- .../ranger/view/VXModulePermission.java | 4 --- .../ranger/view/VXModulePermissionList.java | 7 ----- .../apache/ranger/view/VXPasswordChange.java | 3 --- .../org/apache/ranger/view/VXPermMap.java | 3 --- .../org/apache/ranger/view/VXPermMapList.java | 6 ----- .../org/apache/ranger/view/VXPermObj.java | 3 --- .../org/apache/ranger/view/VXPermObjList.java | 6 ----- .../java/org/apache/ranger/view/VXPolicy.java | 3 --- .../ranger/view/VXPolicyExportAudit.java | 3 --- .../ranger/view/VXPolicyExportAuditList.java | 6 ----- .../org/apache/ranger/view/VXPolicyLabel.java | 3 --- .../apache/ranger/view/VXPolicyLabelList.java | 6 ----- .../org/apache/ranger/view/VXPolicyList.java | 6 ----- .../org/apache/ranger/view/VXPortalUser.java | 3 --- .../apache/ranger/view/VXPortalUserList.java | 6 ----- .../org/apache/ranger/view/VXRepository.java | 3 --- .../apache/ranger/view/VXRepositoryList.java | 6 ----- .../org/apache/ranger/view/VXResource.java | 3 --- .../apache/ranger/view/VXResourceList.java | 6 ----- .../org/apache/ranger/view/VXResponse.java | 3 --- .../java/org/apache/ranger/view/VXString.java | 3 --- .../org/apache/ranger/view/VXStringList.java | 6 ----- .../java/org/apache/ranger/view/VXTrxLog.java | 3 --- .../org/apache/ranger/view/VXTrxLogList.java | 5 ---- .../apache/ranger/view/VXUgsyncAuditInfo.java | 4 +-- .../ranger/view/VXUgsyncAuditInfoList.java | 5 ---- .../ranger/view/VXUnixSyncSourceInfo.java | 5 +--- .../java/org/apache/ranger/view/VXUser.java | 3 --- .../apache/ranger/view/VXUserGroupInfo.java | 5 +--- .../org/apache/ranger/view/VXUserList.java | 6 ----- .../apache/ranger/view/VXUserPermission.java | 3 --- .../ranger/view/VXUserPermissionList.java | 7 ----- .../model/UsersGroupRoleAssignments.java | 5 +--- 213 files changed, 44 insertions(+), 865 deletions(-) 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 bb329fac44..6113020f01 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 57116d46b1..4d6d7a1579 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 279972227a..8ee0786fa8 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 9196d86bbf..e59ea23458 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 ab52a1f0e7..9273dadea6 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 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 8a5734ba35..396896cde4 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 e52b0d6148..9e5a94b1ae 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 e4d9b3a40b..6eae590c45 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 c7b3699df8..1643771ed0 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 bd10ff1dfe..71d64ca832 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>> 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 30214d3252..02927b07b9 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 326c91cfbe..0cb58bae09 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 e70a16592e..fea224ff9a 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 9891c06c29..b9ea28b437 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 b7cf7cebb5..bc7bc1fb32 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 c278692274..a069451059 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 fae8c86c25..3d00b01f04 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 8ace55673c..f0f64f0236 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 e72df418c8..f8bc068335 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 41f19554e0..9d6eae6e85 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 d092006840..a6dfa65267 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 9069402f15..3f377f6ec3 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 382e006b9a..caecb58644 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 51afef47cd..f8554d574b 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> 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 0191be0dbc..8e6f70b980 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 0d1378d364..778636e373 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 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 67498182c3..3da2152498 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 f10041c216..7b842785c2 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 3d62c72306..f75d046823 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 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 507b908bb3..2ff4bd098d 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 543622796b..486906869d 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 e022a1b179..dd64a67675 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 96fd028732..3f981e5585 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 4c78a95b92..cced013a18 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 8defdf663f..6b541eca55 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 c6c9703002..64fdd56e40 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 e228c92dd2..3e6c8c9e0c 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 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 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 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 bc39c1661e..5a9520f2bb 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 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 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 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 630364af97..64bf2c43c7 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 bb063dad90..359746592a 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 1f956a2d0a..6a622bb0f5 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 c6ead4a5f6..8c86a92c6b 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 9badaa1eb2..263586a335 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 da9b526a48..0b0c1e4fa8 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 76da309012..c00a69da09 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 5dd68618b0..d6aee1c0cf 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 b9b5c458b6..b82bc05158 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 db1878a357..200a51d338 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 258e8a96e9..4024a50576 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 ac42ceb3af..9683db0389 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 5f51278139..60695af4d7 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 079cda54df..c03bb11296 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 be4faf5efb..98ae4a3945 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 596b7c2466..cdbf1d8e5e 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 4816b02f90..f70afcee1c 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 57e0154043..216eef2e0b 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 47b4330343..bc893f3d93 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 6b8c8b52f3..a5806630e4 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 a681cc4596..555984f96b 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 fddd5d1888..2bec48fedf 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 46ebc7004b..a1a39c672c 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 708375f3ed..179b7f95c8 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 9f76da78dd..bc410017a3 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 de555bf449..745e609101 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 b2fbc64e73..6ba1b8b28e 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 cacdb517c4..24f5763060 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 b53d153c08..cb524c3113 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 7b07bfc9ad..a15d8d056d 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 154d7cb5e2..a84ecfafeb 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 6854118021..5817352551 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 8c95fb9c92..f1c026cea2 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 bba35b1ec1..393f043d0c 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 4d3d5d7a00..15f7098688 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 9f6e7f0b10..369b8a05e8 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 a6e1a216d7..eca99b8f99 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 3ad5161957..183091753b 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 8a93730d5b..cebe4c3e66 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 cae7200dc1..0a88c0f23a 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 45188184d1..8042fe74a3 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 eb7688501f..f5691496b4 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 d000c5bcf1..011af17c69 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 2e9cfb9178..af13f09078 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 6af8f99f4b..f1e8f90bcf 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 4f4409d6af..fcae3bb10e 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 cb926740e9..e6c40cc71c 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 32a1b9f24c..1c9adfd532 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 1150646210..ddc33e1efa 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 7aee502e02..f0a91159fe 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 8dfb928336..8897af9017 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 3c1fd3dbed..d21e153695 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 8c692dbc2e..393fb635fd 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 ab70d61083..7a1741a0f5 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 2ff3f6996e..881b181cd4 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 2f5e400d7b..8469e61965 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 135c275980..c16592f722 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 8ae8293a50..4768382a76 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 d0192fab8a..ff220b372f 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 bf88783b3a..9df61dc39d 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 a47a5305c6..5b2e19ca4c 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 09df994315..0bf2b781a9 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 779c3a0378..b79e7fa1fb 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 0faad86081..6a3728bda2 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 22b9447916..596b9a12ad 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 30867e28d7..b2b60ff5c6 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 a5b17f716e..24926506fa 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 2b3ce564cb..0e082d0e86 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 8f22599d1f..ecdaf2485c 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 0ae6b2ffce..79e0151fe8 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 3d7197a161..a3e6606c1a 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 aaf5b89297..7da2c4e143 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 a2cacc6741..14647821fc 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 c67a4648d0..d419bc9ed5 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 4af242fd38..68e66c2f11 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 2d14d48861..0ddad21439 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 85ce53caea..20bca1e327 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 acf1133088..b58827addd 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 13f096486e..094c589d29 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 f5b56297d5..dd6d66d4ca 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 7f8d6193fa..0741458e51 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 1cab8fe543..d4802b7b06 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 c784830ef3..937b99baf1 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 16dca97530..e3480be362 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 82ce8a09be..76716ea08d 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 cfb0137b97..369a4de094 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 257560c9cb..1d1ed66140 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 9d5eb6152c..42a73d910c 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 1c8828826b..a9ae637124 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 5c6ff58f06..8b7eb23ce1 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 9f1002c9fd..79264f63cd 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 88a7633ea4..7aeaf2354f 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 4b8b3ec28d..64625b5063 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 4ef52621f1..c308fba7b2 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 afacb5d976..9449afee9c 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 99bea26f3c..885973496c 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 fe687e06ba..ab1a3c0fee 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 28d6f03601..1dec977477 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 7b40c36a21..805a93a000 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 9616c1e4a4..f9fdab9dd1 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 52b6bbae20..ca010b50ff 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 0fdc4580be..b1a2c35891 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 f6d400f429..b26704a158 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 8bf40c901c..9361b8ca7e 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 4012c12136..a4a4c4404b 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 dfa2cea52d..3f7b78dd49 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 4dfd20754c..cce18fafb8 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 04f881ae3a..a20d9b27b2 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 vXAccessAudits = new ArrayList(); 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 d5135c1e3b..5c453ed869 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 60393ae574..f944ac9ded 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 vXAssets = new ArrayList(); 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 4ecb6abb24..3637431aa4 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 fa34030ed8..6130e4663c 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 vXAuditMaps = new ArrayList(); 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 32b62b573f..c2abf533bd 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 a2c0fb306c..0a31e3dc16 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 174398d061..5e95ad59bf 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 32a23b8c13..8529af07da 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 vXAuthSessions = new ArrayList(); 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 adfb832e67..9c7ad91d6b 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 93dfd5cb4c..cc073a0496 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 vXCredentialStores = new ArrayList(); 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 5c75f7f0a2..ffd3fb4d97 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 52d94c2231..248c7e33d5 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 0106de25d1..f48c3b78f3 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 d506117721..b3744f20e8 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 74d30371ea..829f41adad 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 vXGroupGroups = new ArrayList(); 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 43650bffe5..34e82b8a1d 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 vXGroups = new ArrayList(); 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 2e02eb5b5b..4c335dd240 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 2e8a834581..25ac6cf472 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 b338ce6e90..4d7053c673 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 9501a21c30..1fa22224ec 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 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 4b5a5f92c1..a1495fd87d 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 vXGroupUsers = new ArrayList(); 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 d7a0b4d75f..ebef03a80f 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 ad65e772cd..f837682f08 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 vXKeys = new ArrayList(); 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 d349a9e254..a1132bfeb5 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 d324bc5184..3fb5ac3a5e 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 5ee6b97ff3..d7edad5b14 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 788c314930..da59f15665 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 bb1877543a..dcf8ed48cb 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 963b7415a1..c84959e943 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 4574b5e7a0..a68c85e7d5 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 dd1c69f07e..c7568d61ee 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 c349a488f2..b7661ce3bd 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 e561ec9781..5994e45e95 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 9463b7bb60..26ece379ae 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 9830d2fb21..b2ae56a98d 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 032e0447a3..775cf71487 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 6619a7ab63..ace612887d 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 b8ac46a952..22e960d211 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 777045d613..2aa7229bf5 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 vXPermMaps = new ArrayList(); 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 d1de837ef1..d305805a79 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 b23b1c9493..fa9d73196d 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 vXPermObjs = new ArrayList(); 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 df9b9c3a6f..887d8e1ff7 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 4c074f7bf9..e441466e5f 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 3e5b5f858f..73e711c99c 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 vXPolicyExportAudits = new ArrayList(); 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 1c123c2656..e2b50038f4 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 d2392f7094..2beaa6e533 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 vxPolicyLabels = new ArrayList(); 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 fc4849c748..ffed0ef881 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 vXPolicies = new ArrayList(); 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 fdb27093d8..397cf44674 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 b74463e1b3..22c5cd62af 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 vXPortalUsers = new ArrayList(); 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 a4c456e8b1..bde5e59cb6 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 5e9c99b849..1aee11f363 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 vXRepositories = new ArrayList(); 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 a1420b9ad4..26856132b4 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 338eaf526e..51dc3609c5 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 vXResources = new ArrayList(); 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 c690136a93..9c7681c32c 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 22cf559d45..8e7b78def2 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 903a0aba87..71b82f545d 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 vXStrings = new ArrayList(); 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 911b133b35..4e6611da2c 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 b28f61a4a5..b6712576b2 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 vXTrxLogs = new ArrayList(); 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 ff569a111f..ac3675bdf3 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 getSyncSourceInfo() { public void setSyncSourceInfo(Map syncSourceInfo) { this.syncSourceInfo = syncSourceInfo == null ? new HashMap() :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 c2170e8e4d..d9ef48f70d 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 vxUgsyncAuditInfoList = new ArrayList(); 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 dc87f31d3d..9c581f4b6e 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 59375c42a7..9865572a8d 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 5c6e3e7de2..ee1c3f29c7 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 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 8d5be6a44a..d66b23091d 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 vXUsers = new ArrayList(); 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 82b5995a10..4e308f95bb 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 cc59e180c0..704a6fa60b 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 a3e6c3e567..b2470004c1 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 users; @@ -94,4 +91,4 @@ public boolean isReset() { public void setReset(boolean reset) { isReset = reset; } -} \ No newline at end of file +}