This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch ranger-2.9
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/ranger-2.9 by this push:
new 90024c274 RANGER-5515: remove javax.servlet-api depedency in
agents-common module (#874)
90024c274 is described below
commit 90024c274a259599dea67ebd1ba4bf7ccaff88a7
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)
(cherry picked from commit 0855b333bcc728dc6e8cf1d051264e1be99dc46a)
---
agents-common/pom.xml | 5 --
.../ranger/admin/client/RangerAdminRESTClient.java | 65 +++++++++++-----------
.../contextenricher/RangerUserStoreRefresher.java | 8 +--
.../process/PolicyMgrUserGroupBuilder.java | 43 +++++++-------
4 files changed, 57 insertions(+), 64 deletions(-)
diff --git a/agents-common/pom.xml b/agents-common/pom.xml
index 5e26712b3..f8045429b 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 12f6df99e..fb5299f9c 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
@@ -35,7 +35,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;
import java.io.UnsupportedEncodingException;
@@ -153,7 +152,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=" + isSecureMode + ", serviceName=" + serviceName);
} else {
@@ -166,9 +165,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=" + isSecureMode
+ ", response=" +
response.getStatus() + ", serviceName=" + serviceName
@@ -235,7 +234,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=" + isSecureMode + ", serviceName=" + serviceName);
} else {
@@ -248,9 +247,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=" + isSecureMode
+ ", response=" +
response.getStatus() + ", serviceName=" + serviceName
@@ -310,11 +309,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
-
if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus()==HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -368,11 +367,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
-
if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus()==HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -417,11 +416,11 @@ public List<String> getUserRoles(final String execUser)
throws Exception {
checkAndResetSessionCookie(response);
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="
+ response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() ==
HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -476,11 +475,11 @@ public List<String> getAllRoles(final String execUser)
throws Exception {
checkAndResetSessionCookie(response);
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="
+ response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() ==
HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -534,11 +533,11 @@ public RangerRole getRole(final String execUser, final
String roleName) throws E
checkAndResetSessionCookie(response);
if(response != null) {
- if (response.getStatus() != HttpServletResponse.SC_OK) {
+ if (response.getStatus() != HttpStatus.SC_OK) {
RESTResponse resp =
RESTResponse.fromClientResponse(response);
LOG.error("getPrincipalsForRole() failed: HTTP
status=" + response.getStatus() + ", message=" + resp.getMessage() + ",
isSecure=" + isSecureMode);
- if (response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if (response.getStatus() ==
HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -587,11 +586,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
-
if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus()==HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -612,7 +611,7 @@ public void revokeRole(final GrantRevokeRoleRequest
request) throws Exception {
}
final ClientResponse response;
-
+
boolean isSecureMode = isAuthenticationEnabled();
String relativeURL =
RangerRESTUtils.REST_URL_SERVICE_REVOKE_ROLE + serviceNameUrlParam;
Cookie sessionId = this.sessionId;
@@ -636,11 +635,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
-
if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus()==HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -689,11 +688,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
-
if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus()==HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -742,11 +741,11 @@ 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=" +
response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" +
isSecureMode);
- if(response.getStatus() ==
HttpServletResponse.SC_UNAUTHORIZED) {
+ if(response.getStatus() == HttpStatus.SC_UNAUTHORIZED) {
throw new AccessControlException();
}
@@ -821,7 +820,7 @@ public ServiceTags getServiceTagsIfUpdated(final long
lastKnownVersion, final lo
checkAndResetSessionCookie(response);
- 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=" + isSecureMode + ", serviceName=" + serviceName);
} else {
@@ -834,9 +833,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=" + isSecureMode
+ ", response=" +
response.getStatus() + ", serviceName=" + serviceName
@@ -895,7 +894,7 @@ public List<String> getTagTypes(String pattern) throws
Exception {
checkAndResetSessionCookie(response);
- 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);
@@ -953,7 +952,7 @@ public RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lon
checkAndResetSessionCookie(response);
- 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=" + isSecureMode + ", serviceName=" + serviceName);
} else {
@@ -966,9 +965,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=" + isSecureMode
+ ", response=" + response.getStatus()
+ ", serviceName=" + serviceName
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 2555537eb..552cf5cd8 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
@@ -21,6 +21,7 @@
import com.sun.jersey.api.client.ClientResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.http.HttpStatus;
import org.apache.ranger.admin.client.datatype.RESTResponse;
import org.apache.ranger.audit.provider.MiscUtil;
import org.apache.ranger.authorization.utils.JsonUtils;
@@ -34,7 +35,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.Reader;
import java.io.Writer;
@@ -397,7 +397,7 @@ private RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lo
response = rangerRESTClient.get(relativeURL, queryParams);
}
- 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=" + isSecureMode + ", user=" + user);
} else {
@@ -410,9 +410,9 @@ private RangerUserStore getUserStoreIfUpdated(long
lastKnownUserStoreVersion, lo
}
}
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=" + isSecureMode + ", user=" + user
+ ", response=" + response.getStatus()
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 bd2fc998a..a14eae5fe 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
@@ -34,15 +34,14 @@
import java.util.regex.Pattern;
import javax.security.auth.Subject;
-import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
-import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.commons.collections.CollectionUtils;
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;
@@ -1409,13 +1408,13 @@ 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) {
if
(cookie.getName().equalsIgnoreCase(rangerCookieName)) {
@@ -1428,8 +1427,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;
}
@@ -1462,10 +1461,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) {
if
(cookie.getName().equalsIgnoreCase(rangerCookieName)) {
@@ -1476,8 +1475,8 @@ 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;
}
@@ -1509,10 +1508,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) {
if
(cookie.getName().equalsIgnoreCase(rangerCookieName)) {
@@ -1523,8 +1522,8 @@ 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;
}
@@ -1557,13 +1556,13 @@ 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) {
if
(cookie.getName().equalsIgnoreCase(rangerCookieName)) {
@@ -1576,8 +1575,8 @@ 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;
}
