HADOOP-18146: ABFS: Added changes for expect hundred continue header

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClient.java

@@ -707,7 +707,7 @@ public AbfsRestOperation append(final String path, final byte[] buffer,
       */
       int responseStatusCode = ((AbfsRestOperationException) e).getStatusCode();
       if (checkUserError(responseStatusCode) && reqParams.isExpectHeaderEnabled()) {
-        LOG.debug("User error, retrying without 100 continue enabled for the given path " + path);
+        LOG.debug("User error, retrying without 100 continue enabled for the given path {} " , path);
         reqParams.setExpectHeaderEnabled(false);
         return this.append(path, buffer, reqParams, cachedSasToken,
             tracingContext);

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsClientThrottlingIntercept.java

@@ -160,7 +160,7 @@ public void updateMetrics(AbfsRestOperationType operationType,
             throttling but there were some expectedBytesToBeSent.
            */
           if (updateBytesTransferred(isThrottledOperation, abfsHttpOperation)) {
-            LOG.debug("Updating metrics due to throttling for path " + abfsHttpOperation.getConnUrl().getPath());
+            LOG.debug("Updating metrics due to throttling for path {} " , abfsHttpOperation.getConnUrl().getPath());
             contentLength = abfsHttpOperation.getExpectedBytesToBeSent();
           }
         }

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/services/AbfsRestOperation.java

@@ -25,6 +25,7 @@
 import java.net.UnknownHostException;
 import java.util.List;
 
+import org.apache.hadoop.classification.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -249,19 +250,6 @@ private void completeExecute(TracingContext tracingContext)
     LOG.trace("{} REST operation complete", operationType);
   }
 
-  /**
-   * Returns a new object of AbfsHttpOperation.
-   * @param url The url for the operation.
-   * @param method The http method.
-   * @param requestHeaders The request headers for the operation.
-   * @return AbfsHttpOperation object.
-   * @throws IOException
-   */
-  AbfsHttpOperation getHttpOperation(final URL url, final String method,
-      final List<AbfsHttpHeader> requestHeaders) throws IOException {
-    return new AbfsHttpOperation(url, method, requestHeaders);
-  }
-
   /**
    * Executes a single HTTP operation to complete the REST operation.  If it
    * fails, there may be a retry.  The retryCount is incremented with each
@@ -273,7 +261,7 @@ private boolean executeHttpOperation(final int retryCount,
 
     try {
       // initialize the HTTP request and open the connection
-      httpOperation = getHttpOperation(url, method, requestHeaders);
+      httpOperation = createHttpOperation();
       incrementCounter(AbfsStatistic.CONNECTIONS_MADE, 1);
       tracingContext.constructHeader(httpOperation);
 
@@ -372,6 +360,15 @@ private boolean executeHttpOperation(final int retryCount,
     return true;
   }
 
+  /**
+   * Creates new object of {@link AbfsHttpOperation} with the url, method, and
+   * requestHeaders fields of the AbfsRestOperation object.
+   */
+  @VisibleForTesting
+  AbfsHttpOperation createHttpOperation() throws IOException {
+    return new AbfsHttpOperation(url, method, requestHeaders);
+  }
+
   /**
    * Incrementing Abfs counters with a long value.
    *

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsClient.java

@@ -27,6 +27,7 @@
 import java.util.Random;
 import java.util.regex.Pattern;
 
+import org.assertj.core.api.AbstractBooleanAssert;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -551,7 +552,7 @@ public void testExpectHundredContinue() throws Exception {
     // Sets the httpOperation for the rest operation.
     Mockito.doReturn(abfsHttpOperation)
         .when(op)
-        .getHttpOperation(Mockito.any(), Mockito.any(), Mockito.any());
+        .createHttpOperation();
 
     // Mock the restOperation for the client.
     Mockito.doReturn(op)
@@ -566,7 +567,9 @@ public void testExpectHundredContinue() throws Exception {
         TracingHeaderFormat.ALL_ID_FORMAT, null));
 
     // Check that expect header is enabled before the append call.
-    assertTrue(appendRequestParameters.isExpectHeaderEnabled());
+    Assertions.assertThat(appendRequestParameters.isExpectHeaderEnabled())
+            .describedAs("The expect header is not true before the append call")
+            .isTrue();
 
     intercept(AzureBlobFileSystemException.class,
         () -> testClient.append(finalTestPath, buffer, appendRequestParameters, null, tracingContext));
@@ -577,6 +580,8 @@ public void testExpectHundredContinue() throws Exception {
         .isEqualTo(0);
 
     // Verify that the same request was retried with expect header disabled.
-    assertFalse(appendRequestParameters.isExpectHeaderEnabled());
+    Assertions.assertThat(appendRequestParameters.isExpectHeaderEnabled())
+            .describedAs("The expect header is not false")
+            .isFalse();
   }
 }

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestAbfsRestOperation.java

@@ -257,7 +257,7 @@ public void write(final int i) throws IOException {
     // Sets the httpOperation for the rest operation.
     Mockito.doReturn(abfsHttpOperation)
         .when(op)
-        .getHttpOperation(Mockito.any(), Mockito.any(), Mockito.any());
+        .createHttpOperation();
     return op;
   }
 
@@ -285,7 +285,7 @@ void assertTraceContextState(int retryCount, int assertRetryCount, int bytesSent
   public void testExpectHundredContinue() throws Exception {
     // Gets the AbfsRestOperation.
     AbfsRestOperation op = getRestOperation();
-    AbfsHttpOperation httpOperation = op.getHttpOperation(Mockito.any(), Mockito.any(), Mockito.any());
+    AbfsHttpOperation httpOperation = op.createHttpOperation();
 
     TracingContext tracingContext = Mockito.spy(new TracingContext("abcd",
         "abcde", FSOperationType.APPEND,