Repository: ranger Updated Branches: refs/heads/master 90979b4a8 -> 8e59c9204
RANGER-2214: Do some code improvement for the error message for KylinClient.java Signed-off-by: é¢é¹ 10209390 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/8e59c920 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/8e59c920 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/8e59c920 Branch: refs/heads/master Commit: 8e59c92046bd5822c08e60eff187b143d93be238 Parents: 90979b4 Author: zhangqiang2 <[email protected]> Authored: Tue Sep 11 11:28:16 2018 +0800 Committer: é¢é¹ 10209390 <[email protected]> Committed: Fri Sep 21 17:03:50 2018 +0800 ---------------------------------------------------------------------- .../services/kylin/client/KylinClient.java | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/8e59c920/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java ---------------------------------------------------------------------- diff --git a/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java b/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java index 9cf21aa..17e0ecb 100644 --- a/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java +++ b/plugin-kylin/src/main/java/org/apache/ranger/services/kylin/client/KylinClient.java @@ -163,12 +163,21 @@ public class KylinClient extends BaseClient { private List<KylinProjectResponse> getKylinProjectResponse(ClientResponse response) { List<KylinProjectResponse> projectResponses = null; try { - if (response != null && response.getStatus() == HttpStatus.SC_OK) { - String jsonString = response.getEntity(String.class); - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - - projectResponses = gson.fromJson(jsonString, new TypeToken<List<KylinProjectResponse>>() { - }.getType()); + if (response != null) { + if (response.getStatus() == HttpStatus.SC_OK) { + String jsonString = response.getEntity(String.class); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + + projectResponses = gson.fromJson(jsonString, new TypeToken<List<KylinProjectResponse>>() { + }.getType()); + } else { + String msgDesc = "Unable to get a valid response for " + "expected mime type : [" + EXPECTED_MIME_TYPE + + "], kylinUrl: " + kylinUrl + " - got http response code " + response.getStatus(); + LOG.error(msgDesc); + HadoopException hdpException = new HadoopException(msgDesc); + hdpException.generateResponseDataMap(false, msgDesc, msgDesc + ERROR_MESSAGE, null, null); + throw hdpException; + } } else { String msgDesc = "Unable to get a valid response for " + "expected mime type : [" + EXPECTED_MIME_TYPE + "], kylinUrl: " + kylinUrl + " - got null response.";
