[ranger] branch ranger-2.3 updated: RANGER-3690: Fix NullPointerException in java patch 054

[pradeep]

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch ranger-2.3
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.3 by this push:
     new 7fc670bdf RANGER-3690: Fix NullPointerException in java patch 054
7fc670bdf is described below

commit 7fc670bdfad96c04268d24abdd7cf6d065d65819
Author: abhishek.kumar <abhishek.ku...@cloudera.com>
AuthorDate: Thu Mar 31 13:39:54 2022 -0700

    RANGER-3690: Fix NullPointerException in java patch 054
    
    Signed-off-by: pradeep <prad...@apache.org>
---
 .../ranger/patch/PatchForSyncSourceUpdate_J10054.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
 
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
index e8d2be1b5..bbde1a4df 100644
--- 
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForSyncSourceUpdate_J10054.java
@@ -18,13 +18,15 @@
 package org.apache.ranger.patch;
 
 import com.google.gson.Gson;
-import org.apache.log4j.Logger;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ranger.db.RangerDaoManager;
 import org.apache.ranger.entity.XXGroup;
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.entity.XXUser;
 import org.apache.ranger.ugsyncutil.util.UgsyncCommonConstants;
 import org.apache.ranger.util.CLIUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -37,7 +39,7 @@ public class PatchForSyncSourceUpdate_J10054 extends 
BaseLoader{
     @Autowired
     RangerDaoManager daoManager;
 
-    private static final Logger logger = 
Logger.getLogger(PatchForSyncSourceUpdate_J10054.class);
+    private static final Logger logger = 
LoggerFactory.getLogger(PatchForSyncSourceUpdate_J10054.class);
 
     @Override
     public void init() throws Exception {/* Do Nothing */}
@@ -82,10 +84,10 @@ public class PatchForSyncSourceUpdate_J10054 extends 
BaseLoader{
         for( XXUser xUser: users) {
             String syncSource      = xUser.getSyncSource();
             String otherAttributes = xUser.getOtherAttributes();
-            if (otherAttributes != null && syncSource == null){
+            if (StringUtils.isNotEmpty(otherAttributes) && 
StringUtils.isEmpty(syncSource)){
                 syncSource = (String) gson.fromJson(otherAttributes, 
Map.class).get(UgsyncCommonConstants.SYNC_SOURCE);
                 xUser.setSyncSource(syncSource);
-                if (syncSource != null) {
+                if (StringUtils.isNotEmpty(syncSource)) {
                     XXPortalUser xXPortalUser = 
daoManager.getXXPortalUser().findByLoginId(xUser.getName());
                     if (xXPortalUser != null && xXPortalUser.getUserSource() 
== 0){
                         /* updating the user source to external for users 
which had some sync source prior to upgrade
@@ -116,9 +118,9 @@ public class PatchForSyncSourceUpdate_J10054 extends 
BaseLoader{
         for( XXGroup xGroup: groups) {
             String syncSource      = xGroup.getSyncSource();
             String otherAttributes = xGroup.getOtherAttributes();
-            if (otherAttributes != null && syncSource == null){
+            if (StringUtils.isNotEmpty(otherAttributes) && 
StringUtils.isEmpty(syncSource)){
                 syncSource = (String) gson.fromJson(otherAttributes, 
Map.class).get(UgsyncCommonConstants.SYNC_SOURCE);
-                if (syncSource != null && xGroup.getGroupSource() == 0){
+                if (StringUtils.isNotEmpty(syncSource) && 
xGroup.getGroupSource() == 0){
                     xGroup.setGroupSource(1);
                     if (logger.isDebugEnabled()) {
                         logger.debug("GROUP: Name: " + xGroup.getName() + " 
groupSource changed to External");