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 0855b333b RANGER-5515: remove javax.servlet-api depedency in
agents-common module (#874)
0855b333b is described below
commit 0855b333bcc728dc6e8cf1d051264e1be99dc46a
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Sat Mar 14 10:02:37 2026 -0700
RANGER-5515: remove javax.servlet-api depedency in agents-common module
(#874)
---
.../destination/RangerAuditServerDestination.java | 7 +--
agents-common/pom.xml | 5 --
.../ranger/admin/client/RangerAdminRESTClient.java | 69 +++++++++++-----------
.../contextenricher/RangerUserStoreRefresher.java | 12 ++--
.../process/PolicyMgrUserGroupBuilder.java | 36 +++++------
5 files changed, 62 insertions(+), 67 deletions(-)
diff --git
a/agents-audit/dest-auditserver/src/main/java/org/apache/ranger/audit/destination/RangerAuditServerDestination.java
b/agents-audit/dest-auditserver/src/main/java/org/apache/ranger/audit/destination/RangerAuditServerDestination.java
index 62472bbb8..a79c77b42 100644
---
a/agents-audit/dest-auditserver/src/main/java/org/apache/ranger/audit/destination/RangerAuditServerDestination.java
+++
b/agents-audit/dest-auditserver/src/main/java/org/apache/ranger/audit/destination/RangerAuditServerDestination.java
@@ -24,6 +24,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.http.HttpStatus;
import org.apache.ranger.audit.model.AuditEventBase;
import org.apache.ranger.audit.model.AuthzAuditEvent;
import org.apache.ranger.audit.provider.MiscUtil;
@@ -31,8 +32,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
-
import java.security.PrivilegedExceptionAction;
import java.util.Collection;
import java.util.HashMap;
@@ -209,7 +208,7 @@ private boolean sendBatch(Collection<AuditEventBase>
events, RangerRESTClient re
if (response != null) {
int status = response.getStatus();
- if (status == HttpServletResponse.SC_OK) {
+ if (status == HttpStatus.SC_OK) {
if (LOG.isDebugEnabled()) {
LOG.debug("Audit batch sent successfully. {} events
delivered. Response: {}", events.size(), response.getEntity(String.class));
}
@@ -228,7 +227,7 @@ private boolean sendBatch(Collection<AuditEventBase>
events, RangerRESTClient re
LOG.error("Failed to send audit batch. HTTP status: {},
Response: {}", status, errorBody);
- if (status == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (status == HttpStatus.SC_UNAUTHORIZED) {
LOG.error("Authentication failure (401). Verify
credentials are valid and audit server is properly configured.");
}
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 5870af008..6961f084f 100644
--- a/agents-common/pom.xml
+++ b/agents-common/pom.xml
@@ -83,11 +83,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- </dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
diff --git
a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
index 7654017a6..619a01675 100644
---
a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
+++
b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java
@@ -47,7 +47,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
@@ -168,7 +167,7 @@ public ServicePolicies getServicePoliciesIfUpdated(final
long lastKnownVersion,
checkAndResetSessionCookie(response);
- if (response == null || response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED || response.getStatus() ==
HttpServletResponse.SC_NO_CONTENT) {
+ if (response == null || response.getStatus() ==
HttpStatus.SC_NOT_MODIFIED || response.getStatus() == HttpStatus.SC_NO_CONTENT)
{
if (response == null) {
LOG.error("Error getting policies; Received NULL response!!.
secureMode={}, serviceName={}", isSecureMode, serviceName);
} else {
@@ -179,9 +178,9 @@ public ServicePolicies getServicePoliciesIfUpdated(final
long lastKnownVersion,
}
ret = null;
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, ServicePolicies.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting policies; service not found.
secureMode={}, response={}, serviceName={}, lastKnownVersion={},
lastActivationTimeInMillis={}",
@@ -246,7 +245,7 @@ public RangerRoles getRolesIfUpdated(final long
lastKnownRoleVersion, final long
checkAndResetSessionCookie(response);
- if (response == null || response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED || response.getStatus() ==
HttpServletResponse.SC_NO_CONTENT) {
+ if (response == null || response.getStatus() ==
HttpStatus.SC_NOT_MODIFIED || response.getStatus() == HttpStatus.SC_NO_CONTENT)
{
if (response == null) {
LOG.error("Error getting Roles; Received NULL response!!.
secureMode={}, serviceName={}", isSecureMode, serviceName);
} else {
@@ -257,9 +256,9 @@ public RangerRoles getRolesIfUpdated(final long
lastKnownRoleVersion, final long
}
ret = null;
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, RangerRoles.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting Roles; service not found. secureMode={},
response={}, serviceName={}, lastKnownRoleVersion={},
lastActivationTimeInMillis={}",
@@ -315,12 +314,12 @@ public RangerRole createRole(final RangerRole request)
throws Exception {
checkAndResetSessionCookie(response);
- if (response != null && response.getStatus() !=
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("createRole() failed: HTTP status={}, message={},
isSecure={}{}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -370,12 +369,12 @@ public void dropRole(final String execUser, final String
roleName) throws Except
if (response == null) {
throw new Exception("unknown error during deleteRole. roleName=" +
roleName);
- } else if (response.getStatus() != HttpServletResponse.SC_OK &&
response.getStatus() != HttpServletResponse.SC_NO_CONTENT) {
+ } else if (response.getStatus() != HttpStatus.SC_OK &&
response.getStatus() != HttpStatus.SC_NO_CONTENT) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("createRole() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -420,12 +419,12 @@ public List<String> getAllRoles(final String execUser)
throws Exception {
List<String> ret;
if (response != null) {
- if (response.getStatus() != HttpServletResponse.SC_OK) {
+ if (response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("getAllRoles() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -472,12 +471,12 @@ public List<String> getUserRoles(final String execUser)
throws Exception {
List<String> ret;
if (response != null) {
- if (response.getStatus() != HttpServletResponse.SC_OK) {
+ if (response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("getUserRoles() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -528,12 +527,12 @@ public RangerRole getRole(final String execUser, final
String roleName) throws E
RangerRole ret;
if (response != null) {
- if (response.getStatus() != HttpServletResponse.SC_OK) {
+ if (response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("getRole() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -577,12 +576,12 @@ public void grantRole(final GrantRevokeRoleRequest
request) throws Exception {
checkAndResetSessionCookie(response);
- if (response != null && response.getStatus() !=
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("grantRole() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -621,12 +620,12 @@ public void revokeRole(final GrantRevokeRoleRequest
request) throws Exception {
checkAndResetSessionCookie(response);
- if (response != null && response.getStatus() !=
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("revokeRole() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -672,12 +671,12 @@ public void grantAccess(final GrantRevokeRequest request)
throws Exception {
checkAndResetSessionCookie(response);
- if (response != null && response.getStatus() !=
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("grantAccess() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -723,12 +722,12 @@ public void revokeAccess(final GrantRevokeRequest
request) throws Exception {
checkAndResetSessionCookie(response);
- if (response != null && response.getStatus() !=
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.error("revokeAccess() failed: HTTP status={}, message={},
isSecure={}", response.getStatus(), resp.getMessage(), isSecureMode);
- if (response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -780,7 +779,7 @@ public ServiceTags getServiceTagsIfUpdated(final long
lastKnownVersion, final lo
final ServiceTags ret;
- if (response == null || response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED) {
+ if (response == null || response.getStatus() ==
HttpStatus.SC_NOT_MODIFIED) {
if (response == null) {
LOG.error("Error getting tags; Received NULL response!!.
secureMode={}, serviceName={}", isSecureMode, serviceName);
} else {
@@ -791,9 +790,9 @@ public ServiceTags getServiceTagsIfUpdated(final long
lastKnownVersion, final lo
}
ret = null;
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, ServiceTags.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting tags; service not found. secureMode={},
response={}, serviceName={}, lastKnownVersion={},
lastActivationTimeInMillis={}",
@@ -851,7 +850,7 @@ public List<String> getTagTypes(String pattern) throws
Exception {
List<String> ret;
- if (response != null && response.getStatus() ==
HttpServletResponse.SC_OK) {
+ if (response != null && response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, TYPE_LIST_STRING);
} else {
RESTResponse resp = RESTResponse.fromClientResponse(response);
@@ -908,7 +907,7 @@ public RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lon
final RangerUserStore ret;
- if (response == null || response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED) {
+ if (response == null || response.getStatus() ==
HttpStatus.SC_NOT_MODIFIED) {
if (response == null) {
LOG.error("Error getting UserStore; Received NULL response!!.
secureMode={}, serviceName={}", isSecureMode, serviceName);
} else {
@@ -919,9 +918,9 @@ public RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lon
}
ret = null;
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, RangerUserStore.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting UserStore; service not found.
secureMode={}, response={}, serviceName={}, lastKnownUserStoreVersion={},
lastActivationTimeInMillis={}",
@@ -989,16 +988,16 @@ public ServiceGdsInfo getGdsInfoIfUpdated(long
lastKnownVersion, long lastActiva
ret = null;
LOG.error("Error getting GdsInfo - received NULL response:
secureMode={}, serviceName={}", isSecureMode, serviceName);
- } else if (response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_MODIFIED) {
ret = null;
RESTResponse resp = RESTResponse.fromClientResponse(response);
LOG.debug("No change in GdsInfo: secureMode={}, response={},
serviceName={}, lastKnownGdsVersion={}, lastActivationTimeInMillis={}",
isSecureMode, resp, serviceName, lastKnownVersion,
lastActivationTimeInMillis);
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == HttpStatus.SC_OK) {
ret = JsonUtilsV2.readResponse(response, ServiceGdsInfo.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == HttpStatus.SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting GdsInfo - service not found:
secureMode={}, response={}, serviceName={},
lastKnownGdsVersion={},lastActivationTimeInMillis={}",
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java
b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java
index 37f43a97d..7798062d8 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerUserStoreRefresher.java
@@ -34,8 +34,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
@@ -47,6 +45,10 @@
import java.util.Map;
import java.util.concurrent.BlockingQueue;
+import static org.apache.http.HttpStatus.SC_NOT_FOUND;
+import static org.apache.http.HttpStatus.SC_NOT_MODIFIED;
+import static org.apache.http.HttpStatus.SC_OK;
+
public class RangerUserStoreRefresher extends Thread {
private static final Logger LOG =
LoggerFactory.getLogger(RangerUserStoreRefresher.class);
private static final Logger PERF_REFRESHER_INIT_LOG =
RangerPerfTracer.getPerfLogger("userstore.init");
@@ -378,7 +380,7 @@ private RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lo
final RangerUserStore ret;
- if (response == null || response.getStatus() ==
HttpServletResponse.SC_NOT_MODIFIED) {
+ if (response == null || response.getStatus() == SC_NOT_MODIFIED) {
if (response == null) {
LOG.error("Error getting UserStore; Received NULL response!!.
secureMode={}, user={}", isSecureMode, user);
} else {
@@ -389,9 +391,9 @@ private RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lo
}
ret = null;
- } else if (response.getStatus() == HttpServletResponse.SC_OK) {
+ } else if (response.getStatus() == SC_OK) {
ret = JsonUtilsV2.readResponse(response, RangerUserStore.class);
- } else if (response.getStatus() == HttpServletResponse.SC_NOT_FOUND) {
+ } else if (response.getStatus() == SC_NOT_FOUND) {
ret = null;
LOG.error("Error getting UserStore; service not found.
secureMode={}, user={}, response={}, lastKnownUserStoreVersion={},
lastActivationTimeInMillis={}",
diff --git
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
index 5ee556fcd..7977e9b07 100644
---
a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
+++
b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
@@ -24,6 +24,7 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.security.SecureClientLogin;
+import org.apache.http.HttpStatus;
import org.apache.ranger.authorization.utils.JsonUtils;
import org.apache.ranger.ugsyncutil.model.GroupUserInfo;
import org.apache.ranger.ugsyncutil.model.UgsyncAuditInfo;
@@ -40,7 +41,6 @@
import org.slf4j.LoggerFactory;
import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
@@ -1439,14 +1439,14 @@ private String tryUploadEntityWithCookie(Object obj,
String apiURL) {
if (clientResp != null) {
if (!(clientResp.toString().contains(apiURL))) {
- clientResp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ clientResp.setStatus(HttpStatus.SC_NOT_FOUND);
sessionId = null;
isValidRangerCookie = false;
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
sessionId = null;
isValidRangerCookie = false;
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_NO_CONTENT || clientResp.getStatus() ==
HttpServletResponse.SC_OK) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_NO_CONTENT ||
clientResp.getStatus() == HttpStatus.SC_OK) {
List<NewCookie> respCookieList = clientResp.getCookies();
for (NewCookie cookie : respCookieList) {
@@ -1461,8 +1461,8 @@ private String tryUploadEntityWithCookie(Object obj,
String apiURL) {
}
}
- if (clientResp.getStatus() != HttpServletResponse.SC_OK &&
clientResp.getStatus() != HttpServletResponse.SC_NO_CONTENT
- && clientResp.getStatus() !=
HttpServletResponse.SC_BAD_REQUEST) {
+ if (clientResp.getStatus() != HttpStatus.SC_OK &&
clientResp.getStatus() != HttpStatus.SC_NO_CONTENT
+ && clientResp.getStatus() != HttpStatus.SC_BAD_REQUEST) {
sessionId = null;
isValidRangerCookie = false;
}
@@ -1493,10 +1493,10 @@ private String tryUploadEntityWithCred(Object obj,
String apiURL) {
if (clientResp != null) {
if (!(clientResp.toString().contains(apiURL))) {
- clientResp.setStatus(HttpServletResponse.SC_NOT_FOUND);
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ clientResp.setStatus(HttpStatus.SC_NOT_FOUND);
+ } else if (clientResp.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
LOG.warn("Credentials response from ranger is 401.");
- } else if (clientResp.getStatus() == HttpServletResponse.SC_OK ||
clientResp.getStatus() == HttpServletResponse.SC_NO_CONTENT) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_OK ||
clientResp.getStatus() == HttpStatus.SC_NO_CONTENT) {
cookieList = clientResp.getCookies();
for (NewCookie cookie : cookieList) {
@@ -1511,7 +1511,7 @@ private String tryUploadEntityWithCred(Object obj, String
apiURL) {
}
}
- if (clientResp.getStatus() != HttpServletResponse.SC_OK &&
clientResp.getStatus() != HttpServletResponse.SC_NO_CONTENT &&
clientResp.getStatus() != HttpServletResponse.SC_BAD_REQUEST) {
+ if (clientResp.getStatus() != HttpStatus.SC_OK &&
clientResp.getStatus() != HttpStatus.SC_NO_CONTENT && clientResp.getStatus() !=
HttpStatus.SC_BAD_REQUEST) {
sessionId = null;
isValidRangerCookie = false;
}
@@ -1544,10 +1544,10 @@ private String tryGetEntityWithCred(String apiURL, int
retrievedCount) {
if (clientResp != null) {
if (!(clientResp.toString().contains(apiURL))) {
- clientResp.setStatus(HttpServletResponse.SC_NOT_FOUND);
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ clientResp.setStatus(HttpStatus.SC_NOT_FOUND);
+ } else if (clientResp.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
LOG.warn("Credentials response from ranger is 401.");
- } else if (clientResp.getStatus() == HttpServletResponse.SC_OK ||
clientResp.getStatus() == HttpServletResponse.SC_NO_CONTENT) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_OK ||
clientResp.getStatus() == HttpStatus.SC_NO_CONTENT) {
cookieList = clientResp.getCookies();
for (NewCookie cookie : cookieList) {
@@ -1562,7 +1562,7 @@ private String tryGetEntityWithCred(String apiURL, int
retrievedCount) {
}
}
- if (clientResp.getStatus() != HttpServletResponse.SC_OK &&
clientResp.getStatus() != HttpServletResponse.SC_NO_CONTENT &&
clientResp.getStatus() != HttpServletResponse.SC_BAD_REQUEST) {
+ if (clientResp.getStatus() != HttpStatus.SC_OK &&
clientResp.getStatus() != HttpStatus.SC_NO_CONTENT && clientResp.getStatus() !=
HttpStatus.SC_BAD_REQUEST) {
sessionId = null;
isValidRangerCookie = false;
}
@@ -1595,14 +1595,14 @@ private String tryGetEntityWithCookie(String apiURL,
int retrievedCount) {
if (clientResp != null) {
if (!(clientResp.toString().contains(apiURL))) {
- clientResp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ clientResp.setStatus(HttpStatus.SC_NOT_FOUND);
sessionId = null;
isValidRangerCookie = false;
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
sessionId = null;
isValidRangerCookie = false;
- } else if (clientResp.getStatus() ==
HttpServletResponse.SC_NO_CONTENT || clientResp.getStatus() ==
HttpServletResponse.SC_OK) {
+ } else if (clientResp.getStatus() == HttpStatus.SC_NO_CONTENT ||
clientResp.getStatus() == HttpStatus.SC_OK) {
List<NewCookie> respCookieList = clientResp.getCookies();
for (NewCookie cookie : respCookieList) {
@@ -1617,7 +1617,7 @@ private String tryGetEntityWithCookie(String apiURL, int
retrievedCount) {
}
}
- if (clientResp.getStatus() != HttpServletResponse.SC_OK &&
clientResp.getStatus() != HttpServletResponse.SC_NO_CONTENT &&
clientResp.getStatus() != HttpServletResponse.SC_BAD_REQUEST) {
+ if (clientResp.getStatus() != HttpStatus.SC_OK &&
clientResp.getStatus() != HttpStatus.SC_NO_CONTENT && clientResp.getStatus() !=
HttpStatus.SC_BAD_REQUEST) {
sessionId = null;
isValidRangerCookie = false;
}
