Merge pull request #1913 from aws/zoewang/revertTM

Revert "Remove the use of S3NativeClient and integrate with S3Client …

Author: zoewangg

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkInternalExecutionAttribute.java

@@ -17,7 +17,6 @@
 
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.interceptor.trait.HttpChecksumRequired;
-import software.amazon.awssdk.http.SdkHttpExecutionAttributes;
 
 /**
  * Attributes that can be applied to all sdk requests. Only generated code from the SDK clients should set these values.
@@ -48,12 +47,6 @@ public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
     public static final ExecutionAttribute<Boolean> DISABLE_HOST_PREFIX_INJECTION =
             new ExecutionAttribute<>("DisableHostPrefixInjection");
 
-    /**
-     * The SDK HTTP attributes that can be passed to the HTTP client
-     */
-    public static final ExecutionAttribute<SdkHttpExecutionAttributes> SDK_HTTP_EXECUTION_ATTRIBUTES =
-        new ExecutionAttribute<>("SdkHttpExecutionAttributes");
-
     private SdkInternalExecutionAttribute() {
     }
 }

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/MakeAsyncHttpRequestStage.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
-import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.SDK_HTTP_EXECUTION_ATTRIBUTES;
 import static software.amazon.awssdk.core.internal.http.timers.TimerUtils.resolveTimeoutInMillis;
 import static software.amazon.awssdk.http.Header.CONTENT_LENGTH;
 
@@ -181,19 +180,15 @@ private CompletableFuture<Response<OutputT>> executeHttpRequest(SdkHttpFullReque
 
         MetricCollector httpMetricCollector = MetricUtils.createHttpMetricsCollector(context);
 
-        AsyncExecuteRequest.Builder executeRequestBuilder = AsyncExecuteRequest.builder()
+        AsyncExecuteRequest executeRequest = AsyncExecuteRequest.builder()
                                                                 .request(requestWithContentLength)
                                                                 .requestContentPublisher(requestProvider)
                                                                 .responseHandler(wrappedResponseHandler)
                                                                 .fullDuplex(isFullDuplex(context.executionAttributes()))
-                                                                .metricCollector(httpMetricCollector);
-        if (context.executionAttributes().getAttribute(SDK_HTTP_EXECUTION_ATTRIBUTES) != null) {
-            executeRequestBuilder.httpExecutionAttributes(
-                context.executionAttributes()
-                       .getAttribute(SDK_HTTP_EXECUTION_ATTRIBUTES));
-        }
+                                                                .metricCollector(httpMetricCollector)
+                                                                .build();
 
-        CompletableFuture<Void> httpClientFuture = doExecuteHttpRequest(context, executeRequestBuilder.build());
+        CompletableFuture<Void> httpClientFuture = doExecuteHttpRequest(context, executeRequest);
 
         TimeoutTracker timeoutTracker = setupAttemptTimer(responseFuture, context);
         context.apiCallAttemptTimeoutTracker(timeoutTracker);

http-client-spi/pom.xml

@@ -80,11 +80,6 @@
             <artifactId>reactive-streams-tck</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>nl.jqno.equalsverifier</groupId>
-            <artifactId>equalsverifier</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpExecutionAttribute.java

@@ -17,11 +17,8 @@
 
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.http.SdkHttpExecutionAttribute;
-import software.amazon.awssdk.http.SdkHttpExecutionAttributes;
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.metrics.MetricCollector;
-import software.amazon.awssdk.utils.Validate;
 
 /**
  * Request object containing the parameters necessary to make an asynchronous HTTP request.
@@ -35,15 +32,13 @@ public final class AsyncExecuteRequest {
     private final SdkAsyncHttpResponseHandler responseHandler;
     private final MetricCollector metricCollector;
     private final boolean isFullDuplex;
-    private final SdkHttpExecutionAttributes sdkHttpExecutionAttributes;
 
     private AsyncExecuteRequest(BuilderImpl builder) {
         this.request = builder.request;
         this.requestContentPublisher = builder.requestContentPublisher;
         this.responseHandler = builder.responseHandler;
         this.metricCollector = builder.metricCollector;
         this.isFullDuplex = builder.isFullDuplex;
-        this.sdkHttpExecutionAttributes = builder.executionAttributesBuilder.build();
     }
 
     /**
@@ -81,13 +76,6 @@ public boolean fullDuplex() {
         return isFullDuplex;
     }
 
-    /**
-     * @return the SDK HTTP execution attributes associated with this request
-     */
-    public SdkHttpExecutionAttributes httpExecutionAttributes() {
-        return sdkHttpExecutionAttributes;
-    }
-
     public static Builder builder() {
         return new BuilderImpl();
     }
@@ -137,25 +125,6 @@ public interface Builder {
          */
         Builder fullDuplex(boolean fullDuplex);
 
-        /**
-         * Put an HTTP execution attribute into to the collection of HTTP execution attributes for this request
-         *
-         * @param attribute The execution attribute object
-         * @param value     The value of the execution attribute.
-         */
-        <T> Builder putHttpExecutionAttribute(SdkHttpExecutionAttribute<T> attribute, T value);
-
-        /**
-         * Sets the additional HTTP execution attributes collection for this request.
-         * <p>
-         * This will override the attributes configured through
-         * {@link #putHttpExecutionAttribute(SdkHttpExecutionAttribute, Object)}
-         *
-         * @param executionAttributes Execution attributes map for this request.
-         * @return This object for method chaining.
-         */
-        Builder httpExecutionAttributes(SdkHttpExecutionAttributes executionAttributes);
-
         AsyncExecuteRequest build();
     }
 
@@ -165,7 +134,6 @@ private static class BuilderImpl implements Builder {
         private SdkAsyncHttpResponseHandler responseHandler;
         private MetricCollector metricCollector;
         private boolean isFullDuplex;
-        private SdkHttpExecutionAttributes.Builder executionAttributesBuilder = SdkHttpExecutionAttributes.builder();
 
         @Override
         public Builder request(SdkHttpRequest request) {
@@ -197,20 +165,6 @@ public Builder fullDuplex(boolean fullDuplex) {
             return this;
         }
 
-        @Override
-        public <T> Builder putHttpExecutionAttribute(SdkHttpExecutionAttribute<T> attribute, T value) {
-            this.executionAttributesBuilder.put(attribute, value);
-            return this;
-        }
-
-        @Override
-        public Builder httpExecutionAttributes(SdkHttpExecutionAttributes executionAttributes) {
-            Validate.paramNotNull(executionAttributes, "executionAttributes");
-            this.executionAttributesBuilder = executionAttributes.toBuilder();
-            return this;
-        }
-
-
         @Override
         public AsyncExecuteRequest build() {
             return new AsyncExecuteRequest(this);

http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpExecutionAttributes.java

@@ -114,7 +114,7 @@
         <rxjava.version>2.2.21</rxjava.version>
         <commons-codec.verion>1.10</commons-codec.verion>
         <jmh.version>1.29</jmh.version>
-        <awscrt.version>0.15.15</awscrt.version>
+        <awscrt.version>0.15.8</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.8.1</junit5.version>

http-client-spi/src/main/java/software/amazon/awssdk/http/async/AsyncExecuteRequest.java

@@ -101,6 +101,11 @@
             <artifactId>aws-core</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>metrics-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>service-test-utils</artifactId>