[ranger] branch master updated: RANGER-2314 Do some code improvement for the error message in SqoopClient.java

[pengjianhua]

This is an automated email from the ASF dual-hosted git repository.

pengjianhua 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 26a1126  RANGER-2314 Do some code improvement for the error message in 
SqoopClient.java
26a1126 is described below

commit 26a11263292f05abd62684958ff78f94f67a3370
Author: zhangqiang2 <zhangqia...@zte.com.cn>
AuthorDate: Thu Dec 27 15:14:04 2018 +0800

    RANGER-2314 Do some code improvement for the error message in 
SqoopClient.java
    
    Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn>
---
 .../ranger/services/sqoop/client/SqoopClient.java  | 37 ++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git 
a/plugin-sqoop/src/main/java/org/apache/ranger/services/sqoop/client/SqoopClient.java
 
b/plugin-sqoop/src/main/java/org/apache/ranger/services/sqoop/client/SqoopClient.java
index 3563b31..6059654 100644
--- 
a/plugin-sqoop/src/main/java/org/apache/ranger/services/sqoop/client/SqoopClient.java
+++ 
b/plugin-sqoop/src/main/java/org/apache/ranger/services/sqoop/client/SqoopClient.java
@@ -267,19 +267,30 @@ public class SqoopClient extends BaseClient {
        private <T> T getSqoopResourceResponse(ClientResponse response, 
Class<T> classOfT) {
                T resource = null;
                try {
-                       if (response != null && response.getStatus() == 
HttpStatus.SC_OK) {
-                               String jsonString = 
response.getEntity(String.class);
-                               Gson gson = new 
GsonBuilder().setPrettyPrinting().create();
-
-                               resource = gson.fromJson(jsonString, classOfT);
-                       } else {
-                               String msgDesc = "Unable to get a valid 
response for " + "expected mime type : [" + EXPECTED_MIME_TYPE
-                                               + "], sqoopUrl: " + sqoopUrl + 
" - got null response.";
-                               LOG.error(msgDesc);
-                               HadoopException hdpException = new 
HadoopException(msgDesc);
-                               hdpException.generateResponseDataMap(false, 
msgDesc, msgDesc + ERROR_MESSAGE, null, null);
-                               throw hdpException;
-                       }
+            if (response != null) {
+                if (response.getStatus() == HttpStatus.SC_OK) {
+                    String jsonString = response.getEntity(String.class);
+                    Gson gson = new GsonBuilder().setPrettyPrinting().create();
+
+                    resource = gson.fromJson(jsonString, classOfT);
+                } else {
+                    String msgDesc = "Unable to get a valid response for " + 
"expected mime type : ["
+                            + EXPECTED_MIME_TYPE + "], sqoopUrl: " + sqoopUrl 
+ " - 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
+                        + "], sqoopUrl: " + sqoopUrl + " - got null response.";
+                LOG.error(msgDesc);
+                HadoopException hdpException = new HadoopException(msgDesc);
+                hdpException.generateResponseDataMap(false, msgDesc, msgDesc + 
ERROR_MESSAGE, null, null);
+                throw hdpException;
+            }
                } catch (HadoopException he) {
                        throw he;
                } catch (Throwable t) {