addressed comments

Author: AnkitCLI

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

@@ -31,9 +31,10 @@ public class ServerErrorException extends RuntimeException {
    *
    * @param statusCode the HTTP status code (should be in the 5xx range)
    * @param message    the detail message explaining the error
+   * @param cause      the original cause of the error
    */
-  public ServerErrorException(int statusCode, String message) {
-    super("Server error [" + statusCode + "]: " + message);
+  public ServerErrorException(int statusCode, String message, Throwable cause) {
+    super("Server error [" + statusCode + "]: " + message, cause);
     this.statusCode = statusCode;
   }
 

src/main/java/io/cdap/plugin/gcp/gcs/ServiceAccountAccessTokenProvider.java

@@ -22,13 +22,12 @@
 import com.google.cloud.hadoop.util.AccessTokenProvider;
 import com.google.cloud.hadoop.util.CredentialFactory;
 import dev.failsafe.Failsafe;
+import dev.failsafe.FailsafeException;
 import dev.failsafe.RetryPolicy;
 import io.cdap.cdap.api.exception.ErrorCategory;
 import io.cdap.cdap.api.exception.ErrorCategory.ErrorCategoryEnum;
 import io.cdap.cdap.api.exception.ErrorType;
 import io.cdap.cdap.api.exception.ErrorUtils;
-import io.cdap.plugin.gcp.bigquery.source.BigQuerySourceConfig;
-import io.cdap.plugin.gcp.bigquery.util.BigQueryConstants;
 import io.cdap.plugin.gcp.common.GCPUtils;
 import io.cdap.plugin.gcp.common.ServerErrorException;
 import org.apache.hadoop.conf.Configuration;
@@ -52,53 +51,50 @@ public class ServiceAccountAccessTokenProvider implements AccessTokenProvider {
   private Configuration conf;
   private GoogleCredentials credentials;
   private static final Gson GSON = new Gson();
-  private static final Logger logger = LoggerFactory.getLogger(ServiceAccountAccessTokenProvider.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ServiceAccountAccessTokenProvider.class);
   public static final int DEFAULT_INITIAL_RETRY_DURATION_SECONDS = 5;
   public static final int DEFAULT_MAX_RETRY_COUNT = 5;
   public static final int DEFAULT_MAX_RETRY_DURATION_SECONDS = 80;
-
+  private static final RetryPolicy<Object> RETRY_POLICY = createRetryPolicy();
 
   @Override
   public AccessToken getAccessToken() {
-    int initialRetryDuration = DEFAULT_INITIAL_RETRY_DURATION_SECONDS;
-    int maxRetryCount = DEFAULT_MAX_RETRY_COUNT;
-    int maxRetryDuration =  DEFAULT_MAX_RETRY_DURATION_SECONDS;
-      logger.debug(
+      LOG.debug(
         "Initializing RetryPolicy with the following configuration: MaxRetryCount: {}, InitialRetryDuration: {}s, " +
-          "MaxRetryDuration: {}s", maxRetryCount, initialRetryDuration, maxRetryDuration);
+          "MaxRetryDuration: {}s", DEFAULT_MAX_RETRY_COUNT, DEFAULT_INITIAL_RETRY_DURATION_SECONDS,
+        DEFAULT_MAX_RETRY_DURATION_SECONDS);
       try {
-        return Failsafe.with(getRetryPolicy(initialRetryDuration, maxRetryDuration, maxRetryCount))
-          .get(() -> {
+        return Failsafe.with(RETRY_POLICY).get(() -> {
             com.google.auth.oauth2.AccessToken token = safeGetAccessToken();
             if (token == null || token.getExpirationTime().before(Date.from(Instant.now()))) {
               refresh();
               token = safeGetAccessToken();
             }
             return new AccessToken(token.getTokenValue(), token.getExpirationTime().getTime());
           });
-      } catch (Exception e) {
+      } catch (FailsafeException e) {
+        Throwable t = e.getCause() != null ? e.getCause() : e;
         throw ErrorUtils.getProgramFailureException(
           new ErrorCategory(ErrorCategoryEnum.PLUGIN),
           "Unable to get service account access token after retries.",
-          e.getMessage(),
-          ErrorType.UNKNOWN,
+          t.getMessage(),
+          ErrorType.SYSTEM,
           true,
-          e
+          t
         );
       }
     }
 
-
-  private RetryPolicy<Object> getRetryPolicy(int initialRetryDuration, int maxRetryDuration,
-                                             int maxRetryCount) {
+  private static RetryPolicy<Object> createRetryPolicy() {
     return RetryPolicy.builder()
       .handle(ServerErrorException.class)
-      .withBackoff(Duration.ofSeconds(initialRetryDuration), Duration.ofSeconds(maxRetryDuration))
-      .withMaxRetries(maxRetryCount)
-      .onRetry(event -> logger.debug("Retry attempt {} due to {}", event.getAttemptCount(), event.getLastException().
+      .withBackoff(Duration.ofSeconds(DEFAULT_INITIAL_RETRY_DURATION_SECONDS),
+                   Duration.ofSeconds(DEFAULT_MAX_RETRY_DURATION_SECONDS))
+      .withMaxRetries(DEFAULT_MAX_RETRY_COUNT)
+      .onRetry(event -> LOG.debug("Retry attempt {} due to {}", event.getAttemptCount(), event.getLastException().
         getMessage()))
-      .onSuccess(event -> logger.debug("Access Token Fetched Successfully."))
-      .onRetriesExceeded(event -> logger.error("Retry limit reached for Service account."))
+      .onSuccess(event -> LOG.debug("Access Token Fetched Successfully."))
+      .onRetriesExceeded(event -> LOG.error("Retry limit reached for Service account."))
       .build();
   }
 
@@ -113,7 +109,7 @@ private com.google.auth.oauth2.AccessToken safeGetAccessToken() throws IOExcepti
     } catch (IOException e) {
       if (isServerError(e)) {
         throw new ServerErrorException(HttpStatus.SC_SERVICE_UNAVAILABLE, "Server error while fetching access token: "
-          + e.getMessage());
+          + e.getMessage(), e);
       }
       throw e;
     }
@@ -126,7 +122,7 @@ public void refresh() throws IOException {
     } catch (IOException e) {
       if (isServerError(e)) {
         throw new ServerErrorException(HttpStatus.SC_SERVICE_UNAVAILABLE, "Server error during refresh: " +
-          e.getMessage());
+          e.getMessage(), e);
       }
       throw ErrorUtils.getProgramFailureException(new ErrorCategory(ErrorCategoryEnum.PLUGIN),
         "Unable to refresh service account access token.", e.getMessage(),