Merge branch 'master' into shorea-backpressure-bug

Author: shorea

.changes/2.0.0-preview-2.json

@@ -5,7 +5,7 @@
         {
             "category": "AWS SDK for Java v2",
             "type": "feature",
-            "description": "Substantial improvments to start up time and cold start latencies"
+            "description": "Substantial improvements to start up time and cold start latencies"
         },
         {
             "category": "AWS SDK for Java v2",

.changes/2.0.0-preview-4.json

@@ -35,7 +35,7 @@
         {
             "category": "AWS SDK for Java v2",
             "type": "bugfix",
-            "description": "Many improvments and fixes to the Netty NIO based transport."
+            "description": "Many improvements and fixes to the Netty NIO based transport."
         },
         {
             "category": "AWS SDK for Java v2",

.changes/next-release/bugfix-AWSSDKforJavav2-b093be5.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "bugfix", 
+    "description": "RetryPolicy bug fix: adding throttlingBackoffStrategy to `RetryPolicy.Builder`. see [#646](https://github.com/aws/aws-sdk-java-v2/issues/646)"
+}

.changes/next-release/feature-AWSSDKforJavav2-0b114ac.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Replacing legacy `HttpResponse` with `SdkHttpFullResponse`."
+}

CHANGELOG.md

@@ -306,7 +306,7 @@
 
   - ### Bugfixes
     - Fixed a bug in default credential provider chain where it would erroneously abort at the ProfileCredentialsProvider. See [Issue #135](https://github.com/aws/aws-sdk-java-v2/issues/135)
-    - Many improvments and fixes to the Netty NIO based transport.
+    - Many improvements and fixes to the Netty NIO based transport.
     - Several fixes around S3's endpoint resolution, particularly with advanced options like path style addressing and accelerate mode. See [Issue #130](https://github.com/aws/aws-sdk-java-v2/issues/130)
     - Several fixes around serialization and deserialization of immutable objects. See [Issue #122](https://github.com/aws/aws-sdk-java-v2/issues/122)
     - Type parameters are now correctly included for [StreamingResponseHandler](https://github.com/aws/aws-sdk-java-v2/blob/master/core/src/main/java/software/amazon/awssdk/sync/StreamingResponseHandler.java) on the client interface.
@@ -321,7 +321,7 @@
   - ### Features
     - New pluggable HTTP implementation built on top of Java's HttpUrlConnection. Good choice for simple applications with low throughput requirements. Better cold start latency than the default Apache implementation.
     - Simple convenience methods have been added for operations that require no input parameters.
-    - Substantial improvments to start up time and cold start latencies
+    - Substantial improvements to start up time and cold start latencies
     - The Netty NIO HTTP client now uses a shared event loop group for better resource management. More options for customizing the event loop group are now available.
     - Using java.time instead of the legacy java.util.Date in generated model classes.
     - Various improvements to the immutability of model POJOs. ByteBuffers are now copied and collections are returned as unmodifiable.

codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java

@@ -16,15 +16,13 @@
 package software.amazon.awssdk.codegen;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import software.amazon.awssdk.codegen.internal.Utils;
 import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
-import software.amazon.awssdk.codegen.model.service.ErrorMap;
 import software.amazon.awssdk.codegen.model.service.ErrorTrait;
-import software.amazon.awssdk.codegen.model.service.Operation;
+import software.amazon.awssdk.codegen.model.service.Shape;
 
 /**
  * Constructs the exception shapes for the intermediate model. Analyzes the operations in the
@@ -46,28 +44,21 @@ private Map<String, ShapeModel> constructExceptionShapes() {
         // Java shape models, to be constructed
         final Map<String, ShapeModel> javaShapes = new HashMap<String, ShapeModel>();
 
-        for (Map.Entry<String, Operation> entry : getServiceModel().getOperations().entrySet()) {
+        for (Map.Entry<String, Shape> shape : getServiceModel().getShapes().entrySet()) {
+            if (shape.getValue().isException()) {
+                String errorShapeName = shape.getKey();
+                String javaClassName = getNamingStrategy().getExceptionName(errorShapeName);
 
-            Operation operation = entry.getValue();
-            List<ErrorMap> operationErrors = operation.getErrors();
+                ShapeModel exceptionShapeModel = generateShapeModel(javaClassName,
+                                                                    errorShapeName);
 
-            if (operationErrors != null) {
-                for (ErrorMap error : operationErrors) {
-
-                    String errorShapeName = error.getShape();
-                    String javaClassName = getNamingStrategy().getExceptionName(errorShapeName);
-
-                    ShapeModel exceptionShapeModel = generateShapeModel(javaClassName,
-                                                                        errorShapeName);
-
-                    exceptionShapeModel.setType(ShapeType.Exception.getValue());
-                    exceptionShapeModel.setErrorCode(getErrorCode(errorShapeName));
-                    if (exceptionShapeModel.getDocumentation() == null) {
-                        exceptionShapeModel.setDocumentation(error.getDocumentation());
-                    }
-
-                    javaShapes.put(javaClassName, exceptionShapeModel);
+                exceptionShapeModel.setType(ShapeType.Exception.getValue());
+                exceptionShapeModel.setErrorCode(getErrorCode(errorShapeName));
+                if (exceptionShapeModel.getDocumentation() == null) {
+                    exceptionShapeModel.setDocumentation(shape.getValue().getDocumentation());
                 }
+
+                javaShapes.put(javaClassName, exceptionShapeModel);
             }
         }
 

codegen/src/main/java/software/amazon/awssdk/codegen/docs/DocumentationBuilder.java

@@ -208,7 +208,7 @@ public DocumentationBuilder see(String seeLink, Object... formatArgs) {
     }
 
     /**
-     * Builds the Javadoc string with the current configuraton.
+     * Builds the Javadoc string with the current configuration.
      *
      * @return Formatted Javadoc string.
      */

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

@@ -30,7 +30,6 @@
 import java.util.stream.Collectors;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.awscore.eventstream.EventStreamAsyncResponseTransformer;
-import software.amazon.awssdk.awscore.eventstream.EventStreamExceptionJsonUnmarshaller;
 import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonUnmarshaller;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.awscore.internal.protocol.json.AwsJsonProtocol;
@@ -158,19 +157,6 @@ public CodeBlock responseHandler(IntermediateModel model, OperationModel opModel
                             });
             builder.add(".defaultUnmarshaller((in) -> $T.UNKNOWN)\n"
                         + ".build());\n", eventStreamUtils.eventStreamBaseClass());
-
-            builder.add("\n\n$T<$T> exceptionHandler = $L.createResponseHandler(\n" +
-                        "    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),\n" +
-                        "    $T.builder()\n" +
-                        "        .defaultUnmarshaller(x -> $T.populateDefaultException($T::builder, x))\n" +
-                        "        .build());",
-                        HttpResponseHandler.class,
-                        WildcardTypeName.subtypeOf(Throwable.class),
-                        protocolFactory,
-                        EventStreamExceptionJsonUnmarshaller.class,
-                        EventStreamExceptionJsonUnmarshaller.class,
-                        baseExceptionClassName(model));
-
         }
         return builder.build();
     }
@@ -237,9 +223,10 @@ public CodeBlock asyncExecutionHandler(OperationModel opModel) {
                         "     .eventStreamResponseHandler(asyncResponseHandler)\n"
                         + "   .eventResponseHandler(eventResponseHandler)\n"
                         + "   .initialResponseHandler(responseHandler)\n"
-                        + "   .exceptionResponseHandler(exceptionHandler)\n"
+                        + "   .exceptionResponseHandler(errorResponseHandler)\n"
                         + "   .future(future)\n"
                         + "   .executor(executor)\n"
+                        + "   .serviceName(serviceName())\n"
                         + "   .build();",
                         transformerType,
                         ClassName.get(EventStreamAsyncResponseTransformer.class),

codegen/src/main/resources/templates/json/ModelJsonUnmarshaller.ftl

@@ -43,7 +43,7 @@ public class ${shape.shapeName}Unmarshaller implements Unmarshaller<${shape.shap
 <#if shape.hasStatusCodeMember >
     <#list shape.members as memberModel>
         <#if memberModel.http.isStatusCode() >
-        ${shape.variable.variableName}Builder.${memberModel.fluentSetterMethodName}(context.getHttpResponse().getStatusCode());
+        ${shape.variable.variableName}Builder.${memberModel.fluentSetterMethodName}(context.getHttpResponse().statusCode());
         </#if>
     </#list>
 </#if>
@@ -53,7 +53,7 @@ public class ${shape.shapeName}Unmarshaller implements Unmarshaller<${shape.shap
     <#if explicitPayloadMember.http.isStreaming>
         <#-- Intentionally left blank, streaming handled by SyncResponseHandler -->
     <#elseif explicitPayloadMember.variable.variableType == "software.amazon.awssdk.core.SdkBytes">
-        java.io.InputStream is = context.getHttpResponse().getContent();
+        java.io.InputStream is = context.getHttpResponse().content().orElse(null);
         if(is != null) {
             try {
                 ${shape.variable.variableName}Builder.${explicitPayloadMember.fluentSetterMethodName}(software.amazon.awssdk.core.SdkBytes.fromInputStream(is));

codegen/src/main/resources/templates/query/ModelStaxUnmarshaller.ftl

@@ -85,7 +85,7 @@ public class ${shape.shapeName}Unmarshaller implements Unmarshaller<${shape.shap
 <#if shape.hasStatusCodeMember >
     <#list shape.members as memberModel>
         <#if memberModel.http.isStatusCode() >
-        ${shape.variable.variableName}.${memberModel.fluentSetterMethodName}(context.getHttpResponse().getStatusCode());
+        ${shape.variable.variableName}.${memberModel.fluentSetterMethodName}(context.getHttpResponse().statusCode());
         </#if>
 
         <#if !memberModel.http.location?? || memberModel.http.location != "headers">

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java

@@ -12,7 +12,6 @@
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
 import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
 import software.amazon.awssdk.awscore.eventstream.EventStreamAsyncResponseTransformer;
-import software.amazon.awssdk.awscore.eventstream.EventStreamExceptionJsonUnmarshaller;
 import software.amazon.awssdk.awscore.eventstream.EventStreamTaggedUnionJsonUnmarshaller;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.awscore.internal.protocol.json.AwsJsonProtocol;
@@ -44,7 +43,6 @@
 import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersRequest;
 import software.amazon.awssdk.services.json.model.GetWithoutRequiredMembersResponse;
 import software.amazon.awssdk.services.json.model.InvalidInputException;
-import software.amazon.awssdk.services.json.model.JsonException;
 import software.amazon.awssdk.services.json.model.JsonRequest;
 import software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyRequest;
 import software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse;
@@ -227,21 +225,13 @@ public CompletableFuture<Void> eventStreamOperation(EventStreamOperationRequest
                                                       .addUnmarshaller("EventTwo", EventTwoUnmarshaller.getInstance())
                                                       .defaultUnmarshaller((in) -> EventStream.UNKNOWN).build());
 
-            HttpResponseHandler<? extends Throwable> exceptionHandler = jsonProtocolFactory
-                .createResponseHandler(
-                    new JsonOperationMetadata().withPayloadJson(true).withHasStreamingSuccessResponse(false),
-                    EventStreamExceptionJsonUnmarshaller
-                        .builder()
-                        .defaultUnmarshaller(
-                            x -> EventStreamExceptionJsonUnmarshaller.populateDefaultException(
-                                JsonException::builder, x)).build());
-
             HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(jsonProtocolFactory);
             CompletableFuture<Void> future = new CompletableFuture<>();
             EventStreamAsyncResponseTransformer<EventStreamOperationResponse, EventStream> asyncResponseTransformer = EventStreamAsyncResponseTransformer
                 .<EventStreamOperationResponse, EventStream> builder().eventStreamResponseHandler(asyncResponseHandler)
                                                                       .eventResponseHandler(eventResponseHandler).initialResponseHandler(responseHandler)
-                                                                      .exceptionResponseHandler(exceptionHandler).future(future).executor(executor).build();
+                                                                      .exceptionResponseHandler(errorResponseHandler).future(future).executor(executor).serviceName(serviceName())
+                                                                      .build();
 
             clientHandler.execute(
                 new ClientExecutionParams<EventStreamOperationRequest, SdkResponse>()

core/auth/src/main/java/software/amazon/awssdk/auth/credentials/ContainerCredentialsProvider.java

@@ -134,7 +134,7 @@ private URI createGenericContainerUrl() {
             if (!ALLOWED_HOSTS.contains(uri.getHost())) {
 
                 throw SdkClientException.builder()
-                                        .message(String.format("The full URI (%s) contained withing environment " +
+                                        .message(String.format("The full URI (%s) contained within environment " +
                                                  "variable %s has an invalid host. Host can only be one of [%s].",
                                                  uri,
                                                  SdkSystemSetting.AWS_CONTAINER_CREDENTIALS_FULL_URI
@@ -178,4 +178,4 @@ public ContainerCredentialsProvider build() {
             return new ContainerCredentialsProvider(this);
         }
     }
-}
+}