Fix HttpSign* interfaces with correct types

haydenbaker · haydenbaker · commit 8b86bd417a5f · 2023-05-12T15:45:03.000-07:00
diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>http-auth-aws-crt</artifactId>
     <name>AWS Java SDK :: HTTP Auth AWS CRT</name>
     <description>
-        The AWS SDK for Java - HTTP Auth AWS module contains interfaces and implementations for http authentication
+        The AWS SDK for Java - HTTP Auth AWS module contains interfaces and implementations for HTTP authentication
             specific to the AWS CRT.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>http-auth-aws</artifactId>
     <name>AWS Java SDK :: HTTP Auth AWS</name>
     <description>
-        The AWS SDK for Java - HTTP Auth AWS module contains interfaces and implementations for http authentication
+        The AWS SDK for Java - HTTP Auth AWS module contains interfaces and implementations for generic generic HTTP authentication
             specific to AWS.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
diff --git a/core/http-auth-event-stream/pom.xml b/core/http-auth-event-stream/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>http-auth-event-stream</artifactId>
     <name>AWS Java SDK :: HTTP Auth Event Stream</name>
     <description>
-        The AWS SDK for Java - HTTP Auth module contains interfaces and implementations for http authentication
+        The AWS SDK for Java - HTTP Auth module contains interfaces and implementations for generic HTTP authentication
             specific to the event streams.
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/HttpSignRequest.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/HttpSignRequest.java
@@ -36,8 +36,8 @@ public interface HttpSignRequest<PayloadT> {
     /**
      * Get a new builder for creating a {@link HttpSignRequest}.
      */
-    static <T> Builder<T> builder(Class<T> payloadType) {
-        return new DefaultHttpSignRequest.BuilderImpl(payloadType);
+    static <PayloadT> Builder<PayloadT> builder(Class<PayloadT> payloadType) {
+        return new DefaultHttpSignRequest.BuilderImpl<>(payloadType);
     }
 
     /**
@@ -63,21 +63,22 @@ static <T> Builder<T> builder(Class<T> payloadType) {
     /**
      * A builder for a {@link HttpSignRequest}.
      */
-    interface Builder<PayloadT> extends SdkBuilder<Builder<PayloadT>, HttpSignRequest> {
+    interface Builder<PayloadT> extends SdkBuilder<Builder<PayloadT>,
+            HttpSignRequest<PayloadT>> {
 
         /**
          * Set the HTTP request object, without the request body payload.
          */
-        Builder request(SdkHttpRequest request);
+        Builder<PayloadT> request(SdkHttpRequest request);
 
         /**
          * Set the body payload of the request. A payload is optional. By default, the payload will be empty.
          */
-        Builder payload(PayloadT payload);
+        Builder<PayloadT> payload(PayloadT payload);
 
         /**
          * Set a property that the {@link HttpSigner} can use during signing.
          */
-        <T> Builder putProperty(SignerProperty<T> key, T value);
+        <T> Builder<PayloadT> putProperty(SignerProperty<T> key, T value);
     }
 }
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/HttpSigner.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/HttpSigner.java
@@ -33,13 +33,13 @@ public interface HttpSigner {
      * @param request The request to sign, with sync payload
      * @return A signed version of the input request
      */
-    SignedHttpRequest<ContentStreamProvider> sign(HttpSignRequest<? extends ContentStreamProvider> request);
+    SignedHttpRequest<? extends ContentStreamProvider> sign(HttpSignRequest<? extends ContentStreamProvider> request);
 
     /**
      * Method that takes in a request and returns a signed version of the request.
      *
      * @param request The request to sign, with async payload
      * @return A signed version of the input request
      */
-    SignedHttpRequest<Publisher<ByteBuffer>> signAsync(HttpSignRequest<? extends Publisher<? extends ByteBuffer>> request);
+    SignedHttpRequest<? extends Publisher<? extends ByteBuffer>> signAsync(HttpSignRequest<? extends Publisher<? extends ByteBuffer>> request);
 }
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/SignedHttpRequest.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/SignedHttpRequest.java
@@ -36,8 +36,8 @@ public interface SignedHttpRequest<PayloadT> {
     /**
      * Get a new builder for creating a {@link SignedHttpRequest}.
      */
-    static <T> Builder<T> builder(Class<T> payloadType) {
-        return new DefaultSignedHttpRequest.BuilderImpl(payloadType);
+    static <PayloadT> Builder<PayloadT> builder(Class<PayloadT> payloadType) {
+        return new DefaultSignedHttpRequest.BuilderImpl<>(payloadType);
     }
 
     /**
@@ -58,16 +58,17 @@ static <T> Builder<T> builder(Class<T> payloadType) {
     /**
      * A builder for a {@link SignedHttpRequest}.
      */
-    interface Builder<PayloadT> extends SdkBuilder<Builder<PayloadT>, SignedHttpRequest> {
+    interface Builder<PayloadT> extends SdkBuilder<Builder<PayloadT>,
+            SignedHttpRequest<PayloadT>> {
 
         /**
          * Set the HTTP request object, without the request body payload.
          */
-        Builder request(SdkHttpRequest request);
+        Builder<PayloadT> request(SdkHttpRequest request);
 
         /**
          * Set the body payload of the request. A payload is optional. By default, the payload will be empty.
          */
-        Builder payload(PayloadT payload);
+        Builder<PayloadT> payload(PayloadT payload);
     }
 }
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultHttpSignRequest.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultHttpSignRequest.java
@@ -51,7 +51,7 @@ public SdkHttpRequest request() {
     }
 
     @Override
-    public Optional payload() {
+    public Optional<PayloadT> payload() {
         return payload == null ? Optional.empty() : Optional.of(payload);
     }
 
@@ -81,26 +81,26 @@ public BuilderImpl(Class<PayloadT> payloadType) {
         }
 
         @Override
-        public Builder request(SdkHttpRequest request) {
+        public Builder<PayloadT> request(SdkHttpRequest request) {
             this.request = request;
             return this;
         }
 
         @Override
-        public Builder payload(PayloadT payload) {
+        public Builder<PayloadT> payload(PayloadT payload) {
             this.payload = payload;
             return this;
         }
 
         @Override
-        public <T> Builder putProperty(SignerProperty<T> key, T value) {
+        public <T> Builder<PayloadT> putProperty(SignerProperty<T> key, T value) {
             this.properties.put(key, value);
             return this;
         }
 
         @Override
-        public HttpSignRequest build() {
-            return new DefaultHttpSignRequest(this);
+        public HttpSignRequest<PayloadT> build() {
+            return new DefaultHttpSignRequest<>(this);
         }
     }
 }
diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultSignedHttpRequest.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/DefaultSignedHttpRequest.java
@@ -46,7 +46,7 @@ public SdkHttpRequest request() {
     }
 
     @Override
-    public Optional payload() {
+    public Optional<PayloadT> payload() {
         return payload == null ? Optional.empty() : Optional.of(payload);
     }
 
@@ -69,20 +69,20 @@ public BuilderImpl(Class<PayloadT> payloadType) {
         }
 
         @Override
-        public Builder request(SdkHttpRequest request) {
+        public Builder<PayloadT> request(SdkHttpRequest request) {
             this.request = request;
             return this;
         }
 
         @Override
-        public Builder payload(PayloadT payload) {
+        public Builder<PayloadT> payload(PayloadT payload) {
             this.payload = payload;
             return this;
         }
 
         @Override
-        public SignedHttpRequest build() {
-            return new DefaultSignedHttpRequest(this);
+        public SignedHttpRequest<PayloadT> build() {
+            return new DefaultSignedHttpRequest<>(this);
         }
     }
 }
diff --git a/core/http-auth/pom.xml b/core/http-auth/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>http-auth</artifactId>
     <name>AWS Java SDK :: HTTP Auth</name>
     <description>
-        The AWS SDK for Java - HTTP Auth module contains interfaces and implementations for http authentication
+        The AWS SDK for Java - HTTP Auth module contains interfaces and implementations for generic HTTP authentication
     </description>
     <url>https://aws.amazon.com/sdkforjava</url>
 
@@ -43,6 +43,11 @@
             <artifactId>http-auth-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>identity-spi</artifactId>
+            <version>${awsjavasdk.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public SdkHttpRequest request() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`@Override`
`54`		`- public Optional payload() {`
	`54`	`+ public Optional<PayloadT> payload() {`
`55`	`55`	`return payload == null ? Optional.empty() : Optional.of(payload);`
`56`	`56`	`}`
`57`	`57`
`@@ -81,26 +81,26 @@ public BuilderImpl(Class<PayloadT> payloadType) {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public Builder request(SdkHttpRequest request) {`
	`84`	`+ public Builder<PayloadT> request(SdkHttpRequest request) {`
`85`	`85`	`this.request = request;`
`86`	`86`	`return this;`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
`90`		`- public Builder payload(PayloadT payload) {`
	`90`	`+ public Builder<PayloadT> payload(PayloadT payload) {`
`91`	`91`	`this.payload = payload;`
`92`	`92`	`return this;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public <T> Builder putProperty(SignerProperty<T> key, T value) {`
	`96`	`+ public <T> Builder<PayloadT> putProperty(SignerProperty<T> key, T value) {`
`97`	`97`	`this.properties.put(key, value);`
`98`	`98`	`return this;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- public HttpSignRequest build() {`
`103`		`- return new DefaultHttpSignRequest(this);`
	`102`	`+ public HttpSignRequest<PayloadT> build() {`
	`103`	`+ return new DefaultHttpSignRequest<>(this);`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public SdkHttpRequest request() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@Override`
`49`		`- public Optional payload() {`
	`49`	`+ public Optional<PayloadT> payload() {`
`50`	`50`	`return payload == null ? Optional.empty() : Optional.of(payload);`
`51`	`51`	`}`
`52`	`52`
`@@ -69,20 +69,20 @@ public BuilderImpl(Class<PayloadT> payloadType) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- public Builder request(SdkHttpRequest request) {`
	`72`	`+ public Builder<PayloadT> request(SdkHttpRequest request) {`
`73`	`73`	`this.request = request;`
`74`	`74`	`return this;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Override`
`78`		`- public Builder payload(PayloadT payload) {`
	`78`	`+ public Builder<PayloadT> payload(PayloadT payload) {`
`79`	`79`	`this.payload = payload;`
`80`	`80`	`return this;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public SignedHttpRequest build() {`
`85`		`- return new DefaultSignedHttpRequest(this);`
	`84`	`+ public SignedHttpRequest<PayloadT> build() {`
	`85`	`+ return new DefaultSignedHttpRequest<>(this);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`