Repository: ranger Updated Branches: refs/heads/master 445381594 -> 650b24e5d
RANGER-1915:Optimize the code and keep the code style consistent in the RangerAdminRESTClient class Signed-off-by: peng.jianhua <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/650b24e5 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/650b24e5 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/650b24e5 Branch: refs/heads/master Commit: 650b24e5d38c20c20869c0158ed9f35818e79bd0 Parents: 4453815 Author: peng.jianhua <[email protected]> Authored: Tue Dec 5 10:33:09 2017 +0800 Committer: peng.jianhua <[email protected]> Committed: Thu Dec 7 10:00:52 2017 +0800 ---------------------------------------------------------------------- .../ranger/admin/client/RangerAdminRESTClient.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/650b24e5/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java ---------------------------------------------------------------------- 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 0aa400f..dddfbc7 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 @@ -54,9 +54,6 @@ public class RangerAdminRESTClient implements RangerAdminClient { private RangerRESTClient restClient; private RangerRESTUtils restUtils = new RangerRESTUtils(); - public RangerAdminRESTClient() { - } - public static <T> GenericType<List<T>> getGenericType(final T clazz) { ParameterizedType parameterizedGenericType = new ParameterizedType() { @@ -196,11 +193,11 @@ public class RangerAdminRESTClient implements RangerAdminClient { .queryParam(RangerRESTUtils.REST_PARAM_PLUGIN_ID, pluginId); response = webResource.accept(RangerRESTUtils.REST_EXPECTED_MIME_TYPE).type(RangerRESTUtils.REST_EXPECTED_MIME_TYPE).post(ClientResponse.class, restClient.toJson(request)); } - if(response != null && response.getStatus() != 200) { + if(response != null && response.getStatus() != HttpServletResponse.SC_OK) { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("grantAccess() failed: HTTP status=" + response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" + isSecureMode + (isSecureMode ? (", user=" + user) : "")); - if(response.getStatus() == 401) { + if(response.getStatus()==HttpServletResponse.SC_UNAUTHORIZED) { throw new AccessControlException(); } @@ -242,11 +239,11 @@ public class RangerAdminRESTClient implements RangerAdminClient { response = webResource.accept(RangerRESTUtils.REST_EXPECTED_MIME_TYPE).type(RangerRESTUtils.REST_EXPECTED_MIME_TYPE).post(ClientResponse.class, restClient.toJson(request)); } - if(response != null && response.getStatus() != 200) { + if(response != null && response.getStatus() != HttpServletResponse.SC_OK) { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("revokeAccess() failed: HTTP status=" + response.getStatus() + ", message=" + resp.getMessage() + ", isSecure=" + isSecureMode + (isSecureMode ? (", user=" + user) : "")); - if(response.getStatus() == 401) { + if(response.getStatus() == HttpServletResponse.SC_UNAUTHORIZED) { throw new AccessControlException(); } @@ -382,7 +379,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { response = webResource.accept(RangerRESTUtils.REST_MIME_TYPE_JSON).get(ClientResponse.class); } - if(response != null && response.getStatus() == 200) { + if(response != null && response.getStatus() == HttpServletResponse.SC_OK) { ret = response.getEntity(getGenericType(emptyString)); } else { RESTResponse resp = RESTResponse.fromClientResponse(response);
