This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 8f9bedfad6 RANGER-5017: updated sources to address 'may produce
NullPointerException' warning, and use <> operator while instantiating generic
types (#515)
8f9bedfad6 is described below
commit 8f9bedfad64222489aa142e2e10d17d5aedd9add
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Tue Jan 21 22:39:53 2025 -0800
RANGER-5017: updated sources to address 'may produce NullPointerException'
warning, and use <> operator while instantiating generic types (#515)
---
.../ranger/audit/queue/AuditFileQueueSpool.java | 4 ++
.../apache/ranger/audit/queue/AuditFileSpool.java | 4 ++
.../apache/ranger/plugin/geo/BinarySearchTree.java | 4 +-
.../plugin/geo/RangerGeolocationDatabase.java | 2 +-
.../ranger/plugin/model/RangerServiceDef.java | 10 ++--
.../policyengine/gds/GdsProjectEvaluator.java | 2 +-
.../ranger/services/hive/RangerServiceHive.java | 4 +-
.../main/java/org/apache/ranger/RangerClient.java | 4 +-
.../org/apache/hadoop/crypto/key/RangerKMSDB.java | 2 +-
.../apache/hadoop/crypto/key/RangerKeyStore.java | 2 +-
.../crypto/key/kms/server/KMSMetricUtil.java | 2 +-
.../ranger/metrics/RangerMetricsSystemWrapper.java | 6 +--
.../ranger/amazon/cloudwatch/CloudWatchUtil.java | 10 +++-
.../unix/jaas/RoleUserAuthorityGranter.java | 5 +-
.../java/org/apache/ranger/biz/ServiceMgr.java | 12 +++--
.../org/apache/ranger/common/RESTErrorUtil.java | 4 +-
.../org/apache/ranger/common/RangerProperties.java | 2 +-
.../org/apache/ranger/common/RangerSearchUtil.java | 12 +++--
.../ranger/common/RangerServicePoliciesCache.java | 2 +-
.../java/org/apache/ranger/common/SearchUtil.java | 13 +++--
.../java/org/apache/ranger/common/db/BaseDao.java | 2 +-
.../org/apache/ranger/db/XXAuthSessionDao.java | 3 +-
.../ElasticSearchAccessAuditsService.java | 6 ++-
.../java/org/apache/ranger/patch/BaseLoader.java | 15 ++++--
...orUpdatingAtlasSvcDefAndTagPolicies_J10063.java | 16 +++---
.../apache/ranger/patch/PatchMigration_J10002.java | 3 +-
.../org/apache/ranger/rest/SecurityZoneREST.java | 2 +-
.../java/org/apache/ranger/rest/XUserREST.java | 2 +-
.../security/listener/SpringEventListener.java | 2 +-
.../RangerServiceResourceWithTagsServiceBase.java | 4 +-
.../main/java/org/apache/ranger/util/CLIUtil.java | 2 +-
.../org/apache/ranger/util/RangerAdminCache.java | 2 +-
.../org/apache/ranger/util/RangerEnumUtil.java | 60 +++++++++++-----------
.../org/apache/ranger/util/RangerRestUtil.java | 4 +-
.../ranger/services/storm/client/StormClient.java | 6 +--
35 files changed, 136 insertions(+), 99 deletions(-)
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileQueueSpool.java
b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileQueueSpool.java
index abe1aec926..87c19b5f16 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileQueueSpool.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileQueueSpool.java
@@ -692,6 +692,10 @@ void appendToDoneFile(AuditIndexRecord indexRecord) throws
IOException {
try {
AuditIndexRecord record =
MiscUtil.fromJson(line, AuditIndexRecord.class);
+ if (record == null) {
+ continue;
+ }
+
logFile = new File(record.getFilePath());
archiveFile = new File(archiveFolder,
logFile.getName());
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
index 8a1924ba09..fba1d850af 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/queue/AuditFileSpool.java
@@ -678,6 +678,10 @@ void appendToDoneFile(AuditIndexRecord indexRecord) throws
IOException {
try {
AuditIndexRecord record =
MiscUtil.fromJson(line, AuditIndexRecord.class);
+ if (record == null) {
+ continue;
+ }
+
logFile = new File(record.getFilePath());
archiveFile = new File(archiveFolder,
logFile.getName());
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
b/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
index 532c5acc2d..cc2a78daa5 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
@@ -28,7 +28,7 @@ public BinarySearchTree() {
}
public void insert(final T value) {
- Node<T> node = new Node<T>(value);
+ Node<T> node = new Node<>(value);
if (root == null) {
root = node;
@@ -104,7 +104,7 @@ void setRoot(final Node<T> newRoot) {
}
void rebalance() {
- Node<T> dummy = new Node<T>(null);
+ Node<T> dummy = new Node<>(null);
dummy.setRight(root);
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java
b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java
index f174694899..a8196eb76e 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java
@@ -82,7 +82,7 @@ public BinarySearchTree<RangerGeolocationData, Long>
getData() {
}
public void setData(final BinarySearchTree<RangerGeolocationData, Long>
dataArg) {
- data = dataArg != null ? dataArg : new
BinarySearchTree<RangerGeolocationData, Long>();
+ data = dataArg != null ? dataArg : new BinarySearchTree<>();
}
public void dump(ValuePrinter<RangerGeolocationData> processor) {
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
index aca70f4e43..4768988af3 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
@@ -2543,22 +2543,20 @@ public int hashCode() {
public boolean equals(Object obj) {
if (this == obj) {
return true;
- }
- if (obj == null) {
+ } else if (obj == null) {
return false;
- }
- if (getClass() != obj.getClass()) {
+ } else if (getClass() != obj.getClass()) {
return false;
}
+
RangerPolicyConditionDef other = (RangerPolicyConditionDef) obj;
if (itemId == null) {
if (other.itemId != null) {
return false;
}
- } else if (other.itemId != null || !itemId.equals(other.itemId)) {
+ } else if (!itemId.equals(other.itemId)) {
return false;
}
-
if (description == null) {
if (other.description != null) {
return false;
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsProjectEvaluator.java
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsProjectEvaluator.java
index e386bb1766..f72258a140 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsProjectEvaluator.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/gds/GdsProjectEvaluator.java
@@ -44,7 +44,7 @@
import java.util.Set;
public class GdsProjectEvaluator {
- private static final Logger LOG =
LoggerFactory.getLogger(GdsDatasetEvaluator.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(GdsProjectEvaluator.class);
public static final GdsProjectEvalOrderComparator EVAL_ORDER_COMPARATOR =
new GdsProjectEvalOrderComparator();
diff --git
a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
index c63d2d1f85..606b660646 100644
---
a/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
+++
b/hive-agent/src/main/java/org/apache/ranger/services/hive/RangerServiceHive.java
@@ -210,7 +210,7 @@ private Map<String, RangerPolicyResource>
createDefaultDBPolicyResource() {
}
private List<RangerPolicyItem> createDefaultDBPolicyItem() {
- List<RangerPolicyItemAccess> accesses = new
ArrayList<RangerPolicyItemAccess>();
+ List<RangerPolicyItemAccess> accesses = new ArrayList<>();
accesses.add(new RangerPolicyItemAccess(ACCESS_TYPE_CREATE));
@@ -241,7 +241,7 @@ private Map<String, RangerPolicyResource>
createInformationSchemaPolicyResource(
}
private List<RangerPolicyItem> createInformationSchemaPolicyItem() {
- List<RangerPolicyItemAccess> accesses = new
ArrayList<RangerPolicyItemAccess>();
+ List<RangerPolicyItemAccess> accesses = new ArrayList<>();
accesses.add(new RangerPolicyItemAccess(ACCESS_TYPE_SELECT));
RangerPolicyItem item = new RangerPolicyItem(accesses, null,
Collections.singletonList(RangerPolicyEngine.GROUP_PUBLIC), null, null, false);
diff --git a/intg/src/main/java/org/apache/ranger/RangerClient.java
b/intg/src/main/java/org/apache/ranger/RangerClient.java
index 5b9849761f..f75a9143f5 100644
--- a/intg/src/main/java/org/apache/ranger/RangerClient.java
+++ b/intg/src/main/java/org/apache/ranger/RangerClient.java
@@ -483,7 +483,7 @@ private void authInit(String authType, String username,
String password) {
isSecureMode = true;
MiscUtil.loginWithKeyTab(password, username, null);
UserGroupInformation ugi = MiscUtil.getUGILoginUser();
- LOG.info("RangerClient.authInit() UGI user: " + ugi.getUserName()
+ " principal: " + username);
+ LOG.info("RangerClient.authInit() UGI user: {} principal: {}",
ugi.getUserName(), username);
} else {
restClient.setBasicAuthInfo(username, password);
}
@@ -510,7 +510,7 @@ private ClientResponse invokeREST(API api, Map<String,
String> params, Object re
break;
default:
- LOG.error(api.getMethod() + ": unsupported HTTP method");
+ LOG.error("{}: unsupported HTTP method", api.getMethod());
clientResponse = null;
}
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
index f7350e3cb4..54aa971078 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
@@ -205,7 +205,7 @@ private void updateDBSSLURL() {
jpaProperties.put(JPA_DB_URL, conf.get(PROPERTY_PREFIX +
DB_URL));
- logger.info(PROPERTY_PREFIX + DB_URL + "=" +
conf.get(PROPERTY_PREFIX + DB_URL));
+ logger.info("{}{}={}", PROPERTY_PREFIX, DB_URL,
conf.get(PROPERTY_PREFIX + DB_URL));
if ("true".equalsIgnoreCase(dbSslVerifyServerCertificate) ||
"true".equalsIgnoreCase(dbSslRequired)) {
if (!"1-way".equalsIgnoreCase((dbSslAuthType))) {
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
index 670584c42d..3b397fb4f8 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
@@ -346,7 +346,7 @@ public void engineLoad(InputStream stream, char[] password)
throws IOException,
int counter = 0;
for (int i = computed.length - 1; i >= 0; i--) {
- if (computed[i] != data[data.length - (1 + counter)]) {
+ if (data == null || computed[i] != data[data.length -
(1 + counter)]) {
Throwable t = new
UnrecoverableKeyException("Password verification failed");
logger.error("Keystore was tampered with, or
password was incorrect.", t);
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 f2861bd5f3..c23144eff5 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
@@ -142,7 +142,7 @@ private void getKMSMetricCalculation(String caseValue) {
String jsonEncKeyByAlgo
= null;
if (keyProvider != null && keyProvider.getKeys()
!= null && keyProvider.getKeys().size() > 0) {
- List<String> keyList = new ArrayList<String>();
+ List<String> keyList = new ArrayList<>();
keyList.addAll(keyProvider.getKeys());
diff --git
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/RangerMetricsSystemWrapper.java
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/RangerMetricsSystemWrapper.java
index 66244bf5c6..f6f821f2f0 100644
---
a/ranger-metrics/src/main/java/org/apache/ranger/metrics/RangerMetricsSystemWrapper.java
+++
b/ranger-metrics/src/main/java/org/apache/ranger/metrics/RangerMetricsSystemWrapper.java
@@ -55,12 +55,12 @@ public class RangerMetricsSystemWrapper {
public void init(String serviceName, List<RangerMetricsSourceWrapper>
sourceWrappers, List<RangerMetricsSinkWrapper> sinkWrappers) {
// Initialize metrics system
MetricsSystem metricsSystem =
DefaultMetricsSystem.initialize(serviceName);
- Set<String> sourceContexts = new HashSet<String>();
+ Set<String> sourceContexts = new HashSet<>();
sourceContexts.add(serviceName);
// Ranger Source
if (Objects.isNull(sourceWrappers) || sourceWrappers.isEmpty()) {
- sourceWrappers = new ArrayList<RangerMetricsSourceWrapper>();
+ sourceWrappers = new ArrayList<>();
}
sourceWrappers.add(new RangerMetricsSourceWrapper("RangerJVM", "Ranger
common metric source (RangerMetricsJvmSource)", serviceName, new
RangerMetricsJvmSource(serviceName)));
sourceWrappers.add(new RangerMetricsSourceWrapper("RangerContainer",
"Ranger web container metric source (RangerMetricsContainerSource)",
serviceName, new RangerMetricsContainerSource(serviceName)));
@@ -72,7 +72,7 @@ public void init(String serviceName,
List<RangerMetricsSourceWrapper> sourceWrap
// Ranger Sink
if (Objects.isNull(sinkWrappers) || sinkWrappers.isEmpty()) {
- sinkWrappers = new ArrayList<RangerMetricsSinkWrapper>();
+ sinkWrappers = new ArrayList<>();
}
// Prometheus
diff --git
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
index 473498dc1d..80dba47840 100644
---
a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java
@@ -218,10 +218,16 @@ public FilterLogEventsRequest
getFilterLogEventsRequest(AWSLogs client, SearchCr
// Add FilterPattern which will only fetch logs required
FilterLogEventsRequest filterLogEventsRequest = new
FilterLogEventsRequest()
.withLogGroupName(logGroupName)
- .withStartTime(fromDate.getTime())
- .withEndTime(toDate.getTime())
.withFilterPattern(filterPattern.toString());
+ if (fromDate != null) {
+ filterLogEventsRequest.withStartTime(fromDate.getTime());
+ }
+
+ if (toDate != null) {
+ filterLogEventsRequest.withEndTime(toDate.getTime());
+ }
+
if (StringUtils.isNotBlank(logStreamPrefix)) {
filterLogEventsRequest.setLogStreamNamePrefix(logStreamPrefix);
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
index 6f6404fecd..a86e494de4 100644
---
a/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
+++
b/security-admin/src/main/java/org/apache/ranger/authentication/unix/jaas/RoleUserAuthorityGranter.java
@@ -29,10 +29,9 @@ public class RoleUserAuthorityGranter implements
AuthorityGranter {
@Override
public Set<String> grant(Principal principal) {
if (principal instanceof UnixGroupPrincipal) {
- Collections.singleton(principal.getName());
+ return Collections.singleton(principal.getName());
} else {
- Collections.singleton("ROLE_USER");
+ return Collections.singleton("ROLE_USER");
}
- return null;
}
}
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
index cea1c5736e..01d0ee8e15 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
@@ -134,11 +134,15 @@ public List<String> lookupResource(String serviceName,
ResourceLookupContext con
}
}
- Map<String, String> newConfigs =
rangerSvcService.getConfigsWithDecryptedPassword(service);
+ RangerBaseService svc = null;
- service.setConfigs(newConfigs);
+ if (service != null) {
+ Map<String, String> newConfigs =
rangerSvcService.getConfigsWithDecryptedPassword(service);
- RangerBaseService svc = getRangerServiceByService(service, svcStore);
+ service.setConfigs(newConfigs);
+
+ svc = getRangerServiceByService(service, svcStore);
+ }
LOG.debug("==> ServiceMgr.lookupResource for Service: ({}Context:
{})", svc, context);
@@ -663,7 +667,7 @@ public T call() throws Exception {
} finally {
Thread.currentThread().setContextClassLoader(clsLoader);
- if (LOG.isDebugEnabled()) {
+ if (start != null) {
Date finish = new Date();
long waitTime = start.getTime() - creation.getTime();
long executionTime = finish.getTime() - start.getTime();
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 e323dc1fa0..611963376c 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
@@ -379,7 +379,7 @@ public Boolean parseBoolean(String value, String
errorMessage, MessageEnums mess
}
public WebApplicationException createRESTException(String errorMessage,
MessageEnums messageEnum, Long objectId, String fieldName, String logMessage,
int statusCode) {
- List<VXMessage> messageList = new ArrayList<VXMessage>();
+ List<VXMessage> messageList = new ArrayList<>();
messageList.add(messageEnum.getMessage(objectId, fieldName));
@@ -407,7 +407,7 @@ public WebApplicationException createRESTException(String
errorMessage, MessageE
}
public WebApplicationException create404RESTException(String errorMessage,
MessageEnums messageEnum, Long objectId, String fieldName, String logMessage) {
- List<VXMessage> messageList = new ArrayList<VXMessage>();
+ List<VXMessage> messageList = new ArrayList<>();
messageList.add(messageEnum.getMessage(objectId, fieldName));
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
index c1671a845d..783b8ff650 100644
---
a/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
+++
b/security-admin/src/main/java/org/apache/ranger/common/RangerProperties.java
@@ -28,7 +28,7 @@ public class RangerProperties extends HashMap<Object, Object>
{
private static final String XMLCONFIG_FILENAME_DELIMITOR = ",";
- private String xmlConfigFileNames;
+ private final String xmlConfigFileNames;
public RangerProperties(String xmlConfigFileNames) {
this.xmlConfigFileNames = xmlConfigFileNames;
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index 4da6a35368..6c93d71040 100755
---
a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++
b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -468,8 +468,10 @@ protected void resolveQueryParams(Query query,
SearchFilter searchCriteria, List
} else if (searchField.getDataType() ==
SearchField.DATA_TYPE.STR_LIST || (isMultiValue && searchField.getDataType() ==
SearchField.DATA_TYPE.STRING)) {
List<String> strValueList = new ArrayList<>();
- for (Object value : multiValue) {
- strValueList.add(String.valueOf(value));
+ if (multiValue != null) {
+ for (Object value : multiValue) {
+ strValueList.add(String.valueOf(value));
+ }
}
if (!strValueList.isEmpty()) {
@@ -593,8 +595,10 @@ private StringBuilder buildWhereClause(SearchFilter
searchCriteria, List<SearchF
} else if (searchField.getDataType() ==
SearchField.DATA_TYPE.STR_LIST || (isMultiValue && searchField.getDataType() ==
SearchField.DATA_TYPE.STRING)) {
List<String> strValueList = new ArrayList<>();
- for (Object value : multiValue) {
- strValueList.add(String.valueOf(value));
+ if (multiValue != null) {
+ for (Object value : multiValue) {
+ strValueList.add(String.valueOf(value));
+ }
}
if (!strValueList.isEmpty()) {
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
b/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
index a4be8f6191..daa2e6456c 100644
---
a/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
+++
b/security-admin/src/main/java/org/apache/ranger/common/RangerServicePoliciesCache.java
@@ -281,7 +281,7 @@ public void saveToCache(ServicePolicies policies) {
LOG.error("ServicePolicies is null object!!");
}
- LOG.debug("<==
RangerServicePoliciesCache(serviceName={}).saveToCache()",
policies.getServiceName());
+ LOG.debug("<==
RangerServicePoliciesCache(serviceName={}).saveToCache()", policies != null ?
policies.getServiceName() : "<null>");
}
private class ServicePoliciesWrapper {
diff --git
a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
index 75eac3cdb1..b9ef53aaad 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -464,9 +465,11 @@ protected StringBuilder buildWhereClause(SearchCriteria
searchCriteria, List<Sea
} else if
(searchCriteria.getNotNullParamList().contains(searchField.getClientFieldName()))
{
whereClause.append(" and
").append(searchField.getFieldName()).append(" is not null");
} else if (searchField.getDataType() ==
SearchField.DATA_TYPE.INT_LIST || isListValue && searchField.getDataType() ==
SearchField.DATA_TYPE.INTEGER) {
- Collection<Number> intValueList;
+ final Collection<Number> intValueList;
- if ((paramValue instanceof Integer || paramValue instanceof
Long)) {
+ if (paramValue == null) {
+ intValueList = Collections.emptyList();
+ } else if (paramValue instanceof Integer || paramValue
instanceof Long) {
intValueList = new ArrayList<>();
intValueList.add((Number) paramValue);
@@ -613,9 +616,11 @@ protected void resolveQueryParams(Query query,
SearchCriteria searchCriteria, Li
if
(searchCriteria.getNullParamList().contains(searchField.getClientFieldName())
||
searchCriteria.getNotNullParamList().contains(searchField.getClientFieldName()))
{ //NOPMD
// Already addressed while building where clause
} else if (searchField.getDataType() ==
SearchField.DATA_TYPE.INT_LIST || isListValue && searchField.getDataType() ==
SearchField.DATA_TYPE.INTEGER) {
- Collection<Number> intValueList;
+ final Collection<Number> intValueList;
- if ((paramValue instanceof Integer || paramValue instanceof
Long)) {
+ if (paramValue == null) {
+ intValueList = Collections.emptyList();
+ } else if (paramValue instanceof Integer || paramValue
instanceof Long) {
intValueList = new ArrayList<>();
intValueList.add((Number) paramValue);
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 2204fe455f..1eb5eaf129 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
@@ -388,6 +388,6 @@ private void init(EntityManager em) {
BATCH_DELETE_BATCH_SIZE = DEFAULT_BATCH_DELETE_BATCH_SIZE;
}
- logger.info(PROP_BATCH_DELETE_BATCH_SIZE + "=" +
BATCH_DELETE_BATCH_SIZE);
+ logger.info("{}={}", PROP_BATCH_DELETE_BATCH_SIZE,
BATCH_DELETE_BATCH_SIZE);
}
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
index 91d4a0d51d..658614e015 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
@@ -69,7 +69,8 @@ public List<XXAuthSession> getAuthSessionByUserId(Long
userId) {
}
public long getRecentAuthFailureCountByLoginId(String loginId, int
timeRangezSecond) {
- Date authWindowStartTime = new Date(DateUtil.getUTCDate().getTime() -
timeRangezSecond * 1000L);
+ Date utcDate = DateUtil.getUTCDate();
+ Date authWindowStartTime = new Date((utcDate != null ?
utcDate.getTime() : System.currentTimeMillis()) - timeRangezSecond * 1000L);
return getEntityManager()
.createNamedQuery("XXAuthSession.getRecentAuthFailureCountByLoginId",
Long.class)
diff --git
a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
index 5c24db1167..502e2388df 100644
---
a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
+++
b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java
@@ -125,7 +125,11 @@ public VXAccessAuditList
searchXAccessAudits(SearchCriteria searchCriteria) {
returnList.setPageSize(searchCriteria.getMaxRows());
returnList.setResultSize(response.getHits().getHits().length);
- returnList.setTotalCount(response.getHits().getTotalHits().value);
+
+ if (response.getHits().getTotalHits() != null) {
+ returnList.setTotalCount(response.getHits().getTotalHits().value);
+ }
+
returnList.setStartIndex(searchCriteria.getStartIndex());
returnList.setVXAccessAudits(xAccessAuditList);
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 456f2b8036..d2f2a7b276 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
@@ -31,6 +31,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
+import java.util.Date;
/**
*
@@ -40,7 +41,7 @@ public abstract class BaseLoader {
protected final RangerAdminConfig config;
- long startTime = DateUtil.getUTCDate().getTime();
+ long startTime = getCurrentTime();
long lastTime = startTime;
int countSoFar;
int countFromLastTime;
@@ -90,7 +91,7 @@ public void setMoreToProcess(boolean moreToProcess) {
@Transactional(readOnly = false, propagation = Propagation.REQUIRED)
public void load() {
if (firstCall) {
- startTime = DateUtil.getUTCDate().getTime();
+ startTime = getCurrentTime();
startProgressMonitor();
@@ -109,7 +110,7 @@ public void load() {
}
if (!moreToProcess) {
- long endTime = DateUtil.getUTCDate().getTime();
+ long endTime = getCurrentTime();
logger.info("###############################################");
@@ -157,7 +158,7 @@ public void run() {
public String timeTakenSoFar(int lineCount) {
countSoFar = lineCount;
- long currTime = DateUtil.getUTCDate().getTime();
+ long currTime = getCurrentTime();
String retStr = formatTimeTaken(currTime - startTime);
if (currTime - startTime > 0 && countSoFar > 0) {
@@ -216,4 +217,10 @@ String formatTimeTaken(long totalTime) {
return retValue;
}
+
+ private static long getCurrentTime() {
+ Date utcDate = DateUtil.getUTCDate();
+
+ return utcDate != null ? utcDate.getTime() :
System.currentTimeMillis();
+ }
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.java
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.java
index 89899fa59b..748ad6573b 100644
---
a/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.java
+++
b/security-admin/src/main/java/org/apache/ranger/patch/PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.java
@@ -165,17 +165,17 @@ private void disableAtlasAccessForTagPolicies() throws
Exception {
}
}
}
- } else {
- logger.error("The embedded Tag service-definition does not
exist.");
- }
- // delete XXAccessTypeDef records of tagDef where name startWith Atlas
- List<XXAccessTypeDef> xxAccessTypes =
daoMgr.getXXAccessTypeDef().findByServiceDefId(embeddedTagServiceDef.getId());
+ // delete XXAccessTypeDef records of tagDef where name startWith
Atlas
+ List<XXAccessTypeDef> xxAccessTypes =
daoMgr.getXXAccessTypeDef().findByServiceDefId(embeddedTagServiceDef.getId());
- for (XXAccessTypeDef xAccess : xxAccessTypes) {
- if (xAccess != null &&
xAccess.getName().startsWith(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_ATLAS_NAME))
{
- svcStore.deleteXXAccessTypeDef(xAccess);
+ for (XXAccessTypeDef xAccess : xxAccessTypes) {
+ if (xAccess != null &&
xAccess.getName().startsWith(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_ATLAS_NAME))
{
+ svcStore.deleteXXAccessTypeDef(xAccess);
+ }
}
+ } else {
+ logger.error("The embedded Tag service-definition does not
exist.");
}
logger.info("<==
PatchForUpdatingAtlasSvcDefAndTagPolicies_J10063.disableAtlasAccessForTagPolicies()");
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 92473eb9eb..156df4f4b3 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
@@ -250,7 +250,8 @@ private RangerService mapXAssetToService(RangerService
service, XXAsset xAsset)
String name = xAsset.getName();
String description = xAsset.getDescription();
int typeInt = xAsset.getAssetType();
- XXServiceDef serviceDef =
daoMgr.getXXServiceDef().findByName(AppConstants.getLabelFor_AssetType(typeInt).toLowerCase());
+ String label = AppConstants.getLabelFor_AssetType(typeInt);
+ XXServiceDef serviceDef = label != null ?
daoMgr.getXXServiceDef().findByName(label.toLowerCase()) : null;
if (serviceDef == null) {
throw new Exception("No ServiceDefinition found for repository: "
+ name);
diff --git
a/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
b/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
index adcbaa2189..0c04a7f902 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/SecurityZoneREST.java
@@ -180,7 +180,7 @@ public RangerSecurityZone
updateSecurityZone(@PathParam("id") Long zoneId, Range
ensureUserAllowOperationOnServiceForZone(securityZone);
removeEmptyEntries(securityZone);
- if (securityZone.getId() != null &&
!zoneId.equals(securityZone.getId())) {
+ if (securityZone.getId() != null &&
!securityZone.getId().equals(zoneId)) {
throw restErrorUtil.createRESTException("zoneId mismatch!!");
} else {
securityZone.setId(zoneId);
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 e8b51db0a8..03b762c69c 100755
--- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
@@ -1466,7 +1466,7 @@ public RangerUserStore
getSecureRangerUserStoreIfUpdated(@PathParam("serviceName
isValid = true;
}
- if (isValid) {
+ if (isValid && xService != null) {
XXServiceDef xServiceDef =
rangerDaoManager.getXXServiceDef().getById(xService.getType());
RangerService rangerService =
svcStore.getServiceByName(serviceName);
diff --git
a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
index 88d28987e4..ef72be0c0d 100644
---
a/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
+++
b/security-admin/src/main/java/org/apache/ranger/security/listener/SpringEventListener.java
@@ -113,6 +113,6 @@ protected void process(AuthenticationFailureDisabledEvent
authFailEvent) {
protected String getUserAgent() {
ServletRequestAttributes attributes = (ServletRequestAttributes)
RequestContextHolder.getRequestAttributes();
- return attributes.getRequest().getHeader("User-Agent");
+ return attributes != null ?
attributes.getRequest().getHeader("User-Agent") : "Unknown";
}
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceWithTagsServiceBase.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceWithTagsServiceBase.java
index 6c52e05fe8..f13cc14120 100755
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceWithTagsServiceBase.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceResourceWithTagsServiceBase.java
@@ -31,8 +31,8 @@
public abstract class RangerServiceResourceWithTagsServiceBase<T extends
XXServiceResource, V extends RangerServiceResourceWithTags> extends
RangerBaseModelService<T, V> {
public PList<V> searchServiceResources(SearchFilter searchFilter) {
- PList<V> retList = new PList<V>();
- List<V> resourceList = new ArrayList<V>();
+ PList<V> retList = new PList<>();
+ List<V> resourceList = new ArrayList<>();
List<T> xResourceList = searchRangerObjects(searchFilter,
searchFields, sortFields, retList);
for (T xResource : xResourceList) {
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 410079f611..41eaeca99b 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
@@ -68,7 +68,7 @@ public static String getMessage(String messagekey,
HttpServletRequest request) {
ServletContext servletContext =
request.getSession().getServletContext();
ApplicationContext ctx =
WebApplicationContextUtils.getWebApplicationContext(servletContext);
Object[] args = new Object[] {};
- String messageValue = ctx.getMessage(messagekey, args,
Locale.getDefault());
+ String messageValue = ctx != null ?
ctx.getMessage(messagekey, args, Locale.getDefault()) : "";
return messageValue;
}
diff --git
a/security-admin/src/main/java/org/apache/ranger/util/RangerAdminCache.java
b/security-admin/src/main/java/org/apache/ranger/util/RangerAdminCache.java
index 0f7c3d5fc1..9d50d32279 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RangerAdminCache.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerAdminCache.java
@@ -29,7 +29,7 @@
import org.springframework.transaction.support.TransactionTemplate;
public class RangerAdminCache<K, V> extends RangerCache<K, V> {
- private static final Logger LOG
= LoggerFactory.getLogger(RangerDBValueLoader.class);
+ private static final Logger LOG
= LoggerFactory.getLogger(RangerAdminCache.class);
public static final int DEFAULT_ADMIN_CACHE_LOADER_THREADS_COUNT
= 1;
public static final RefreshMode DEFAULT_ADMIN_CACHE_REFRESH_MODE
= RefreshMode.ON_ACCESS;
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 ee09e0bc70..6f00e7a835 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
@@ -65,8 +65,8 @@ public class RangerEnumUtil {
public static final String ENUM_XXAuthSession_AuthType
= "XXAuthSession.AuthType";
public static final String ENUM_XResponse_ResponseStatus
= "XResponse.ResponseStatus";
private static final Logger logger
= LoggerFactory.getLogger(RangerEnumUtil.class);
- protected Map<String, VEnum> enumMap
= new HashMap<String, VEnum>();
- protected List<VEnum> enumList
= new ArrayList<VEnum>();
+ protected Map<String, VEnum> enumMap
= new HashMap<>();
+ protected List<VEnum> enumList
= new ArrayList<>();
public List<VEnum> getEnums() {
if (enumList.isEmpty()) {
@@ -121,7 +121,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ActiveStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -157,7 +157,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ActivationStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -238,7 +238,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_BooleanValue);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -274,7 +274,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_DataType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -364,7 +364,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_DeviceType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -427,7 +427,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_DiffLevel);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -472,7 +472,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_FileType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -499,7 +499,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_FreqType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -571,7 +571,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_MimeType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -625,7 +625,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_NumberFormat);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -670,7 +670,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ObjectStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -706,7 +706,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_PasswordResetStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -751,7 +751,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_PriorityType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -796,7 +796,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ProgressStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -850,7 +850,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_RelationType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -877,7 +877,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_UserSource);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -913,7 +913,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_AssetType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -984,7 +984,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_AccessResult);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1011,7 +1011,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_PolicyType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1038,7 +1038,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_XAAuditType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1110,7 +1110,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ResourceType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1226,7 +1226,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_XAGroupType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1271,7 +1271,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_XAPermForType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1307,7 +1307,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_XAPermType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1604,7 +1604,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_CommonEnums_ClassTypes);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1838,7 +1838,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_XXAuthSession_AuthStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1910,7 +1910,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_XXAuthSession_AuthType);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
@@ -1964,7 +1964,7 @@ protected void init() {
///////////////////////////////////
vEnum = new VEnum();
vEnum.setEnumName(ENUM_XResponse_ResponseStatus);
- vEnum.setElementList(new ArrayList<VEnumElement>());
+ vEnum.setElementList(new ArrayList<>());
enumList.add(vEnum);
enumMap.put(vEnum.getEnumName(), vEnum);
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 6e4389a2e0..2d6a33b543 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
@@ -57,7 +57,7 @@ public class RangerRestUtil {
* @return
*/
public void validateVUserProfileForUpdate(XXPortalUser gjUser,
VXPortalUser userProfile) {
- List<VXMessage> messageList = new ArrayList<VXMessage>();
+ List<VXMessage> messageList = new ArrayList<>();
// Login Id can't be changed
if (userProfile.getLoginId() != null &&
!gjUser.getLoginId().equalsIgnoreCase(userProfile.getLoginId())) {
@@ -97,7 +97,7 @@ public void validateVUserProfileForUpdate(XXPortalUser
gjUser, VXPortalUser user
}
void splitUserRoleList(Collection<String> collection) {
- Collection<String> newCollection = new ArrayList<String>();
+ Collection<String> newCollection = new ArrayList<>();
for (String role : collection) {
String[] roles = role.split(",");
newCollection.addAll(Arrays.asList(roles));
diff --git
a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
index 811890cbf4..457c146917 100644
---
a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
+++
b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java
@@ -138,7 +138,7 @@ public static <T> T executeUnderKerberos(String userName,
String password, Strin
public static Map<String, Object> connectionTest(String serviceName,
Map<String, String> configs) {
boolean connectivityStatus = false;
- Map<String, Object> responseData = new HashMap<String, Object>();
+ Map<String, Object> responseData = new HashMap<>();
StormClient stormClient = getStormClient(serviceName,
configs);
List<String> strList =
getStormResources(stormClient, "", null);
@@ -255,7 +255,7 @@ public ArrayList<String> run() {
try {
if (response != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("getTopologyList():response.getStatus()=
" + response.getStatus());
+ LOG.debug("getTopologyList():response.getStatus()=
{}", response.getStatus());
}
if (response.getStatus() == 200) {
String jsonString =
response.getEntity(String.class);
@@ -274,7 +274,7 @@ public ArrayList<String> run() {
}
if (topologyName != null) {
if (topologyNameMatching == null
|| topologyNameMatching.isEmpty() ||
FilenameUtils.wildcardMatch(topology.getName(), topologyNameMatching + "*")) {
-
LOG.debug("getTopologyList():Adding topology " + topologyName);
+
LOG.debug("getTopologyList():Adding topology {}", topologyName);
lret.add(topologyName);
}
}
