Merge pull request #760 from aws/staging/58b3f082-0e5e-44f5-91e7-a4da49e11238

Pull request: release <- staging/58b3f082-0e5e-44f5-91e7-a4da49e11238

Author: aws-sdk-java-automation

.changes/2.10.90.json

@@ -0,0 +1,16 @@
+{
+    "version": "2.10.90",
+    "date": "2020-03-19",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Outposts",
+            "description": "Documentation updates for AWS Outposts."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Certificate Manager",
+            "description": "AWS Certificate Manager documentation updated on API calls ImportCertificate and ListCertificate. Specific updates included input constraints, private key size for import and next token size for list."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,12 @@
+# __2.10.90__ __2020-03-19__
+## __AWS Certificate Manager__
+  - ### Features
+    - AWS Certificate Manager documentation updated on API calls ImportCertificate and ListCertificate. Specific updates included input constraints, private key size for import and next token size for list.
+
+## __AWS Outposts__
+  - ### Features
+    - Documentation updates for AWS Outposts.
+
 # __2.10.89__ __2020-03-18__
 ## __AWS MediaConnect__
   - ### Features

README.md

@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.10.89</version>
+      <version>2.10.90</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.10.89</version>
+  <version>2.10.90</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.10.89</version>
+  <version>2.10.90</version>
 </dependency>
 ```
 
@@ -99,7 +99,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.10.89</version>
+  <version>2.10.90</version>
 </dependency>
 ```
 

aws-sdk-java/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/poet/paginators/SyncResponseClassSpec.java

@@ -180,8 +180,9 @@ private MethodSpec getMethodsSpecForSingleResultKey(String resultKey) {
                                                                                       resultKeyType)))
                          .addCode(getIteratorLambdaBlock(resultKey, resultKeyModel))
                          .addCode("\n")
-                         .addStatement("return $T.builder().pagesIterable(this).itemIteratorFunction(getIterator).build()",
-                                       PaginatedItemsIterable.class)
+                         .addStatement("return $T.<$T, $T>builder().pagesIterable(this).itemIteratorFunction(getIterator).build"
+                                       + "()",
+                                       PaginatedItemsIterable.class, responseType(), resultKeyType)
                          .addJavadoc(CodeBlock.builder()
                                               .add("Returns an iterable to iterate through the paginated {@link $T#$L()} member."
                                                    + " The returned iterable is used to iterate through the results across all "

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyIterable.java

@@ -104,7 +104,8 @@ public final SdkIterable<SimpleStruct> items() {
             }
             return Collections.emptyIterator();
         };
-        return PaginatedItemsIterable.builder().pagesIterable(this).itemIteratorFunction(getIterator).build();
+        return PaginatedItemsIterable.<PaginatedOperationWithResultKeyResponse, SimpleStruct> builder().pagesIterable(this)
+                                                                                                       .itemIteratorFunction(getIterator).build();
     }
 
     private class PaginatedOperationWithResultKeyResponseFetcher implements

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/customizations/SameTokenPaginationApiIterable.java

@@ -99,7 +99,8 @@ public final SdkIterable<SimpleStruct> items() {
             }
             return Collections.emptyIterator();
         };
-        return PaginatedItemsIterable.builder().pagesIterable(this).itemIteratorFunction(getIterator).build();
+        return PaginatedItemsIterable.<SameTokenPaginationApiResponse, SimpleStruct> builder().pagesIterable(this)
+                                                                                              .itemIteratorFunction(getIterator).build();
     }
 
     private class SameTokenPaginationApiResponseFetcher implements SyncPageFetcher<SameTokenPaginationApiResponse> {

core/annotations/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/auth/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>profiles</artifactId>

core/protocols/aws-cbor-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-ion-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-query-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-xml-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/protocol-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/regions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>regions</artifactId>

core/sdk-core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

core/sdk-core/src/main/java/software/amazon/awssdk/core/pagination/sync/PaginatedItemsIterable.java

@@ -34,13 +34,13 @@ public final class PaginatedItemsIterable<ResponseT, ItemT> implements SdkIterab
     private final SdkIterable<ResponseT> pagesIterable;
     private final Function<ResponseT, Iterator<ItemT>> getItemIterator;
 
-    private PaginatedItemsIterable(BuilderImpl builder) {
+    private PaginatedItemsIterable(BuilderImpl<ResponseT, ItemT> builder) {
         this.pagesIterable = builder.pagesIterable;
         this.getItemIterator = builder.itemIteratorFunction;
     }
 
-    public static Builder builder() {
-        return new BuilderImpl();
+    public static <R, T> Builder<R, T> builder() {
+        return new BuilderImpl<>();
     }
 
     @Override
@@ -86,33 +86,36 @@ private boolean hasMoreItems() {
         }
     }
 
-    public interface Builder {
-        Builder pagesIterable(SdkIterable sdkIterable);
+    public interface Builder<ResponseT, ItemT> {
+        Builder<ResponseT, ItemT> pagesIterable(SdkIterable<ResponseT> sdkIterable);
 
-        Builder itemIteratorFunction(Function itemIteratorFunction);
+        Builder<ResponseT, ItemT> itemIteratorFunction(Function<ResponseT, Iterator<ItemT>> itemIteratorFunction);
 
-        PaginatedItemsIterable build();
+        PaginatedItemsIterable<ResponseT, ItemT> build();
     }
 
-    private static final class BuilderImpl implements Builder {
-        private SdkIterable pagesIterable;
-        private Function itemIteratorFunction;
+    private static final class BuilderImpl<ResponseT, ItemT> implements Builder<ResponseT, ItemT> {
+        private SdkIterable<ResponseT> pagesIterable;
+        private Function<ResponseT, Iterator<ItemT>> itemIteratorFunction;
+
+        private BuilderImpl() {
+        }
 
         @Override
-        public Builder pagesIterable(SdkIterable pagesIterable) {
+        public Builder<ResponseT, ItemT> pagesIterable(SdkIterable<ResponseT> pagesIterable) {
             this.pagesIterable = pagesIterable;
             return this;
         }
 
         @Override
-        public Builder itemIteratorFunction(Function itemIteratorFunction) {
+        public Builder<ResponseT, ItemT> itemIteratorFunction(Function<ResponseT, Iterator<ItemT>> itemIteratorFunction) {
             this.itemIteratorFunction = itemIteratorFunction;
             return this;
         }
 
         @Override
-        public PaginatedItemsIterable build() {
-            return new PaginatedItemsIterable(this);
+        public PaginatedItemsIterable<ResponseT, ItemT> build() {
+            return new PaginatedItemsIterable<>(this);
         }
     }
 }

http-client-spi/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>

http-clients/apache-client/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
 
     <artifactId>apache-client</artifactId>

http-clients/netty-nio-client/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.89</version>
+        <version>2.10.90</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>