Repository: ranger Updated Branches: refs/heads/master 6c9a84244 -> 65bc6a51b
Logger should be private static final Change-Id: Ic6ea35ff31fce69fe92a66291bb06febd1febb64 Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c4e078ec Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c4e078ec Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c4e078ec Branch: refs/heads/master Commit: c4e078ecb44583303cead25fe85df78ecda6b545 Parents: 6c9a842 Author: Zsombor Gegesy <gzsom...@gmail.com> Authored: Sat Feb 4 15:04:07 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Feb 6 09:57:11 2017 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/ranger/audit/dao/DaoManagerBase.java | 2 +- .../org/apache/ranger/admin/client/datatype/RESTResponse.java | 2 +- .../main/java/org/apache/ranger/plugin/util/TimedEventUtil.java | 4 ---- .../authorization/hadoop/utils/RangerCredentialProvider.java | 2 +- .../apache/ranger/services/hbase/client/HBaseConnectionMgr.java | 2 +- .../apache/ranger/services/hdfs/client/HdfsConnectionMgr.java | 2 +- .../apache/ranger/services/hive/client/HiveConnectionMgr.java | 2 +- .../main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java | 2 +- .../java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java | 2 +- .../hadoop/crypto/key/kms/server/KMSExceptionsProvider.java | 2 +- .../org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java | 4 ++-- .../main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java | 2 +- .../apache/ranger/services/knox/client/KnoxConnectionMgr.java | 2 +- .../apache/ranger/services/atlas/client/AtlasResourceMgr.java | 2 +- .../org/apache/ranger/services/kms/client/KMSResourceMgr.java | 2 +- .../org/apache/ranger/services/yarn/client/YarnResourceMgr.java | 2 +- .../ranger/plugin/classloader/RangerPluginClassLoader.java | 2 +- security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java | 2 +- .../src/main/java/org/apache/ranger/biz/KmsKeyMgr.java | 2 +- .../src/main/java/org/apache/ranger/biz/RangerBizUtil.java | 2 +- security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java | 2 +- .../src/main/java/org/apache/ranger/common/JSONUtil.java | 3 --- .../src/main/java/org/apache/ranger/common/PropertiesUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/RESTErrorUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/RangerConfigUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/StringUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/TimedEventUtil.java | 3 --- .../src/main/java/org/apache/ranger/common/TimedExecutor.java | 2 +- .../main/java/org/apache/ranger/common/XMLPropertiesUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/db/BaseDao.java | 2 +- .../main/java/org/apache/ranger/common/db/JPABeanCallbacks.java | 2 +- .../src/main/java/org/apache/ranger/db/RangerDaoManager.java | 2 +- .../src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java | 2 +- .../src/main/java/org/apache/ranger/db/XXAccessAuditDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXAssetDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXAuditMapDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXGroupUserDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXModuleDefDao.java | 3 --- .../src/main/java/org/apache/ranger/db/XXPermMapDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXResourceDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXTrxLogDao.java | 2 +- security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java | 2 +- .../src/main/java/org/apache/ranger/db/XXUserPermissionDao.java | 2 +- .../src/main/java/org/apache/ranger/patch/BaseLoader.java | 2 +- .../apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java | 2 +- .../apache/ranger/patch/PatchForServiceVersionInfo_J10004.java | 2 +- .../main/java/org/apache/ranger/patch/PatchMigration_J10002.java | 2 +- .../org/apache/ranger/patch/PatchPasswordEncryption_J10001.java | 2 +- .../org/apache/ranger/patch/PatchPersmissionModel_J10003.java | 2 +- .../org/apache/ranger/patch/PatchTagModulePermission_J10005.java | 2 +- .../java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java | 2 +- .../java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java | 2 +- .../org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java | 2 +- .../main/java/org/apache/ranger/patch/cliutil/MetricUtil.java | 2 +- .../java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java | 2 +- .../src/main/java/org/apache/ranger/rest/AssetREST.java | 2 +- .../src/main/java/org/apache/ranger/rest/PublicAPIs.java | 2 +- .../src/main/java/org/apache/ranger/rest/PublicAPIsv2.java | 2 +- .../src/main/java/org/apache/ranger/rest/UserREST.java | 2 +- .../src/main/java/org/apache/ranger/rest/XAuditREST.java | 2 -- .../src/main/java/org/apache/ranger/rest/XKeyREST.java | 4 ++-- .../src/main/java/org/apache/ranger/rest/XUserREST.java | 2 -- .../ranger/security/handler/RangerAuthenticationProvider.java | 2 +- .../security/handler/RangerDomainObjectSecurityHandler.java | 2 +- .../security/web/authentication/RangerAuthFailureHandler.java | 2 +- .../security/web/authentication/RangerAuthSuccessHandler.java | 2 +- .../web/authentication/RangerAuthenticationEntryPoint.java | 2 +- .../apache/ranger/security/web/filter/MyRememberMeFilter.java | 2 +- .../security/web/filter/RangerKRBAuthenticationFilter.java | 2 +- .../org/apache/ranger/security/web/filter/RangerKrbFilter.java | 2 +- .../security/web/filter/RangerSSOAuthenticationFilter.java | 2 +- .../web/filter/RangerSecurityContextFormationFilter.java | 4 ---- .../src/main/java/org/apache/ranger/service/UserService.java | 2 +- .../java/org/apache/ranger/solr/SolrAccessAuditsService.java | 2 +- security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java | 2 +- .../src/main/java/org/apache/ranger/solr/SolrUtil.java | 2 +- security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java | 2 +- .../src/main/java/org/apache/ranger/util/RangerEnumUtil.java | 2 +- .../src/main/java/org/apache/ranger/util/RangerRestUtil.java | 2 +- .../apache/ranger/services/storm/client/StormResourceMgr.java | 2 +- .../java/org/apache/ranger/usergroupsync/AbstractMapper.java | 2 +- 82 files changed, 77 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManagerBase.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManagerBase.java b/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManagerBase.java index 3531e05..33ba2f6 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManagerBase.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/dao/DaoManagerBase.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; public abstract class DaoManagerBase { - final static Logger logger = Logger.getLogger(DaoManagerBase.class); + protected final static Logger logger = Logger.getLogger(DaoManagerBase.class); abstract public EntityManager getEntityManager(); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java index d5b4524..333f565 100644 --- a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java +++ b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/RESTResponse.java @@ -35,7 +35,7 @@ import com.sun.jersey.api.client.ClientResponse; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class RESTResponse { - private static Logger LOG = Logger.getLogger(RESTResponse.class); + private static final Logger LOG = Logger.getLogger(RESTResponse.class); /** * values for statusCode http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java index b36d581..7d8a3a3 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/TimedEventUtil.java @@ -22,12 +22,8 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; - public class TimedEventUtil{ - static final Logger logger = Logger.getLogger(TimedEventUtil.class); - public static void runWithTimeout(final Runnable runnable, long timeout, TimeUnit timeUnit) throws Exception { timedTask(new Callable<Object>() { @Override http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java ---------------------------------------------------------------------- diff --git a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java index bf2abce..44cadfb 100644 --- a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java +++ b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java @@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory; public final class RangerCredentialProvider { - private static Log LOG = LogFactory.getLog(RangerCredentialProvider.class); + private static final Log LOG = LogFactory.getLog(RangerCredentialProvider.class); private static final RangerCredentialProvider CRED_PROVIDER = new RangerCredentialProvider(); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java index 3b9f986..560d754 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java +++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseConnectionMgr.java @@ -32,7 +32,7 @@ import org.apache.ranger.plugin.util.TimedEventUtil; public class HBaseConnectionMgr { - private static Logger LOG = Logger.getLogger(HBaseConnectionMgr.class); + private static final Logger LOG = Logger.getLogger(HBaseConnectionMgr.class); protected ConcurrentMap<String, HBaseClient> hbaseConnectionCache; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java index ede8077..e1985c0 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsConnectionMgr.java @@ -35,7 +35,7 @@ public class HdfsConnectionMgr { protected ConcurrentMap<String, HdfsClient> hdfsConnectionCache = null; protected ConcurrentMap<String, Boolean> repoConnectStatusMap = null; - private static Logger LOG = Logger.getLogger(HdfsConnectionMgr.class); + private static final Logger LOG = Logger.getLogger(HdfsConnectionMgr.class); public HdfsConnectionMgr(){ hdfsConnectionCache = new ConcurrentHashMap<String, HdfsClient>(); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java index 19badc8..b36d5da 100644 --- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java +++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveConnectionMgr.java @@ -31,7 +31,7 @@ import org.apache.ranger.plugin.util.TimedEventUtil; public class HiveConnectionMgr { - private static Logger LOG = Logger.getLogger(HiveConnectionMgr.class); + private static final Logger LOG = Logger.getLogger(HiveConnectionMgr.class); protected ConcurrentMap<String, HiveClient> hiveConnectionCache; protected ConcurrentMap<String, Boolean> repoConnectStatusMap; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java index 009bcf4..b0bc2b9 100755 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java @@ -42,7 +42,7 @@ import com.sun.org.apache.xml.internal.security.utils.Base64; public class RangerMasterKey implements RangerKMSMKI{ - static final Logger logger = Logger.getLogger(RangerMasterKey.class); + private static final Logger logger = Logger.getLogger(RangerMasterKey.class); private static final String MK_CIPHER = "AES"; private static final int MK_KeySize = 256; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java index 7ff76e5..56d25d2 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSAudit.java @@ -101,7 +101,7 @@ public class KMSAudit { public static final String KMS_LOGGER_NAME = "kms-audit"; - private static Logger AUDIT_LOG = LoggerFactory.getLogger(KMS_LOGGER_NAME); + private static final Logger AUDIT_LOG = LoggerFactory.getLogger(KMS_LOGGER_NAME); /** * Create a new KMSAudit. http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java index aa9d299..cdca8e1 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java @@ -41,7 +41,7 @@ import java.io.IOException; @Provider @InterfaceAudience.Private public class KMSExceptionsProvider implements ExceptionMapper<Exception> { - private static Logger LOG = + private static final Logger LOG = LoggerFactory.getLogger(KMSExceptionsProvider.class); private static final String ENTER = System.getProperty("line.separator"); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java index 4d20fe9..1527681 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMetricUtil.java @@ -28,8 +28,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; public class KMSMetricUtil { - private static Logger logger = Logger.getLogger(KMSMetricUtil.class); - + private static final Logger logger = Logger.getLogger(KMSMetricUtil.class); + private static final String HSM_ENABLED = "ranger.ks.hsm.enabled"; private static String metricType; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java b/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java index 7035d8b..aae722b 100644 --- a/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java +++ b/kms/src/main/java/org/apache/ranger/kms/biz/RangerKMSStartUp.java @@ -32,7 +32,7 @@ import org.springframework.stereotype.Component; public class RangerKMSStartUp extends HttpServlet { public static final String ENCRYPTION_KEY = "ranger.db.encrypt.key.password"; - private static Logger LOG = LoggerFactory.getLogger(RangerKMSStartUp.class); + private static final Logger LOG = LoggerFactory.getLogger(RangerKMSStartUp.class); @PostConstruct public void initRangerMasterKey() { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java index 3907b3a..55bc238 100644 --- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java +++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxConnectionMgr.java @@ -28,7 +28,7 @@ import org.apache.ranger.plugin.model.RangerService; public class KnoxConnectionMgr { - private static Logger LOG = Logger.getLogger(KnoxConnectionMgr.class); + private static final Logger LOG = Logger.getLogger(KnoxConnectionMgr.class); public KnoxClient getKnoxClientbyService(RangerService service) { KnoxClient knoxClient = null; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java ---------------------------------------------------------------------- diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java index f738601..93b2662 100644 --- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java +++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasResourceMgr.java @@ -28,7 +28,7 @@ import org.apache.ranger.plugin.service.ResourceLookupContext; public class AtlasResourceMgr { - public static final Logger LOG = Logger.getLogger(AtlasResourceMgr.class); + private static final Logger LOG = Logger.getLogger(AtlasResourceMgr.class); private static final String ATLASTERM = "terms"; public static HashMap<String, Object> validateConfig(String serviceName, Map<String, String> configs) throws Exception { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java ---------------------------------------------------------------------- diff --git a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java index bc1d829..09f2a6f 100755 --- a/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java +++ b/plugin-kms/src/main/java/org/apache/ranger/services/kms/client/KMSResourceMgr.java @@ -27,7 +27,7 @@ import org.apache.log4j.Logger; import org.apache.ranger.plugin.service.ResourceLookupContext; public class KMSResourceMgr { - public static final Logger LOG = Logger.getLogger(KMSResourceMgr.class); + private static final Logger LOG = Logger.getLogger(KMSResourceMgr.class); private static final String KMSKEY = "keyname"; public static HashMap<String, Object> validateConfig(String serviceName, Map<String, String> configs) throws Exception { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java ---------------------------------------------------------------------- diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java index 23bd9e9..35b138f 100644 --- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java +++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java @@ -27,7 +27,7 @@ import org.apache.log4j.Logger; import org.apache.ranger.plugin.service.ResourceLookupContext; public class YarnResourceMgr { - public static final Logger LOG = Logger.getLogger(YarnResourceMgr.class); + private static final Logger LOG = Logger.getLogger(YarnResourceMgr.class); private static final String YARNQUEUE = "queue"; public static HashMap<String, Object> validateConfig(String serviceName, Map<String, String> configs) throws Exception { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java ---------------------------------------------------------------------- diff --git a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java index bdff40d..2855560 100644 --- a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java +++ b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RangerPluginClassLoader extends URLClassLoader { - private static Logger LOG = LoggerFactory.getLogger(RangerPluginClassLoader.class); + private static final Logger LOG = LoggerFactory.getLogger(RangerPluginClassLoader.class); private static volatile RangerPluginClassLoader me = null; private static MyClassLoader componentClassLoader = null; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java index 8f4619e..d4ab8d7 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java @@ -131,7 +131,7 @@ public class AssetMgr extends AssetMgrBase { @Autowired RangerPluginInfoService pluginInfoService; - static Logger logger = Logger.getLogger(AssetMgr.class); + private static final Logger logger = Logger.getLogger(AssetMgr.class); public File getXResourceFile(Long id, String fileType) { VXResource xResource = xResourceService.readResource(id); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java index e026431..e90b106 100755 --- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java @@ -76,7 +76,7 @@ import com.sun.jersey.api.client.config.DefaultClientConfig; @Component public class KmsKeyMgr { - static final Logger logger = Logger.getLogger(KmsKeyMgr.class); + private static final Logger logger = Logger.getLogger(KmsKeyMgr.class); private static final String KMS_KEY_LIST_URI = "v1/keys/names"; //GET private static final String KMS_ADD_KEY_URI = "v1/keys"; //POST http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java index 979c6f3..5521ae8 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java @@ -71,7 +71,7 @@ import org.springframework.stereotype.Component; @Component public class RangerBizUtil { - static final Logger logger = Logger.getLogger(RangerBizUtil.class); + private static final Logger logger = Logger.getLogger(RangerBizUtil.class); @Autowired RESTErrorUtil restErrorUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java index 8f9db09..6eabc89 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java @@ -71,7 +71,7 @@ import org.springframework.security.authentication.encoding.ShaPasswordEncoder; @Component public class UserMgr { - static final Logger logger = Logger.getLogger(UserMgr.class); + private static final Logger logger = Logger.getLogger(UserMgr.class); private static final Md5PasswordEncoder md5Encoder = new Md5PasswordEncoder(); private static final ShaPasswordEncoder sha256Encoder = new ShaPasswordEncoder(256); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java index 0e8b964..5bc1baf 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java @@ -29,7 +29,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; import org.apache.ranger.common.view.ViewBaseBean; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.JsonParseException; @@ -45,8 +44,6 @@ public class JSONUtil { @Autowired RESTErrorUtil restErrorUtil; - static final Logger logger = Logger.getLogger(JSONUtil.class); - public File writeJsonToFile(ViewBaseBean viewBean, String fileName) throws JsonGenerationException, JsonMappingException, IOException { ObjectMapper objectMapper = new ObjectMapper(); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java index a485d38..a0f83c7 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java @@ -44,7 +44,7 @@ import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; public class PropertiesUtil extends PropertyPlaceholderConfigurer { private static Map<String, String> propertiesMap = new HashMap<String, String>(); - private static Logger logger = Logger.getLogger(PropertiesUtil.class); + private static final Logger logger = Logger.getLogger(PropertiesUtil.class); protected List<String> xmlPropertyConfigurer = new ArrayList<String>(); private PropertiesUtil() { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java index 2a8560d..967804a 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/RESTErrorUtil.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Component; @Component public class RESTErrorUtil { - static final Logger logger = Logger.getLogger(RESTErrorUtil.class); + private static final Logger logger = Logger.getLogger(RESTErrorUtil.class); @Autowired StringUtil stringUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java index dc1aa68..cd17cec 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/RangerConfigUtil.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Component; */ @Component public class RangerConfigUtil { - static Logger logger = Logger.getLogger(RangerConfigUtil.class); + private static final Logger logger = Logger.getLogger(RangerConfigUtil.class); String webappRootURL; int defaultMaxRows = 250; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java index a190e87..b6192ae 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; @Component public class StringUtil implements Serializable { - static final Logger logger = Logger.getLogger(StringUtil.class); + private static final Logger logger = Logger.getLogger(StringUtil.class); static final public int MIN_PASSWORD_LENGTH = 8; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java index d67c955..bc1aea3 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/TimedEventUtil.java @@ -22,14 +22,11 @@ import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @Component public class TimedEventUtil{ - static final Logger logger = Logger.getLogger(TimedEventUtil.class); - public static void runWithTimeout(final Runnable runnable, long timeout, TimeUnit timeUnit) throws Exception { timedTask(new Callable<Object>() { @Override http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java index c497393..6f97337 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java +++ b/security-admin/src/main/java/org/apache/ranger/common/TimedExecutor.java @@ -47,7 +47,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; @Scope("singleton") public class TimedExecutor { - static final private Logger LOG = Logger.getLogger(TimedExecutor.class); + private static final Logger LOG = Logger.getLogger(TimedExecutor.class); @Autowired TimedExecutorConfigurator _configurator; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java index 8fd6196..29fc78a 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/XMLPropertiesUtil.java @@ -34,7 +34,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; public class XMLPropertiesUtil extends DefaultPropertiesPersister { - private static Logger logger = Logger.getLogger(XMLPropertiesUtil.class); + private static final Logger logger = Logger.getLogger(XMLPropertiesUtil.class); public XMLPropertiesUtil() { } http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java index 6b423bb..c2832ea 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java +++ b/security-admin/src/main/java/org/apache/ranger/common/db/BaseDao.java @@ -41,7 +41,7 @@ import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.db.RangerDaoManagerBase; public abstract class BaseDao<T> { - static final Logger logger = Logger.getLogger(BaseDao.class); + private static final Logger logger = Logger.getLogger(BaseDao.class); protected RangerDaoManager daoManager; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java index 6151ec5..70ad44b 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java +++ b/security-admin/src/main/java/org/apache/ranger/common/db/JPABeanCallbacks.java @@ -30,7 +30,7 @@ import org.apache.ranger.security.context.RangerContextHolder; import org.apache.ranger.security.context.RangerSecurityContext; public class JPABeanCallbacks { - static final Logger logger = Logger.getLogger(JPABeanCallbacks.class); + private static final Logger logger = Logger.getLogger(JPABeanCallbacks.class); @PrePersist void onPrePersist(Object o) { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java index c21469d..e3b878b 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java +++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java @@ -33,7 +33,7 @@ import org.springframework.stereotype.Component; @Component public class RangerDaoManager extends RangerDaoManagerBase { - final static Logger logger = Logger.getLogger(RangerDaoManager.class); + private static final Logger logger = Logger.getLogger(RangerDaoManager.class); @PersistenceContext(unitName = "defaultPU") private EntityManager em; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java index 15331ae..d718441 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java +++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java @@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; public abstract class RangerDaoManagerBase { - final static Logger logger = Logger.getLogger(RangerDaoManagerBase.class); + private static final Logger logger = Logger.getLogger(RangerDaoManagerBase.class); @Autowired protected RESTErrorUtil restErrorUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java index cb22283..d77330d 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.entity.XXAccessAuditV4; import org.apache.ranger.entity.XXAccessAuditV5; public class XXAccessAuditDao extends BaseDao<XXAccessAudit> { - private static Logger logger = Logger.getLogger(XXAccessAuditDao.class); + private static final Logger logger = Logger.getLogger(XXAccessAuditDao.class); public XXAccessAuditDao( RangerDaoManagerBase daoManager ) { super(daoManager, "loggingPU"); } http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java index 686137e..cf25c8e 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java @@ -27,7 +27,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXAsset; public class XXAssetDao extends BaseDao<XXAsset> { - static final Logger logger = Logger.getLogger(XXAssetDao.class); + private static final Logger logger = Logger.getLogger(XXAssetDao.class); public XXAssetDao( RangerDaoManagerBase daoManager ) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java index 4290d9b..113dbca 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXAuditMap; public class XXAuditMapDao extends BaseDao<XXAuditMap> { - static final Logger logger = Logger.getLogger(XXAssetDao.class); + private static final Logger logger = Logger.getLogger(XXAssetDao.class); public XXAuditMapDao( RangerDaoManagerBase daoManager ) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java index fed83a1..9281cb5 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.entity.XXGroupPermission; public class XXGroupPermissionDao extends BaseDao<XXGroupPermission> { - static final Logger logger = Logger.getLogger(XXGroupPermissionDao.class); + private static final Logger logger = Logger.getLogger(XXGroupPermissionDao.class); public XXGroupPermissionDao(RangerDaoManagerBase daoManager) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java index c844084..1a76d27 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java @@ -32,7 +32,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXGroupUser; public class XXGroupUserDao extends BaseDao<XXGroupUser> { - static final Logger logger = Logger.getLogger(XXGroupUserDao.class); + private static final Logger logger = Logger.getLogger(XXGroupUserDao.class); public XXGroupUserDao(RangerDaoManagerBase daoManager) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java index dd9ae5f..85f2846 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java @@ -23,15 +23,12 @@ import java.util.List; import javax.persistence.NoResultException; import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; import org.apache.ranger.common.RangerCommonEnums; import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXModuleDef; public class XXModuleDefDao extends BaseDao<XXModuleDef>{ - static final Logger logger = Logger.getLogger(XXModuleDefDao.class); - public XXModuleDefDao(RangerDaoManagerBase daoManager) { super(daoManager); } http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java index 6c866c3..c455fdc 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXPermMap; public class XXPermMapDao extends BaseDao<XXPermMap> { - static final Logger logger = Logger.getLogger(XXResourceDao.class); + private static final Logger logger = Logger.getLogger(XXResourceDao.class); public XXPermMapDao( RangerDaoManagerBase daoManager ) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java index 8ebcb1b..9fa77f2 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java @@ -32,7 +32,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXResource; public class XXResourceDao extends BaseDao<XXResource> { - static final Logger logger = Logger.getLogger(XXResourceDao.class); + private static final Logger logger = Logger.getLogger(XXResourceDao.class); public XXResourceDao(RangerDaoManagerBase daoManager) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java index e2d67f2..b376abe 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXTrxLog; public class XXTrxLogDao extends BaseDao<XXTrxLog> { - private static Logger logger = Logger.getLogger(XXTrxLogDao.class); + private static final Logger logger = Logger.getLogger(XXTrxLogDao.class); public XXTrxLogDao( RangerDaoManagerBase daoManager ) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java index ede0deb..7af1bf9 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.common.db.BaseDao; import org.apache.ranger.entity.XXUser; public class XXUserDao extends BaseDao<XXUser> { - static final Logger logger = Logger.getLogger(XXResourceDao.class); + private static final Logger logger = Logger.getLogger(XXResourceDao.class); public XXUserDao(RangerDaoManagerBase daoManager) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java index 4e18e47..017c4fb 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java @@ -29,7 +29,7 @@ import org.apache.ranger.entity.XXUserPermission; public class XXUserPermissionDao extends BaseDao<XXUserPermission>{ - static final Logger logger = Logger.getLogger(XXUserPermissionDao.class); + private static final Logger logger = Logger.getLogger(XXUserPermissionDao.class); public XXUserPermissionDao(RangerDaoManagerBase daoManager) { super(daoManager); http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java index 9feed65..66f8e7c 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/BaseLoader.java @@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional; * */ public abstract class BaseLoader { - static Logger logger = Logger.getLogger(BaseLoader.class); + private static final Logger logger = Logger.getLogger(BaseLoader.class); long startTime = DateUtil.getUTCDate().getTime(); long lastTime = startTime; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java index f053212..7d6a23d 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForHiveServiceDefUpdate_J10006.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Component; @Component public class PatchForHiveServiceDefUpdate_J10006 extends BaseLoader { - private static Logger logger = Logger.getLogger(PatchForHiveServiceDefUpdate_J10006.class); + private static final Logger logger = Logger.getLogger(PatchForHiveServiceDefUpdate_J10006.class); public static final String SERVICEDBSTORE_SERVICEDEFBYNAME_HIVE_NAME = "hive"; @Autowired RangerDaoManager daoMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchForServiceVersionInfo_J10004.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchForServiceVersionInfo_J10004.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchForServiceVersionInfo_J10004.java index 380cca0..68c80c1 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchForServiceVersionInfo_J10004.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchForServiceVersionInfo_J10004.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; @Component public class PatchForServiceVersionInfo_J10004 extends BaseLoader { - private static Logger logger = Logger + private static final Logger logger = Logger .getLogger(PatchForServiceVersionInfo_J10004.class); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java index 54148f1..d77e4f9 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java @@ -64,7 +64,7 @@ import org.springframework.stereotype.Component; @Component public class PatchMigration_J10002 extends BaseLoader { - private static Logger logger = Logger.getLogger(PatchMigration_J10002.class); + private static final Logger logger = Logger.getLogger(PatchMigration_J10002.class); @Autowired RangerDaoManager daoMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java index 832e963..edf5ad4 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPasswordEncryption_J10001.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; @Component public class PatchPasswordEncryption_J10001 extends BaseLoader { - static Logger logger = Logger.getLogger(PatchPasswordEncryption_J10001.class); + private static final Logger logger = Logger.getLogger(PatchPasswordEncryption_J10001.class); int lineCount = 0; @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java index 5453949..a48f486 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java @@ -40,7 +40,7 @@ import org.springframework.util.CollectionUtils; @Component public class PatchPersmissionModel_J10003 extends BaseLoader { - private static Logger logger = Logger + private static final Logger logger = Logger .getLogger(PatchPersmissionModel_J10003.class); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/PatchTagModulePermission_J10005.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchTagModulePermission_J10005.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchTagModulePermission_J10005.java index a274f97..6f9350d 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchTagModulePermission_J10005.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchTagModulePermission_J10005.java @@ -35,7 +35,7 @@ import org.springframework.stereotype.Component; @Component public class PatchTagModulePermission_J10005 extends BaseLoader { - private static Logger logger = Logger + private static final Logger logger = Logger .getLogger(PatchTagModulePermission_J10005.class); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java index b0ec57b..ccdc279 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangePasswordUtil.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; @Component public class ChangePasswordUtil extends BaseLoader { - private static Logger logger = Logger.getLogger(ChangePasswordUtil.class); + private static final Logger logger = Logger.getLogger(ChangePasswordUtil.class); @Autowired RangerDaoManager daoMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java index 531ee34..ee8011d 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/ChangeUserNameUtil.java @@ -30,7 +30,7 @@ import org.springframework.stereotype.Component; @Component public class ChangeUserNameUtil extends BaseLoader { - private static Logger logger = Logger.getLogger(ChangeUserNameUtil.class); + private static final Logger logger = Logger.getLogger(ChangeUserNameUtil.class); @Autowired RangerDaoManager daoMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java index be40bca..1ddd367 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java @@ -58,7 +58,7 @@ import org.springframework.util.CollectionUtils; @Component public class DbToSolrMigrationUtil extends BaseLoader { - private static Logger logger = Logger.getLogger(DbToSolrMigrationUtil.class); + private static final Logger logger = Logger.getLogger(DbToSolrMigrationUtil.class); private final static String CHECK_FILE_NAME = "migration_check_file.txt"; private final static Charset ENCODING = StandardCharsets.UTF_8; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java index 7a15fc3..fb438a7 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java @@ -65,7 +65,7 @@ import com.google.gson.GsonBuilder; @Component public class MetricUtil extends BaseLoader { - private static Logger logger = Logger.getLogger(MetricUtil.class); + private static final Logger logger = Logger.getLogger(MetricUtil.class); public static String metricType; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java index beafd1c..976b608 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/XXTrxLogUpdateUtil.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; @Component public class XXTrxLogUpdateUtil extends BaseLoader { - private static Logger logger = Logger + private static final Logger logger = Logger .getLogger(XXTrxLogUpdateUtil.class); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java index 52c141b..f0d2401 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java @@ -93,7 +93,7 @@ import org.springframework.transaction.annotation.Transactional; @RangerAnnotationJSMgrName("AssetMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class AssetREST { - static Logger logger = Logger.getLogger(AssetREST.class); + private static final Logger logger = Logger.getLogger(AssetREST.class); @Autowired RangerSearchUtil searchUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java index c515085..d3c22d7 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIs.java @@ -51,7 +51,7 @@ import java.util.List; @RangerAnnotationJSMgrName("PublicMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class PublicAPIs { - static Logger logger = Logger.getLogger(PublicAPIs.class); + private static final Logger logger = Logger.getLogger(PublicAPIs.class); @Autowired RangerSearchUtil searchUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java index 81d6001..dbb34bd 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/PublicAPIsv2.java @@ -50,7 +50,7 @@ import java.util.List; @RangerAnnotationJSMgrName("PublicMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class PublicAPIsv2 { - static Logger logger = Logger.getLogger(PublicAPIsv2.class); + private static final Logger logger = Logger.getLogger(PublicAPIsv2.class); @Autowired ServiceREST serviceREST; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java index ae917ef..4bf1899 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/UserREST.java @@ -66,7 +66,7 @@ import org.springframework.transaction.annotation.Transactional; @RangerAnnotationJSMgrName("UserMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class UserREST { - static Logger logger = Logger.getLogger(UserREST.class); + private static final Logger logger = Logger.getLogger(UserREST.class); @Autowired StringUtil stringUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java index 5b0991a..fdf5ad8 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XAuditREST.java @@ -29,7 +29,6 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.Context; -import org.apache.log4j.Logger; import org.apache.ranger.biz.XAuditMgr; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchUtil; @@ -55,7 +54,6 @@ import org.springframework.transaction.annotation.Transactional; @RangerAnnotationJSMgrName("XAuditMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class XAuditREST { - static Logger logger = Logger.getLogger(XAuditREST.class); @Autowired SearchUtil searchUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java index c7a81f9..5c5623e 100755 --- a/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XKeyREST.java @@ -56,8 +56,8 @@ import com.sun.jersey.api.client.UniformInterfaceException; @RangerAnnotationJSMgrName("KeyMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class XKeyREST { - static Logger logger = Logger.getLogger(XKeyREST.class); - + private static final Logger logger = Logger.getLogger(XKeyREST.class); + private static String UNAUTHENTICATED_MSG = "Unauthenticated : Please check the premission in the policy for the user"; @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java index 75ecec9..0776021 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java @@ -32,7 +32,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.ranger.biz.RangerBizUtil; import org.apache.ranger.biz.SessionMgr; import org.apache.ranger.biz.XUserMgr; @@ -95,7 +94,6 @@ import org.springframework.transaction.annotation.Transactional; @RangerAnnotationJSMgrName("XUserMgr") @Transactional(propagation = Propagation.REQUIRES_NEW) public class XUserREST { - static Logger logger = Logger.getLogger(XUserREST.class); @Autowired SearchUtil searchUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java index 8a08712..843af2d 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java +++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerAuthenticationProvider.java @@ -72,7 +72,7 @@ public class RangerAuthenticationProvider implements AuthenticationProvider { @Autowired UserMgr userMgr; - private static Logger logger = Logger.getLogger(RangerAuthenticationProvider.class); + private static final Logger logger = Logger.getLogger(RangerAuthenticationProvider.class); private String rangerAuthenticationMethod; private LdapAuthenticator authenticator; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java index 62bf951..d166870 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java +++ b/security-admin/src/main/java/org/apache/ranger/security/handler/RangerDomainObjectSecurityHandler.java @@ -38,7 +38,7 @@ import org.springframework.stereotype.Component; @Component public class RangerDomainObjectSecurityHandler { - public static Logger logger = Logger + private static final Logger logger = Logger .getLogger(RangerDomainObjectSecurityHandler.class); @Autowired http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java index f2f5a62..8d9363a 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java @@ -42,7 +42,7 @@ import org.springframework.security.web.authentication.ExceptionMappingAuthentic */ public class RangerAuthFailureHandler extends ExceptionMappingAuthenticationFailureHandler { - static Logger logger = Logger.getLogger(RangerAuthFailureHandler.class); + private static final Logger logger = Logger.getLogger(RangerAuthFailureHandler.class); String ajaxLoginfailurePage = null; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java index 0364b4c..948d328 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthSuccessHandler.java @@ -46,7 +46,7 @@ import org.springframework.security.web.authentication.WebAuthenticationDetails; */ public class RangerAuthSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { - static Logger logger = Logger.getLogger(RangerAuthSuccessHandler.class); + private static final Logger logger = Logger.getLogger(RangerAuthSuccessHandler.class); String ajaxLoginSuccessPage = null; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java index a646d32..e7e5f5d 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthenticationEntryPoint.java @@ -47,7 +47,7 @@ public class RangerAuthenticationEntryPoint extends LoginUrlAuthenticationEntryPoint { public static final int SC_AUTHENTICATION_TIMEOUT = 419; - static Logger logger = Logger + private static final Logger logger = Logger .getLogger(RangerAuthenticationEntryPoint.class); static int ajaxReturnCode = -1; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java index 90b34d0..370df70 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java @@ -43,7 +43,7 @@ import org.springframework.security.web.authentication.rememberme.RememberMeAuth @SuppressWarnings("deprecation") public class MyRememberMeFilter extends RememberMeAuthenticationFilter { - static Logger logger = Logger.getLogger(MyRememberMeFilter.class); + private static final Logger logger = Logger.getLogger(MyRememberMeFilter.class); /* * (non-Javadoc) http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java index f0b5890..c8d22aa 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKRBAuthenticationFilter.java @@ -74,7 +74,7 @@ import org.apache.hadoop.security.authentication.util.KerberosName; import org.springframework.security.web.authentication.WebAuthenticationDetails; public class RangerKRBAuthenticationFilter extends RangerKrbFilter { - Logger LOG = LoggerFactory.getLogger(RangerKRBAuthenticationFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(RangerKRBAuthenticationFilter.class); @Autowired UserMgr userMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java index e9401f1..d10fc46 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerKrbFilter.java @@ -51,7 +51,7 @@ import java.util.regex.Pattern; @InterfaceStability.Unstable public class RangerKrbFilter implements Filter { - private static Logger LOG = LoggerFactory.getLogger(RangerKrbFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(RangerKrbFilter.class); /** * Constant for the property that specifies the configuration prefix. http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java index 2095567..7d8fdb2 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java @@ -67,7 +67,7 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; public class RangerSSOAuthenticationFilter implements Filter { - Logger LOG = LoggerFactory.getLogger(RangerSSOAuthenticationFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(RangerSSOAuthenticationFilter.class); public static final String BROWSER_USERAGENT = "ranger.sso.browser.useragent"; public static final String JWT_AUTH_PROVIDER_URL = "ranger.sso.providerurl"; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java index 3763687..721dd44 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.log4j.Logger; import org.apache.ranger.biz.SessionMgr; import org.apache.ranger.biz.XUserMgr; import org.apache.ranger.common.GUIDUtil; @@ -52,9 +51,6 @@ import org.springframework.web.filter.GenericFilterBean; public class RangerSecurityContextFormationFilter extends GenericFilterBean { - static Logger logger = Logger - .getLogger(RangerSecurityContextFormationFilter.class); - public static final String AKA_SC_SESSION_KEY = "AKA_SECURITY_CONTEXT"; public static final String USER_AGENT = "User-Agent"; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/service/UserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserService.java b/security-admin/src/main/java/org/apache/ranger/service/UserService.java index 826b9e8..164e241 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/UserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/UserService.java @@ -42,7 +42,7 @@ import org.springframework.stereotype.Service; @Service @Scope("singleton") public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> { - static Logger logger = Logger.getLogger(UserService.class); + private static final Logger logger = Logger.getLogger(UserService.class); public static final String NAME = "User"; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java index af7f30c..917c760 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java @@ -48,7 +48,7 @@ import org.springframework.stereotype.Service; @Service @Scope("singleton") public class SolrAccessAuditsService { - static Logger logger = Logger.getLogger(SolrAccessAuditsService.class); + private static final Logger logger = Logger.getLogger(SolrAccessAuditsService.class); @Autowired SolrMgr solrMgr; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java index 8042a37..3f7935e 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java @@ -42,7 +42,7 @@ import org.springframework.stereotype.Component; @Component public class SolrMgr { - static final Logger logger = Logger.getLogger(SolrMgr.class); + private static final Logger logger = Logger.getLogger(SolrMgr.class); @Autowired RangerBizUtil rangerBizUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java index 632ef60..e0ab372 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java @@ -45,7 +45,7 @@ import org.springframework.stereotype.Component; @Component public class SolrUtil { - static final Logger logger = Logger.getLogger(SolrUtil.class); + private static final Logger logger = Logger.getLogger(SolrUtil.class); @Autowired RESTErrorUtil restErrorUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java index 2c6c8a7..0fd0e70 100644 --- a/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/util/CLIUtil.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Component; */ @Component public class CLIUtil { - static Logger logger = Logger.getLogger(CLIUtil.class); + private static final Logger logger = Logger.getLogger(CLIUtil.class); @Autowired StandaloneSecurityHandler securityHandler; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java index 9667256..6084972 100644 --- a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java @@ -36,7 +36,7 @@ import org.springframework.stereotype.Component; @Component public class RangerEnumUtil { - static final Logger logger = Logger.getLogger(RangerEnumUtil.class); + private static final Logger logger = Logger.getLogger(RangerEnumUtil.class); public final static String ENUM_CommonEnums_ActiveStatus = "CommonEnums.ActiveStatus"; public final static String ENUM_CommonEnums_ActivationStatus = "CommonEnums.ActivationStatus"; public final static String ENUM_CommonEnums_BooleanValue = "CommonEnums.BooleanValue"; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java index 2603b51..9a2a505 100644 --- a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java @@ -37,7 +37,7 @@ import org.springframework.stereotype.Component; @Component public class RangerRestUtil { - static final Logger logger = Logger.getLogger(RangerRestUtil.class); + private static final Logger logger = Logger.getLogger(RangerRestUtil.class); @Autowired StringUtil stringUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java index 02f94f9..43960b3 100644 --- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java +++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java @@ -28,7 +28,7 @@ import org.apache.log4j.Logger; import org.apache.ranger.plugin.service.ResourceLookupContext; public class StormResourceMgr { - public static final Logger LOG = Logger.getLogger(StormResourceMgr.class); + private static final Logger LOG = Logger.getLogger(StormResourceMgr.class); private static final String TOPOLOGY = "topology"; public static HashMap<String, Object> validateConfig(String serviceName, Map<String, String> configs) throws Exception { http://git-wip-us.apache.org/repos/asf/ranger/blob/c4e078ec/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java b/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java index 86b621b..2be407e 100644 --- a/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java +++ b/ugsync/src/main/java/org/apache/ranger/usergroupsync/AbstractMapper.java @@ -23,7 +23,7 @@ import org.apache.log4j.Logger; public abstract class AbstractMapper implements Mapper { - static Logger logger = Logger.getLogger(AbstractMapper.class); + protected static final Logger logger = Logger.getLogger(AbstractMapper.class); @Override public void init(String baseProperty) {
