From 602a07daeb9838cb3c8ed80828cb7120d529672c Mon Sep 17 00:00:00 2001 From: Sercan Tekin Date: Thu, 4 May 2023 21:34:08 -0400 Subject: [PATCH] RANGER-4225: Possible Jackson serialization issue due to not comply with Java bean standards --- docs/src/site/resources/css/custom.css | 17 +++++++++++++++++ docs/src/site/resources/override-banner.js | 17 +++++++++++++++++ docs/src/site/resources/ranger-logo.svg | 16 ++++++++++++++++ docs/src/site/resources/smooth-scroll.js | 17 +++++++++++++++++ .../apache/ranger/view/VXAccessAuditList.java | 3 +++ .../org/apache/ranger/view/VXAssetList.java | 3 +++ .../org/apache/ranger/view/VXAuditMapList.java | 3 +++ .../apache/ranger/view/VXAuditRecordList.java | 3 +++ .../apache/ranger/view/VXAuthSessionList.java | 3 +++ .../ranger/view/VXCredentialStoreList.java | 3 +++ .../apache/ranger/view/VXGroupGroupList.java | 3 +++ .../org/apache/ranger/view/VXGroupList.java | 3 +++ .../ranger/view/VXGroupPermissionList.java | 3 +++ .../org/apache/ranger/view/VXGroupUserList.java | 3 +++ .../org/apache/ranger/view/VXKmsKeyList.java | 3 +++ .../org/apache/ranger/view/VXModuleDefList.java | 3 +++ .../ranger/view/VXModulePermissionList.java | 3 +++ .../org/apache/ranger/view/VXPermMapList.java | 3 +++ .../org/apache/ranger/view/VXPermObjList.java | 3 +++ .../ranger/view/VXPolicyExportAuditList.java | 3 +++ .../apache/ranger/view/VXPolicyLabelList.java | 9 ++++++--- .../org/apache/ranger/view/VXPolicyList.java | 3 +++ .../apache/ranger/view/VXPortalUserList.java | 3 +++ .../apache/ranger/view/VXRepositoryList.java | 3 +++ .../org/apache/ranger/view/VXResourceList.java | 3 +++ .../org/apache/ranger/view/VXStringList.java | 3 +++ .../org/apache/ranger/view/VXTrxLogList.java | 3 +++ .../ranger/view/VXUgsyncAuditInfoList.java | 3 +++ .../java/org/apache/ranger/view/VXUserList.java | 3 +++ .../ranger/view/VXUserPermissionList.java | 3 +++ 30 files changed, 148 insertions(+), 3 deletions(-) diff --git a/docs/src/site/resources/css/custom.css b/docs/src/site/resources/css/custom.css index a0592ced5eb..394aeab6f23 100644 --- 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 index f5613a01a67..f104d969692 100644 --- 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 index 814255694d3..ddff252f8ef 100644 --- a/docs/src/site/resources/ranger-logo.svg +++ b/docs/src/site/resources/ranger-logo.svg @@ -1,3 +1,19 @@ + diff --git a/docs/src/site/resources/smooth-scroll.js b/docs/src/site/resources/smooth-scroll.js index a2d5db61bd2..21bb9001ba0 100644 --- 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 index 04f881ae3a9..f7a37477482 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 @@ -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 objList) { /** * @return the vXAccessAudits */ + @JsonProperty("vXAccessAudits") public List getVXAccessAudits() { return vXAccessAudits; } @@ -64,6 +66,7 @@ public List getVXAccessAudits() { * @param vXAccessAudits * the vXAccessAudits to set */ + @JsonProperty("vXAccessAudits") public void setVXAccessAudits(List 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 index 60393ae574c..6c932af0e70 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 @@ -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 objList) { /** * @return the vXAssets */ + @JsonProperty("vXAssets") public List getVXAssets() { return vXAssets; } @@ -64,6 +66,7 @@ public List getVXAssets() { * @param vXAssets * the vXAssets to set */ + @JsonProperty("vXAssets") public void setVXAssets(List 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 index fa34030ed8a..970b46ba61c 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 @@ -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 objList) { /** * @return the vXAuditMaps */ + @JsonProperty("vXAuditMaps") public List getVXAuditMaps() { return vXAuditMaps; } @@ -64,6 +66,7 @@ public List getVXAuditMaps() { * @param vXAuditMaps * the vXAuditMaps to set */ + @JsonProperty("vXAuditMaps") public void setVXAuditMaps(List 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 index a2c0fb306cf..e75953c87ec 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 @@ -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 vXAuditRecords = new ArrayList(); + @JsonProperty("vXAuditRecords") public List getvAudits() { return vXAuditRecords; } + @JsonProperty("vXAuditRecords") public void setvAudits(List 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 index 32a23b8c130..96073615f3a 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 @@ -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 objList) { /** * @return the vXAuthSessions */ + @JsonProperty("vXAuthSessions") public List getVXAuthSessions() { return vXAuthSessions; } @@ -64,6 +66,7 @@ public List getVXAuthSessions() { * @param vXAuthSessions * the vXAuthSessions to set */ + @JsonProperty("vXAuthSessions") public void setVXAuthSessions(List 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 index 93dfd5cb4cd..c29dce0b54a 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 @@ -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 objList) { /** * @return the vXCredentialStores */ + @JsonProperty("vXCredentialStores") public List getVXCredentialStores() { return vXCredentialStores; } @@ -64,6 +66,7 @@ public List getVXCredentialStores() { * @param vXCredentialStores * the vXCredentialStores to set */ + @JsonProperty("vXCredentialStores") public void setVXCredentialStores(List 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 index 74d30371ea7..68560bbf91c 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 @@ -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 objList) { /** * @return the vXGroupGroups */ + @JsonProperty("vXGroupGroups") public List getVXGroupGroups() { return vXGroupGroups; } @@ -64,6 +66,7 @@ public List getVXGroupGroups() { * @param vXGroupGroups * the vXGroupGroups to set */ + @JsonProperty("vXGroupGroups") public void setVXGroupGroups(List 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 index 43650bffe5a..77488f1c76a 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 @@ -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 objList) { /** * @return the vXGroups */ + @JsonProperty("vXGroups") public List getVXGroups() { return vXGroups; } @@ -64,6 +66,7 @@ public List getVXGroups() { * @param vXGroups * the vXGroups to set */ + @JsonProperty("vXGroups") public void setVXGroups(List 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 index 2e8a8345818..2fb44ad3860 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 @@ -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,6 +53,7 @@ public VXGroupPermissionList(List objList) { /** * @return the vXGroupPermission */ + @JsonProperty("vXGroupPermission") public List getvXGroupPermission() { return vXGroupPermission; } @@ -59,6 +61,7 @@ public List getvXGroupPermission() { /** * @param vXGroupPermission the vXGroupPermission to set */ + @JsonProperty("vXGroupPermission") public void setvXGroupPermission(List 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 index 4b5a5f92c17..0f92d726859 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 @@ -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 objList) { /** * @return the vXGroupUsers */ + @JsonProperty("vXGroupUsers") public List getVXGroupUsers() { return vXGroupUsers; } @@ -64,6 +66,7 @@ public List getVXGroupUsers() { * @param vXGroupUsers * the vXGroupUsers to set */ + @JsonProperty("vXGroupUsers") public void setVXGroupUsers(List 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 index ad65e772cd8..b99b5e49591 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 @@ -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 objList) { /** * @return the vXKeys */ + @JsonProperty("vXKeys") public List getVXKeys() { return vXKeys; } @@ -64,6 +66,7 @@ public List getVXKeys() { * @param vXKeys * the vXKeys to set */ + @JsonProperty("vXKeys") public void setVXKeys(List 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 index 9463b7bb608..c83854a5208 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 @@ -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,6 +53,7 @@ public VXModuleDefList(List objList) { /** * @return the vXModuleDef */ + @JsonProperty("vXModuleDef") public List getvXModuleDef() { return vXModuleDef; } @@ -59,6 +61,7 @@ public List getvXModuleDef() { /** * @param vXModuleDef the vXModuleDef to set */ + @JsonProperty("vXModuleDef") public void setvXModuleDef(List 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 index 032e0447a38..6888a45ac47 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 @@ -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 objList) { this.vXModulePermissionList = objList; } + @JsonProperty("vXModulePermissionList") public List getvXModulePermissionList() { return vXModulePermissionList; } + @JsonProperty("vXModulePermissionList") public void setvXModulePermissionList(List vXModulePermissionList) { this.vXModulePermissionList = vXModulePermissionList; } 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 777045d613e..f3069c13d1c 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 @@ -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 VXPermMapList(List objList) { /** * @return the vXPermMaps */ + @JsonProperty("vXPermMaps") public List getVXPermMaps() { return vXPermMaps; } @@ -64,6 +66,7 @@ public List getVXPermMaps() { * @param vXPermMaps * the vXPermMaps to set */ + @JsonProperty("vXPermMaps") public void setVXPermMaps(List vXPermMaps) { this.vXPermMaps = vXPermMaps; } 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 b23b1c9493d..4bfb62ad7a0 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 @@ -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 VXPermObjList(List objList) { /** * @return the vXPermObjs */ + @JsonProperty("vXPermObjs") public List getVXPermObjs() { return vXPermObjs; } @@ -64,6 +66,7 @@ public List getVXPermObjs() { * @param vXPermObjs * the vXPermObjs to set */ + @JsonProperty("vXPermObjs") public void setVXPermObjs(List vXPermObjs) { this.vXPermObjs = vXPermObjs; } 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 3e5b5f858f9..99774e7bae3 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 @@ -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 VXPolicyExportAuditList(List objList) { /** * @return the vXPolicyExportAudits */ + @JsonProperty("vXPolicyExportAudits") public List getVXPolicyExportAudits() { return vXPolicyExportAudits; } @@ -64,6 +66,7 @@ public List getVXPolicyExportAudits() { * @param vXPolicyExportAudits * the vXPolicyExportAudits to set */ + @JsonProperty("vXPolicyExportAudits") public void setVXPolicyExportAudits(List vXPolicyExportAudits) { this.vXPolicyExportAudits = vXPolicyExportAudits; } 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 d2392f70945..e0565239c31 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 @@ -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,13 +57,15 @@ public VXPolicyLabelList(List objList) { /** * @return the VXPolicyLabels */ + @JsonProperty("vxPolicyLabels") public List getVXPolicyLabels() { return vxPolicyLabels; } - public void setVXPolicyLabels(List vxPolicyLabels) { - this.vxPolicyLabels = vxPolicyLabels; - } + @JsonProperty("vxPolicyLabels") + public void setVXPolicyLabels(List vxPolicyLabels) { + this.vxPolicyLabels = vxPolicyLabels; + } @Override public int getListSize() { 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 fc4849c7485..cdefaafe720 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 @@ -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 VXPolicyList(List objList) { /** * @return the vXPolicies */ + @JsonProperty("vXPolicies") public List getVXPolicies() { return vXPolicies; } @@ -64,6 +66,7 @@ public List getVXPolicies() { * @param vXPolicies * the vXPolicies to set */ + @JsonProperty("vXPolicies") public void setVXPolicies(List vXPolicies) { this.vXPolicies = vXPolicies; } 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 b74463e1b38..16acd8638fc 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 @@ -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 VXPortalUserList(List objList) { /** * @return the vXPortalUsers */ + @JsonProperty("vXPortalUsers") public List getVXPortalUsers() { return vXPortalUsers; } @@ -64,6 +66,7 @@ public List getVXPortalUsers() { * @param vXPortalUsers * the vXPortalUsers to set */ + @JsonProperty("vXPortalUsers") public void setVXPortalUsers(List vXPortalUsers) { this.vXPortalUsers = vXPortalUsers; } 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 5e9c99b8490..92f019bf6aa 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 @@ -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 VXRepositoryList(List objList) { /** * @return the vXRepositories */ + @JsonProperty("vXRepositories") public List getVXRepositories() { return vXRepositories; } @@ -64,6 +66,7 @@ public List getVXRepositories() { * @param vXRepositories * the vXRepositories to set */ + @JsonProperty("vXRepositories") public void setVXRepositories(List vXRepositories) { this.vXRepositories = vXRepositories; } 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 338eaf526ea..fcfa67a4b1b 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 @@ -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 VXResourceList(List objList) { /** * @return the vXResources */ + @JsonProperty("vXResources") public List getVXResources() { return vXResources; } @@ -64,6 +66,7 @@ public List getVXResources() { * @param vXResources * the vXResources to set */ + @JsonProperty("vXResources") public void setVXResources(List vXResources) { this.vXResources = vXResources; } 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 903a0aba878..a1ae242009d 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 @@ -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 VXStringList(List objList) { /** * @return the vXStrings */ + @JsonProperty("vXStrings") public List getVXStrings() { return vXStrings; } @@ -64,6 +66,7 @@ public List getVXStrings() { * @param vXStrings * the vXStrings to set */ + @JsonProperty("vXStrings") public void setVXStrings(List vXStrings) { this.vXStrings = vXStrings; } 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 b28f61a4a53..4d72b9dea78 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 @@ -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) @@ -51,6 +52,7 @@ public VXTrxLogList(List objList) { /** * @return the vXTrxLogs */ + @JsonProperty("vXTrxLogs") public List getVXTrxLogs() { return vXTrxLogs; } @@ -59,6 +61,7 @@ public List getVXTrxLogs() { * @param vXTrxLogs * the vXTrxLogs to set */ + @JsonProperty("vXTrxLogs") public void setVXTrxLogs(List vXTrxLogs) { this.vXTrxLogs = vXTrxLogs; } 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 c2170e8e4d6..98b4f16e4e4 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 @@ -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; import javax.xml.bind.annotation.XmlAccessType; @@ -55,6 +56,7 @@ public VXUgsyncAuditInfoList(List objList) { /** * @return the vXAccessAudits */ + @JsonProperty("vxUgsyncAuditInfoList") public List getVxUgsyncAuditInfoList() { return vxUgsyncAuditInfoList; } @@ -63,6 +65,7 @@ public List getVxUgsyncAuditInfoList() { * @param vxUgsyncAuditInfoList * the vXAccessAudits to set */ + @JsonProperty("vxUgsyncAuditInfoList") public void setVxUgsyncAuditInfoList(List vxUgsyncAuditInfoList) { this.vxUgsyncAuditInfoList = vxUgsyncAuditInfoList; } 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 8d5be6a44af..36b07430f7b 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 @@ -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 VXUserList(List objList) { /** * @return the vXUsers */ + @JsonProperty("vXUsers") public List getVXUsers() { return vXUsers; } @@ -64,6 +66,7 @@ public List getVXUsers() { * @param vXUsers * the vXUsers to set */ + @JsonProperty("vXUsers") public void setVXUsers(List vXUsers) { this.vXUsers = vXUsers; } 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 cc59e180c0b..1ebb5bad8e0 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 @@ -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,6 +53,7 @@ public VXUserPermissionList(List objList) { /** * @return the vXModuleDef */ + @JsonProperty("vXUserPermission") public List getvXModuleDef() { return vXUserPermission; } @@ -59,6 +61,7 @@ public List getvXModuleDef() { /** * @param vXModuleDef the vXModuleDef to set */ + @JsonProperty("vXUserPermission") public void setvXModuleDef(List vXModuleDef) { this.vXUserPermission = vXModuleDef; }