RANGER-4225: Possible Jackson serialization issue due to not comply w…

…ith Java bean standards
apache · May 5, 2023 · 602a07d · 602a07d
1 parent bd4e82c
commit 602a07d
Show file tree

Hide file tree

Showing 30 changed files with 148 additions and 3 deletions.
diff --git a/docs/src/site/resources/css/custom.css b/docs/src/site/resources/css/custom.css
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /* You can override this file with your own styles */
 @import url('https://fonts.googleapis.com/css2?family=Raleway:wght@300;400;600&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;1,300;1,400&display=swap');
 

diff --git a/docs/src/site/resources/override-banner.js b/docs/src/site/resources/override-banner.js
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 // Using URL
 const currentPageUrl = window.location.href;
  // Check if the current page is the introduction page

diff --git a/docs/src/site/resources/ranger-logo.svg b/docs/src/site/resources/ranger-logo.svg
diff --git a/docs/src/site/resources/smooth-scroll.js b/docs/src/site/resources/smooth-scroll.js
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 $(document).ready(function() {
     // Smooth scrolling for internal links
     $('a[href^="#"]').not('[data-toggle="dropdown"]').on('click', function(e) {

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXAccessAuditList(List<VXAccessAudit> objList) {
     /**
      * @return the vXAccessAudits
      */
+    @JsonProperty("vXAccessAudits")
     public List<VXAccessAudit> getVXAccessAudits() {
 	return vXAccessAudits;
     }
@@ -64,6 +66,7 @@ public List<VXAccessAudit> getVXAccessAudits() {
      * @param vXAccessAudits
      *            the vXAccessAudits to set
      */
+    @JsonProperty("vXAccessAudits")
     public void setVXAccessAudits(List<VXAccessAudit> vXAccessAudits) {
 	this.vXAccessAudits = vXAccessAudits;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXAssetList(List<VXAsset> objList) {
     /**
      * @return the vXAssets
      */
+    @JsonProperty("vXAssets")
     public List<VXAsset> getVXAssets() {
 	return vXAssets;
     }
@@ -64,6 +66,7 @@ public List<VXAsset> getVXAssets() {
      * @param vXAssets
      *            the vXAssets to set
      */
+    @JsonProperty("vXAssets")
     public void setVXAssets(List<VXAsset> vXAssets) {
 	this.vXAssets = vXAssets;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXAuditMapList(List<VXAuditMap> objList) {
     /**
      * @return the vXAuditMaps
      */
+    @JsonProperty("vXAuditMaps")
     public List<VXAuditMap> getVXAuditMaps() {
 	return vXAuditMaps;
     }
@@ -64,6 +66,7 @@ public List<VXAuditMap> getVXAuditMaps() {
      * @param vXAuditMaps
      *            the vXAuditMaps to set
      */
+    @JsonProperty("vXAuditMaps")
     public void setVXAuditMaps(List<VXAuditMap> vXAuditMaps) {
 	this.vXAuditMaps = vXAuditMaps;
     }

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
@@ -29,6 +29,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -43,10 +44,12 @@ public class VXAuditRecordList extends VList {
 	private static final long serialVersionUID = 1L;
 	List<VXAuditRecord> vXAuditRecords = new ArrayList<VXAuditRecord>();
 
+	@JsonProperty("vXAuditRecords")
 	public List<VXAuditRecord> getvAudits() {
 		return vXAuditRecords;
 	}
 
+	@JsonProperty("vXAuditRecords")
 	public void setvAudits(List<VXAuditRecord> vXAuditRecords) {
 		this.vXAuditRecords = vXAuditRecords;
 	}

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXAuthSessionList(List<VXAuthSession> objList) {
     /**
      * @return the vXAuthSessions
      */
+    @JsonProperty("vXAuthSessions")
     public List<VXAuthSession> getVXAuthSessions() {
 	return vXAuthSessions;
     }
@@ -64,6 +66,7 @@ public List<VXAuthSession> getVXAuthSessions() {
      * @param vXAuthSessions
      *            the vXAuthSessions to set
      */
+    @JsonProperty("vXAuthSessions")
     public void setVXAuthSessions(List<VXAuthSession> vXAuthSessions) {
 	this.vXAuthSessions = vXAuthSessions;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXCredentialStoreList(List<VXCredentialStore> objList) {
     /**
      * @return the vXCredentialStores
      */
+    @JsonProperty("vXCredentialStores")
     public List<VXCredentialStore> getVXCredentialStores() {
 	return vXCredentialStores;
     }
@@ -64,6 +66,7 @@ public List<VXCredentialStore> getVXCredentialStores() {
      * @param vXCredentialStores
      *            the vXCredentialStores to set
      */
+    @JsonProperty("vXCredentialStores")
     public void setVXCredentialStores(List<VXCredentialStore> vXCredentialStores) {
 	this.vXCredentialStores = vXCredentialStores;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXGroupGroupList(List<VXGroupGroup> objList) {
     /**
      * @return the vXGroupGroups
      */
+    @JsonProperty("vXGroupGroups")
     public List<VXGroupGroup> getVXGroupGroups() {
 	return vXGroupGroups;
     }
@@ -64,6 +66,7 @@ public List<VXGroupGroup> getVXGroupGroups() {
      * @param vXGroupGroups
      *            the vXGroupGroups to set
      */
+    @JsonProperty("vXGroupGroups")
     public void setVXGroupGroups(List<VXGroupGroup> vXGroupGroups) {
 	this.vXGroupGroups = vXGroupGroups;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXGroupList(List<VXGroup> objList) {
     /**
      * @return the vXGroups
      */
+    @JsonProperty("vXGroups")
     public List<VXGroup> getVXGroups() {
 	return vXGroups;
     }
@@ -64,6 +66,7 @@ public List<VXGroup> getVXGroups() {
      * @param vXGroups
      *            the vXGroups to set
      */
+    @JsonProperty("vXGroups")
     public void setVXGroups(List<VXGroup> vXGroups) {
 	this.vXGroups = vXGroups;
     }

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
@@ -27,6 +27,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@@ -52,13 +53,15 @@ public VXGroupPermissionList(List<VXGroupPermission> objList) {
 	/**
 	 * @return the vXGroupPermission
 	 */
+	@JsonProperty("vXGroupPermission")
 	public List<VXGroupPermission> getvXGroupPermission() {
 		return vXGroupPermission;
 	}
 
 	/**
 	 * @param vXGroupPermission the vXGroupPermission to set
 	 */
+	@JsonProperty("vXGroupPermission")
 	public void setvXGroupPermission(List<VXGroupPermission> vXGroupPermission) {
 		this.vXGroupPermission = vXGroupPermission;
 	}

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXGroupUserList(List<VXGroupUser> objList) {
     /**
      * @return the vXGroupUsers
      */
+    @JsonProperty("vXGroupUsers")
     public List<VXGroupUser> getVXGroupUsers() {
 	return vXGroupUsers;
     }
@@ -64,6 +66,7 @@ public List<VXGroupUser> getVXGroupUsers() {
      * @param vXGroupUsers
      *            the vXGroupUsers to set
      */
+    @JsonProperty("vXGroupUsers")
     public void setVXGroupUsers(List<VXGroupUser> vXGroupUsers) {
 	this.vXGroupUsers = vXGroupUsers;
     }

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
@@ -34,6 +34,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility=Visibility.NONE, setterVisibility=Visibility.NONE, fieldVisibility=Visibility.ANY)
@@ -56,6 +57,7 @@ public VXKmsKeyList(List<VXKmsKey> objList) {
     /**
      * @return the vXKeys
      */
+    @JsonProperty("vXKeys")
     public List<VXKmsKey> getVXKeys() {
 	return vXKeys;
     }
@@ -64,6 +66,7 @@ public List<VXKmsKey> getVXKeys() {
      * @param vXKeys
      *            the vXKeys to set
      */
+    @JsonProperty("vXKeys")
     public void setVXKeys(List<VXKmsKey> vXKeys) {
 	this.vXKeys = vXKeys;
     }

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
@@ -27,6 +27,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@@ -52,13 +53,15 @@ public VXModuleDefList(List<VXModuleDef> objList) {
 	/**
 	 * @return the vXModuleDef
 	 */
+	@JsonProperty("vXModuleDef")
 	public List<VXModuleDef> getvXModuleDef() {
 		return vXModuleDef;
 	}
 
 	/**
 	 * @param vXModuleDef the vXModuleDef to set
 	 */
+	@JsonProperty("vXModuleDef")
 	public void setvXModuleDef(List<VXModuleDef> vXModuleDef) {
 		this.vXModuleDef = vXModuleDef;
 	}

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
@@ -27,6 +27,7 @@
 import org.apache.ranger.common.view.VList;
 import org.codehaus.jackson.annotate.JsonAutoDetect;
 import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.map.annotate.JsonSerialize;
 
 @JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@@ -49,10 +50,12 @@ public VXModulePermissionList(List<VXModulePermission> objList) {
 		this.vXModulePermissionList = objList;
 	}
 
+	@JsonProperty("vXModulePermissionList")
 	public List<VXModulePermission> getvXModulePermissionList() {
 		return vXModulePermissionList;
 	}
 
+	@JsonProperty("vXModulePermissionList")
 	public void setvXModulePermissionList(List<VXModulePermission> vXModulePermissionList) {
 		this.vXModulePermissionList = vXModulePermissionList;
 	}