Add errorReason/errorMessage

Author: psainics

src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProvider.java

@@ -16,9 +16,7 @@
 
 package io.cdap.plugin.gcp.common;
 
-import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.HttpResponseException;
-import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import io.cdap.cdap.api.exception.ErrorCategory;
 import io.cdap.cdap.api.exception.ErrorCategory.ErrorCategoryEnum;
@@ -73,32 +71,12 @@ public ProgramFailureException getExceptionDetails(Exception e, ErrorContext err
    */
   private ProgramFailureException getProgramFailureException(HttpResponseException e,
       ErrorContext errorContext) {
-    Integer statusCode = e.getStatusCode();
-    ErrorUtils.ActionErrorPair pair = ErrorUtils.getActionErrorByStatusCode(statusCode);
-    String errorReason = String.format("%s %s. %s", e.getStatusCode(), e.getStatusMessage(),
-      pair.getCorrectiveAction());
-
-    String errorMessage = e.getMessage();
-    String externalDocumentationLink = null;
-    if (e instanceof GoogleJsonResponseException) {
-      errorMessage = GCPErrorDetailsProviderUtil.getErrorMessage((GoogleJsonResponseException) e);
-
-      externalDocumentationLink = getExternalDocumentationLink();
-      if (!Strings.isNullOrEmpty(externalDocumentationLink)) {
-
-        if (!errorReason.endsWith(".")) {
-          errorReason = errorReason + ".";
-        }
-        errorReason = String.format("%s For more details, see %s", errorReason,
-          externalDocumentationLink);
-      }
-    }
-
     return ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategoryEnum.PLUGIN),
-      errorReason, String.format(ERROR_MESSAGE_FORMAT, errorContext.getPhase(),
-            e.getClass().getName(), errorMessage),
-      pair.getErrorType(), true, ErrorCodeType.HTTP, statusCode.toString(),
-        externalDocumentationLink, e);
+      GCPErrorDetailsProviderUtil.getErrorReason(e, getExternalDocumentationLink()),
+      String.format(ERROR_MESSAGE_FORMAT, errorContext.getPhase(), e.getClass().getName(),
+        GCPErrorDetailsProviderUtil.getErrorMessage(e)),
+      ErrorUtils.getActionErrorByStatusCode(e.getStatusCode()).getErrorType(), true, ErrorCodeType.HTTP,
+      Integer.toString(e.getStatusCode()), getExternalDocumentationLink(), e);
   }
 
   /**

src/main/java/io/cdap/plugin/gcp/common/GCPErrorDetailsProviderUtil.java

@@ -60,26 +60,33 @@ public static ProgramFailureException getHttpResponseExceptionDetailsFromChain(E
   }
 
   private static ProgramFailureException getProgramFailureException(HttpResponseException e, String externalDocUrl) {
-    Integer statusCode = e.getStatusCode();
-    ErrorUtils.ActionErrorPair pair = ErrorUtils.getActionErrorByStatusCode(statusCode);
-    String errorReason =
-      String.format("%s %s. %s", e.getStatusCode(), e.getStatusMessage(), pair.getCorrectiveAction());
-    String errorMessage = e.getMessage();
+    String errorReason = getErrorReason(e, externalDocUrl);
+    return ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN), errorReason,
+      String.format("%s %s: %s", errorReason, e.getClass().getName(), getErrorMessage(e)),
+      ErrorUtils.getActionErrorByStatusCode(e.getStatusCode()).getErrorType(), true, ErrorCodeType.HTTP,
+      Integer.toString(e.getStatusCode()), externalDocUrl, e);
+  }
+
+  static String getErrorMessage(HttpResponseException e) {
     if (e instanceof GoogleJsonResponseException) {
-      errorMessage = getErrorMessage((GoogleJsonResponseException) e);
-      if (!Strings.isNullOrEmpty(externalDocUrl)) {
-        if (!errorReason.endsWith(".")) {
-          errorReason = errorReason + ".";
-        }
-        errorReason = String.format("%s For more details, see %s", errorReason, GCPUtils.GCS_SUPPORTED_DOC_URL);
+       return getErrorMessage((GoogleJsonResponseException) e);
+    }
+    return e.getMessage();
+  }
+
+  static String getErrorReason(HttpResponseException e, String externalDocUrl) {
+    String errorReason = String.format("%s %s. %s", e.getStatusCode(), e.getStatusMessage(),
+      ErrorUtils.getActionErrorByStatusCode(e.getStatusCode()).getCorrectiveAction());
+    if (!Strings.isNullOrEmpty(externalDocUrl)) {
+      if (!errorReason.endsWith(".")) {
+        errorReason = errorReason + ".";
       }
+      errorReason = String.format("%s For more details, see %s", errorReason, externalDocUrl);
     }
-    return ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategory.ErrorCategoryEnum.PLUGIN), errorReason,
-      String.format("%s %s: %s", errorReason, e.getClass().getName(), errorMessage), pair.getErrorType(), true,
-      ErrorCodeType.HTTP, statusCode.toString(), GCPUtils.GCS_SUPPORTED_DOC_URL, e);
+    return errorReason;
   }
 
-  static String getErrorMessage(GoogleJsonResponseException exception) {
+  private static String getErrorMessage(GoogleJsonResponseException exception) {
     if (!Strings.isNullOrEmpty(exception.getMessage())) {
       return exception.getMessage();
     }