SNOW-2041976 Review fixes

Author: sfc-gh-rkowalski

src/main/java/net/snowflake/client/core/AttributeEnhancingHttpRequestRetryHandler.java

@@ -10,14 +10,13 @@
  *
  * <p>The execution count is stored using the key defined by {@link #EXECUTION_COUNT_ATTRIBUTE}.
  */
-public class AttributeEnhancingHttpRequestRetryHandler extends DefaultHttpRequestRetryHandler {
+class AttributeEnhancingHttpRequestRetryHandler extends DefaultHttpRequestRetryHandler {
   /**
    * The key used to store the current execution count (attempt number) in the {@link HttpContext}.
    * Interceptors can use this key to retrieve the count. The value stored will be an {@link
    * Integer}.
    */
-  public static final String EXECUTION_COUNT_ATTRIBUTE =
-      "net.snowflake.client.core.execution-count";
+  static final String EXECUTION_COUNT_ATTRIBUTE = "net.snowflake.client.core.execution-count";
 
   @Override
   public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {

src/main/java/net/snowflake/client/core/HeaderCustomizerHttpRequestInterceptor.java

@@ -71,18 +71,17 @@ public void process(HttpRequest httpRequest, HttpContext httpContext)
     // convert header names to lower case for case in-sensitive lookup
     Set<String> protectedHeaders =
         currentHeaders.keySet().stream().map(String::toLowerCase).collect(Collectors.toSet());
-    Object executionCount =
-        httpContext.getAttribute(
+    Integer executionCount =
+        (Integer) httpContext.getAttribute(
             AttributeEnhancingHttpRequestRetryHandler.EXECUTION_COUNT_ATTRIBUTE);
-    // If count is null or 0, it's the first attempt. Otherwise, it's a retry.
-    boolean isRetry = (executionCount != null && (Integer) executionCount > 0);
+    boolean isRetry = (executionCount == null || executionCount > 0);
 
     for (HttpHeadersCustomizer customizer : this.headersCustomizers) {
       if (customizer.applies(httpMethod, uri, currentHeaders)) {
         if (customizer.invokeOnce() && isRetry) {
           logger.debug(
               "{} customizer should only run on the first attempt and this is a {} retry. Skipping.",
-              customizer.getClass(),
+              customizer.getClass().getCanonicalName(),
               executionCount);
           continue;
         }
@@ -157,18 +156,22 @@ private static void throwIfExistingHeadersAreModified(
       Set<String> protectedHeaders, Set<String> newHeaders, HttpHeadersCustomizer customizer) {
     for (String headerName : newHeaders) {
       if (headerName != null && protectedHeaders.contains(headerName.toLowerCase())) {
+        String customizerName = customizer.getClass().getCanonicalName();
         logger.debug(
             "Customizer {} attempted to override existing driver header: {}",
-            customizer.getClass().getName(),
+            customizerName,
             headerName);
-        throw new DriverHeaderOverridingNotAllowedException(headerName);
+        throw new DriverHeaderOverridingNotAllowedException(headerName, customizerName);
       }
     }
   }
 
   public static class DriverHeaderOverridingNotAllowedException extends RuntimeException {
-    public DriverHeaderOverridingNotAllowedException(String header) {
-      super(String.format("Driver headers overriding not allowed. Tried for header: %s", header));
+    public DriverHeaderOverridingNotAllowedException(String header, String customizerName) {
+      super(
+          String.format(
+              "Driver headers overriding not allowed. Tried for header: %s in customizer: {}",
+              header, customizerName));
     }
   }
 }