You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2016/03/04 19:48:27 UTC
incubator-ranger git commit: RANGER-871 - Fix Migrating issues
Repository: incubator-ranger
Updated Branches:
refs/heads/master 4577aff90 -> 0fe605a97
RANGER-871 - Fix Migrating issues
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0fe605a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0fe605a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0fe605a9
Branch: refs/heads/master
Commit: 0fe605a97945ac927ee4f9097e23163acce9409d
Parents: 4577aff
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 4 10:38:42 2016 +0000
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Fri Mar 4 10:19:10 2016 -0800
----------------------------------------------------------------------
.../validation/TestRangerServiceValidator.java | 2 +-
dev-support/ranger-pmd-ruleset.xml | 6 +-----
.../classloader/RangerPluginClassLoader.java | 4 ++--
.../client/solrj/impl/BinaryRequestWriter.java | 2 +-
.../solr/common/util/ContentStreamBase.java | 6 +++---
.../org/apache/ranger/biz/ServiceDBStore.java | 20 ++++++++++----------
.../java/org/apache/ranger/common/MapUtil.java | 14 +++++++-------
.../org/apache/ranger/common/RESTErrorUtil.java | 10 +++++-----
.../org/apache/ranger/common/SearchUtil.java | 2 +-
.../org/apache/ranger/common/ServiceUtil.java | 18 +++++++++---------
.../java/org/apache/ranger/db/XXServiceDao.java | 2 +-
.../java/org/apache/ranger/db/XXTrxLogDao.java | 4 ++--
.../java/org/apache/ranger/rest/AssetREST.java | 2 +-
.../org/apache/ranger/rest/ServiceREST.java | 6 +++---
.../apache/ranger/service/XGroupService.java | 2 +-
.../ranger/service/XGroupUserService.java | 2 +-
.../org/apache/ranger/service/XUserService.java | 2 +-
.../java/org/apache/ranger/solr/SolrUtil.java | 4 ++--
.../org/apache/ranger/util/RangerEnumUtil.java | 5 +++--
.../apache/ranger/ldapconfigcheck/UserSync.java | 8 ++++----
20 files changed, 59 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
index 4b0fdbf..b83a932 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
@@ -196,7 +196,7 @@ public class TestRangerServiceValidator {
// if name is not null and it points to a service then it should match the id
when(service.getId()).thenReturn(7L);
RangerService existingService = mock(RangerService.class);
- when(existingService.getId()).thenReturn(new Long(7L));
+ when(existingService.getId()).thenReturn(Long.valueOf(7L));
when(_store.getService(7L)).thenReturn(existingService);
when(_store.getServiceByName("aName")).thenReturn(existingService);
assertTrue(_validator.isValid(service, Action.UPDATE, _failures));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/dev-support/ranger-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml
index 00d55a6..daf2162 100644
--- a/dev-support/ranger-pmd-ruleset.xml
+++ b/dev-support/ranger-pmd-ruleset.xml
@@ -58,11 +58,7 @@
<exclude name="EmptyWhileStmt" />
</rule>
<rule ref="rulesets/java/migrating.xml">
- <exclude name="IntegerInstantiation" />
- <exclude name="JUnit4TestShouldUseTestAnnotation" />
- <exclude name="LongInstantiation" />
- <exclude name="ReplaceEnumerationWithIterator" />
- <exclude name="ReplaceHashtableWithMap" />
+ <exclude name="JUnit4TestShouldUseTestAnnotation" />
</rule>
<rule ref="rulesets/java/unnecessary.xml">
<exclude name="UnnecessaryConversionTemporary" />
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 23e16bf..e0c9f61 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
@@ -273,7 +273,7 @@ public class RangerPluginClassLoader extends URLClassLoader {
}
}
- static class MergeEnumeration implements Enumeration<URL> {
+ static class MergeEnumeration implements Enumeration<URL> { //NOPMD
Enumeration<URL> e1 = null;
Enumeration<URL> e2 = null;
@@ -299,4 +299,4 @@ public class RangerPluginClassLoader extends URLClassLoader {
return ret;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
----------------------------------------------------------------------
diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
index 67274c2..629c537 100644
--- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
+++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
@@ -85,7 +85,7 @@ public class BinaryRequestWriter extends RequestWriter {
@Override
public Long getSize() // size if we know it, otherwise null
{
- return new Long(baos.size());
+ return Long.valueOf(baos.size());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/ranger_solrj/src/main/java/org/apache/solr/common/util/ContentStreamBase.java
----------------------------------------------------------------------
diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/util/ContentStreamBase.java b/ranger_solrj/src/main/java/org/apache/solr/common/util/ContentStreamBase.java
index 34238b5..24549b6 100644
--- a/ranger_solrj/src/main/java/org/apache/solr/common/util/ContentStreamBase.java
+++ b/ranger_solrj/src/main/java/org/apache/solr/common/util/ContentStreamBase.java
@@ -83,7 +83,7 @@ public abstract class ContentStreamBase implements ContentStream
contentType = conn.getContentType();
name = url.toExternalForm();
- size = new Long( conn.getContentLength() );
+ size = Long.valueOf( conn.getContentLength() );
return conn.getInputStream();
}
}
@@ -146,7 +146,7 @@ public abstract class ContentStreamBase implements ContentStream
contentType = null;
name = null;
- size = new Long( str.length() );
+ size = Long.valueOf( str.length() );
sourceInfo = "string";
}
@@ -247,7 +247,7 @@ public abstract class ContentStreamBase implements ContentStream
this.contentType = null;
name = source;
- size = new Long(bytes.length);
+ size = Long.valueOf(bytes.length);
sourceInfo = source;
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index 8fefc9e..432c443 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -252,7 +252,7 @@ public class ServiceDBStore extends AbstractServiceStore {
// While creating, value of version should be 1.
- serviceDef.setVersion(new Long(1));
+ serviceDef.setVersion(Long.valueOf(1));
if (populateExistingBaseFields) {
svcDefServiceWithAssignedId.setPopulateExistingBaseFields(true);
@@ -857,10 +857,10 @@ public class ServiceDBStore extends AbstractServiceStore {
Long version = serviceDef.getVersion();
if(version == null) {
- version = new Long(1);
+ version = Long.valueOf(1);
LOG.info("Found Version Value: `null`, so setting value of version to 1, While updating object, version should not be null.");
} else {
- version = new Long(version.longValue() + 1);
+ version = Long.valueOf(version.longValue() + 1);
}
serviceDef.setVersion(version);
@@ -1010,8 +1010,8 @@ public class ServiceDBStore extends AbstractServiceStore {
}
// While creating, value of version should be 1.
- service.setVersion(new Long(1));
- service.setTagVersion(new Long(1));
+ service.setVersion(Long.valueOf(1));
+ service.setTagVersion(Long.valueOf(1));
if (populateExistingBaseFields) {
svcServiceWithAssignedId.setPopulateExistingBaseFields(true);
@@ -1276,10 +1276,10 @@ public class ServiceDBStore extends AbstractServiceStore {
Long version = service.getVersion();
if(version == null) {
- version = new Long(1);
+ version = Long.valueOf(1);
LOG.info("Found Version Value: `null`, so setting value of version to 1, While updating object, version should not be null.");
} else {
- version = new Long(version.longValue() + 1);
+ version = Long.valueOf(version.longValue() + 1);
}
service.setVersion(version);
@@ -1416,7 +1416,7 @@ public class ServiceDBStore extends AbstractServiceStore {
List<RangerPolicyItem> allowExceptions = policy.getAllowExceptions();
List<RangerPolicyItem> denyExceptions = policy.getDenyExceptions();
- policy.setVersion(new Long(1));
+ policy.setVersion(Long.valueOf(1));
updatePolicySignature(policy);
if(populateExistingBaseFields) {
@@ -1542,10 +1542,10 @@ public class ServiceDBStore extends AbstractServiceStore {
Long version = policy.getVersion();
if(version == null) {
- version = new Long(1);
+ version = Long.valueOf(1);
LOG.info("Found Version Value: `null`, so setting value of version to 1, While updating object, version should not be null.");
} else {
- version = new Long(version.longValue() + 1);
+ version = Long.valueOf(version.longValue() + 1);
}
policy.setVersion(version);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
index 3520450..4dd6020 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
@@ -36,13 +36,13 @@ public class MapUtil implements Serializable{
public static void init() {
policyExportAuditSyncStatusMessageMap=new HashMap<Integer, String>();
- policyExportAuditSyncStatusMessageMap.put(new Integer(200), "Policies synced to plugin");
- policyExportAuditSyncStatusMessageMap.put(new Integer(202), "Error syncing policies");
- policyExportAuditSyncStatusMessageMap.put(new Integer(400), "Error syncing policies");
- policyExportAuditSyncStatusMessageMap.put(new Integer(401), "Bad Credentials");
- policyExportAuditSyncStatusMessageMap.put(new Integer(403), "Error syncing policies");
- policyExportAuditSyncStatusMessageMap.put(new Integer(404), "Error syncing policies");
- policyExportAuditSyncStatusMessageMap.put(new Integer(500), "Error syncing policies");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(200), "Policies synced to plugin");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(202), "Error syncing policies");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(400), "Error syncing policies");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(401), "Bad Credentials");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(403), "Error syncing policies");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(404), "Error syncing policies");
+ policyExportAuditSyncStatusMessageMap.put(Integer.valueOf(500), "Error syncing policies");
}
public static String getPolicyExportAuditSyncStatus(int key) {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 3f92d8d..c911c1f 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
@@ -145,7 +145,7 @@ public class RESTErrorUtil {
if (stringUtil.isEmpty(value)) {
return null;
} else {
- return new Integer(value.trim());
+ return Integer.valueOf(value.trim());
}
} catch (Throwable t) {
throw createRESTException(errorMessage, messageEnum, objectId,
@@ -158,9 +158,9 @@ public class RESTErrorUtil {
String fieldName) {
try {
if (stringUtil.isEmpty(value)) {
- return new Integer(defaultValue);
+ return Integer.valueOf(defaultValue);
} else {
- return new Integer(value.trim());
+ return Integer.valueOf(value.trim());
}
} catch (Throwable t) {
throw createRESTException(errorMessage, messageEnum, objectId,
@@ -172,7 +172,7 @@ public class RESTErrorUtil {
if (stringUtil.isEmpty(value)) {
return defaultValue;
}
- return new Long(value.trim());
+ return Long.valueOf(value.trim());
}
public Long parseLong(String value, String errorMessage,
@@ -181,7 +181,7 @@ public class RESTErrorUtil {
if (stringUtil.isEmpty(value)) {
return null;
} else {
- return new Long(value.trim());
+ return Long.valueOf(value.trim());
}
} catch (Throwable t) {
throw createRESTException(errorMessage, messageEnum, objectId,
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
----------------------------------------------------------------------
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 d5c54fd..a91eb72 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
@@ -266,7 +266,7 @@ public class SearchUtil {
"Invalid value for " + userFriendlyParamName,
MessageEnums.INVALID_INPUT_DATA, null, paramName);
- restErrorUtil.validateMinMax(value == null ? new Integer(-1) : value, 0, maxValue,
+ restErrorUtil.validateMinMax(value == null ? Integer.valueOf(-1) : value, 0, maxValue,
"Invalid value for " + userFriendlyParamName, null,
paramName);
valueList.add(value);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
index 861240b..c6f5258 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
@@ -83,11 +83,11 @@ public class ServiceUtil {
ServiceDBStore svcStore;
static {
- mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HDFS_NAME, new Integer(RangerCommonEnums.ASSET_HDFS));
- mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HBASE_NAME, new Integer(RangerCommonEnums.ASSET_HBASE));
- mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME, new Integer(RangerCommonEnums.ASSET_HIVE));
- mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KNOX_NAME, new Integer(RangerCommonEnums.ASSET_KNOX));
- mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_STORM_NAME, new Integer(RangerCommonEnums.ASSET_STORM));
+ mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HDFS_NAME, Integer.valueOf(RangerCommonEnums.ASSET_HDFS));
+ mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HBASE_NAME, Integer.valueOf(RangerCommonEnums.ASSET_HBASE));
+ mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME, Integer.valueOf(RangerCommonEnums.ASSET_HIVE));
+ mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KNOX_NAME, Integer.valueOf(RangerCommonEnums.ASSET_KNOX));
+ mapServiceTypeToAssetType.put(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_STORM_NAME, Integer.valueOf(RangerCommonEnums.ASSET_STORM));
mapAccessTypeToPermType.put("Unknown", 0);
mapAccessTypeToPermType.put("Reset", 1);
@@ -875,7 +875,7 @@ public class ServiceUtil {
VXPermMap permMap = new VXPermMap();
permMap.setPermFor(AppConstants.XA_PERM_FOR_USER);
- permMap.setPermGroup(new Integer(permGroup).toString());
+ permMap.setPermGroup(Integer.valueOf(permGroup).toString());
permMap.setUserName(userName);
permMap.setUserId(getUserId(userName));
permMap.setPermType(toPermType(access.getType()));
@@ -888,7 +888,7 @@ public class ServiceUtil {
VXPermMap permMap = new VXPermMap();
permMap.setPermFor(AppConstants.XA_PERM_FOR_USER);
- permMap.setPermGroup(new Integer(permGroup).toString());
+ permMap.setPermGroup(Integer.valueOf(permGroup).toString());
permMap.setUserName(userName);
permMap.setUserId(getUserId(userName));
permMap.setPermType(toPermType("Admin"));
@@ -908,7 +908,7 @@ public class ServiceUtil {
VXPermMap permMap = new VXPermMap();
permMap.setPermFor(AppConstants.XA_PERM_FOR_GROUP);
- permMap.setPermGroup(new Integer(permGroup).toString());
+ permMap.setPermGroup(Integer.valueOf(permGroup).toString());
permMap.setGroupName(groupName);
permMap.setGroupId(getGroupId(groupName));
permMap.setPermType(toPermType(access.getType()));
@@ -921,7 +921,7 @@ public class ServiceUtil {
VXPermMap permMap = new VXPermMap();
permMap.setPermFor(AppConstants.XA_PERM_FOR_GROUP);
- permMap.setPermGroup(new Integer(permGroup).toString());
+ permMap.setPermGroup(Integer.valueOf(permGroup).toString());
permMap.setGroupName(groupName);
permMap.setGroupId(getGroupId(groupName));
permMap.setPermType(toPermType("Admin"));
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
index 4afff31..54c48dc 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
@@ -148,7 +148,7 @@ public class XXServiceDao extends BaseDao<XXService> {
Long currentTagVersion = service.getTagVersion();
if(currentTagVersion == null) {
- currentTagVersion = new Long(0);
+ currentTagVersion = Long.valueOf(0);
}
service.setTagVersion(currentTagVersion + 1);
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 5344368..f9ebafc 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
@@ -64,7 +64,7 @@ public class XXTrxLogDao extends BaseDao<XXTrxLog> {
}
}
public Long getMaxIdOfXXTrxLog(){
- Long maxXTrxLogID=new Long(0);
+ Long maxXTrxLogID=Long.valueOf(0);
try {
maxXTrxLogID = (Long) getEntityManager()
.createNamedQuery("XXTrxLog.getMaxIdOfXXTrxLog", Long.class)
@@ -73,7 +73,7 @@ public class XXTrxLogDao extends BaseDao<XXTrxLog> {
logger.debug(e.getMessage());
}finally{
if(maxXTrxLogID==null){
- maxXTrxLogID=new Long(0);
+ maxXTrxLogID=Long.valueOf(0);
}
}
return maxXTrxLogID;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 de4d16c..38d15cd 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
@@ -522,7 +522,7 @@ public class AssetREST {
boolean isSecure = request.isSecure();
String policyCount = request.getParameter("policyCount");
String agentId = request.getParameter("agentId");
- Long lastKnowPolicyVersion = new Long(-1);
+ Long lastKnowPolicyVersion = Long.valueOf(-1);
if (ipAddress == null) {
ipAddress = request.getRemoteAddr();
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 7c9c290..a28eca1 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -735,7 +735,7 @@ public class ServiceREST {
}
List<RangerService> services = getServices(request).getServices();
- ret = new Long(services == null ? 0 : services.size());
+ ret = Long.valueOf(services == null ? 0 : services.size());
} catch(WebApplicationException excp) {
throw excp;
} catch(Throwable excp) {
@@ -1366,7 +1366,7 @@ public class ServiceREST {
policies = applyAdminAccessFilter(policies);
- ret = new Long(policies == null ? 0 : policies.size());
+ ret = Long.valueOf(policies == null ? 0 : policies.size());
} catch(WebApplicationException excp) {
throw excp;
} catch(Throwable excp) {
@@ -1522,7 +1522,7 @@ public class ServiceREST {
if (serviceUtil.isValidateHttpsAuthentication(serviceName, request)) {
if(lastKnownVersion == null) {
- lastKnownVersion = new Long(-1);
+ lastKnownVersion = Long.valueOf(-1);
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
index 7eb760a..19c3d19 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java
@@ -72,7 +72,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
searchFields.add(new SearchField("isVisible", "obj.isVisible",
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL ));
- createdByUserId = new Long(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
+ createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
sortFields.add(new SortField("name", "obj.name",true,SortField.SORT_ORDER.ASC));
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
index d54b71b..8c67058 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java
@@ -66,7 +66,7 @@ public class XGroupUserService extends
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
searchFields.add(new SearchField("xGroupId", "obj.parentGroupId",
SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
- createdByUserId = new Long(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
+ createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
index 474a6ab..8210650 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
@@ -119,7 +119,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
"xXPortalUser.id=xXPortalUserRole.userId and xXPortalUser.loginId = obj.name "));
- createdByUserId = new Long(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
+ createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1));
hiddenPasswordString = PropertiesUtil.getProperty("ranger.password.hidden","*****");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 c865669..e912cfb 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
@@ -295,7 +295,7 @@ public class SolrUtil {
return 0;
}
try {
- return new Integer(value.toString());
+ return Integer.valueOf(value.toString());
} catch (Throwable t) {
logger.error("Error converting value to integer. value=" + value, t);
}
@@ -313,7 +313,7 @@ public class SolrUtil {
return 0;
}
try {
- return new Long(value.toString());
+ return Long.valueOf(value.toString());
} catch (Throwable t) {
logger.error("Error converting value to long. value=" + value, t);
}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/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 613745e..a0cb7ee 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
@@ -24,7 +24,8 @@
*/
import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.List;
import org.apache.log4j.Logger;
@@ -65,7 +66,7 @@ public class RangerEnumUtil {
public final static String ENUM_XXAuthSession_AuthType = "XXAuthSession.AuthType";
public final static String ENUM_XResponse_ResponseStatus = "XResponse.ResponseStatus";
- protected Hashtable<String, VEnum> enumMap = new Hashtable<String, VEnum>();
+ protected Map<String, VEnum> enumMap = new HashMap<String, VEnum>();
protected List<VEnum> enumList = new ArrayList<VEnum>();
public List<VEnum> getEnums() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0fe605a9/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
index f8b9aea..2b14500 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
@@ -368,10 +368,10 @@ public class UserSync {
Integer ouOccrs = ouOccurences.get(dnValue);
if (ouOccrs == null) {
//System.out.println("value = 0");
- ouOccrs = new Integer(0);
+ ouOccrs = Integer.valueOf(0);
}
int val = ouOccrs.intValue();
- ouOccrs = new Integer(++val);
+ ouOccrs = Integer.valueOf(++val);
ouOccurences.put(dnValue, ouOccrs);
noOfUsers++;
}
@@ -737,10 +737,10 @@ public class UserSync {
Integer ouOccrs = ouOccurences.get(dnValue);
if (ouOccrs == null) {
//System.out.println("value = 0");
- ouOccrs = new Integer(0);
+ ouOccrs = Integer.valueOf(0);
}
int val = ouOccrs.intValue();
- ouOccrs = new Integer(++val);
+ ouOccrs = Integer.valueOf(++val);
ouOccurences.put(dnValue, ouOccrs);
noOfGroups++;