Remove overriding in HttpSignRequest.Builder sub-interfaces

Author: gosar

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/AsyncHttpSignRequest.java

@@ -20,7 +20,6 @@
 import software.amazon.awssdk.annotations.Immutable;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.spi.internal.DefaultAsyncHttpSignRequest;
 import software.amazon.awssdk.identity.spi.Identity;
 import software.amazon.awssdk.utils.builder.SdkBuilder;
@@ -44,18 +43,8 @@ static <IdentityT extends Identity> Builder<IdentityT> builder(IdentityT identit
     /**
      * A builder for a {@link AsyncHttpSignRequest}.
      */
-    interface Builder<IdentityT extends Identity> extends HttpSignRequest.Builder<Publisher<ByteBuffer>, IdentityT>,
-                                                          SdkBuilder<Builder<IdentityT>, AsyncHttpSignRequest<IdentityT>> {
-        @Override
-        Builder<IdentityT> request(SdkHttpRequest request);
-
-        @Override
-        Builder<IdentityT> payload(Publisher<ByteBuffer> payload);
-
-        @Override
-        Builder<IdentityT> identity(IdentityT identity);
-
-        @Override
-        <T> Builder<IdentityT> putProperty(SignerProperty<T> key, T value);
+    interface Builder<IdentityT extends Identity>
+        extends HttpSignRequest.Builder<Builder<IdentityT>, Publisher<ByteBuffer>, IdentityT>,
+                SdkBuilder<Builder<IdentityT>, AsyncHttpSignRequest<IdentityT>> {
     }
 }

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/HttpSignRequest.java

@@ -59,26 +59,26 @@ public interface HttpSignRequest<PayloadT, IdentityT extends Identity> {
     /**
      * A builder for a {@link HttpSignRequest}.
      */
-    interface Builder<PayloadT, IdentityT extends Identity> {
+    interface Builder<B extends Builder<B, PayloadT, IdentityT>, PayloadT, IdentityT extends Identity> {
 
         /**
          * Set the HTTP request object, without the request body payload.
          */
-        Builder<PayloadT, IdentityT> request(SdkHttpRequest request);
+        B request(SdkHttpRequest request);
 
         /**
          * Set the body payload of the request. A payload is optional. By default, the payload will be empty.
          */
-        Builder<PayloadT, IdentityT> payload(PayloadT payload);
+        B payload(PayloadT payload);
 
         /**
          * Set the identity of the request.
          */
-        Builder<PayloadT, IdentityT> identity(IdentityT identity);
+        B identity(IdentityT identity);
 
         /**
          * Set a property that the {@link HttpSigner} can use during signing.
          */
-        <T> Builder<PayloadT, IdentityT> putProperty(SignerProperty<T> key, T value);
+        <T> B putProperty(SignerProperty<T> key, T value);
     }
 }

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/SyncHttpSignRequest.java

@@ -19,7 +19,6 @@
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
 import software.amazon.awssdk.http.ContentStreamProvider;
-import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.auth.spi.internal.DefaultSyncHttpSignRequest;
 import software.amazon.awssdk.identity.spi.Identity;
 import software.amazon.awssdk.utils.builder.SdkBuilder;
@@ -43,18 +42,8 @@ static <IdentityT extends Identity> Builder<IdentityT> builder(IdentityT identit
     /**
      * A builder for a {@link SyncHttpSignRequest}.
      */
-    interface Builder<IdentityT extends Identity> extends HttpSignRequest.Builder<ContentStreamProvider, IdentityT>,
-                                                          SdkBuilder<Builder<IdentityT>, SyncHttpSignRequest<IdentityT>> {
-        @Override
-        Builder<IdentityT> request(SdkHttpRequest request);
-
-        @Override
-        Builder<IdentityT> payload(ContentStreamProvider payload);
-
-        @Override
-        Builder<IdentityT> identity(IdentityT identity);
-
-        @Override
-        <T> Builder<IdentityT> putProperty(SignerProperty<T> key, T value);
+    interface Builder<IdentityT extends Identity>
+        extends HttpSignRequest.Builder<Builder<IdentityT>, ContentStreamProvider, IdentityT>,
+                SdkBuilder<Builder<IdentityT>, SyncHttpSignRequest<IdentityT>> {
     }
 }

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultAsyncHttpSignRequest.java

@@ -41,7 +41,7 @@ public String toString() {
 
     @SdkInternalApi
     public static final class BuilderImpl<IdentityT extends Identity>
-        extends DefaultHttpSignRequest.BuilderImpl<BuilderImpl<IdentityT>, Publisher<ByteBuffer>, IdentityT>
+        extends DefaultHttpSignRequest.BuilderImpl<AsyncHttpSignRequest.Builder<IdentityT>, Publisher<ByteBuffer>, IdentityT>
         implements AsyncHttpSignRequest.Builder<IdentityT> {
 
         // Used to enable consumer builder pattern in HttpSigner.signAsync()

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultHttpSignRequest.java

@@ -62,8 +62,8 @@ public <T> T property(SignerProperty<T> property) {
     }
 
     @SdkInternalApi
-    protected static class BuilderImpl<B extends BuilderImpl<B, PayloadT, IdentityT>, PayloadT, IdentityT extends Identity>
-        implements Builder<PayloadT, IdentityT> {
+    protected abstract static class BuilderImpl<B extends Builder<B, PayloadT, IdentityT>, PayloadT,
+        IdentityT extends Identity> implements Builder<B, PayloadT, IdentityT> {
         private SdkHttpRequest request;
         private PayloadT payload;
         private IdentityT identity;

core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultSyncHttpSignRequest.java

@@ -40,7 +40,7 @@ public String toString() {
 
     @SdkInternalApi
     public static final class BuilderImpl<IdentityT extends Identity>
-        extends DefaultHttpSignRequest.BuilderImpl<BuilderImpl<IdentityT>, ContentStreamProvider, IdentityT>
+        extends DefaultHttpSignRequest.BuilderImpl<SyncHttpSignRequest.Builder<IdentityT>, ContentStreamProvider, IdentityT>
         implements SyncHttpSignRequest.Builder<IdentityT> {
 
         // Used to enable consumer builder pattern in HttpSigner.sign()