Merge branch 'master' into h2

shorea · shorea · commit e9cbcba8c1d0 · 2018-08-06T18:15:23.000-07:00
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml
@@ -27,8 +27,6 @@
     <suppress checks=".*"
               files=".(flow)[\\/].+\.java$"/>
 
-
-
     <!-- ignore missing annotation checks under test/codegen directory -->
     <suppress checks="MissingSdkAnnotationCheck"
               files=".(codegen|test)[\\/].+\.java$"/>
@@ -41,13 +39,10 @@
     <suppress checks=".*"
               files=".*BetterFixedChannelPool\.java$"/>
 
+    <!-- TODO want to contribute this back to Netty -->
     <suppress checks=".*"
               files=".*[\\/]io[\\/]netty[\\/]handler[\\/]codec[\\/]http2[\\/].*\.java$"/>
 
-    <!-- Kinesis has some generated code in source for H2 which fails checkstyle -->
-    <suppress checks=".*"
-              files=".*[\\/]software/amazon/awssdk/services/kinesis[\\/].+\.java$"/>
-
     <!-- Assumes getter/setter match JSON property -->
     <suppress checks="AbbreviationAsWordInName"
               files=".*[\\/]software[\\/]amazon[\\/]awssdk[\\/]services[\\/]s3[\\/]event[\\/]S3EventNotification.java$"/>
diff --git a/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml b/build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml
@@ -61,13 +61,6 @@
         <Bug pattern="URF_UNREAD_FIELD,DLS_DEAD_LOCAL_STORE,REC_CATCH_EXCEPTION" />
     </Match>
 
-    <!-- NP_NONNULL_PARAM_VIOLATION false postive - https://github.com/spotbugs/spotbugs/issues/484 -->
-    <Match>
-        <Class name="software.amazon.awssdk.core.async.internal.SequentialSubscriber" />
-        <Method name="onComplete" />
-        <Bug pattern="NP_NONNULL_PARAM_VIOLATION" />
-    </Match>
-
     <!-- False positive -->
     <Match>
         <Class name="software.amazon.awssdk.core.ResponseBytes" />
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
@@ -88,7 +88,6 @@ public TypeSpec poetSpec() {
         if (model.hasPaginators()) {
             classBuilder.addMethod(applyPaginatorUserAgentMethod(poetExtensions, model));
         }
-
         protocolSpec.createErrorResponseHandler().ifPresent(classBuilder::addMethod);
 
         return classBuilder.build();
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyPublisher.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithResultKeyPublisher.java
@@ -81,12 +81,12 @@ public class PaginatedOperationWithResultKeyPublisher implements SdkPublisher<Pa
     private boolean isLastPage;
 
     public PaginatedOperationWithResultKeyPublisher(JsonProtocolTestsAsyncClient client,
-            PaginatedOperationWithResultKeyRequest firstRequest) {
+                                                    PaginatedOperationWithResultKeyRequest firstRequest) {
         this(client, firstRequest, false);
     }
 
     private PaginatedOperationWithResultKeyPublisher(JsonProtocolTestsAsyncClient client,
-            PaginatedOperationWithResultKeyRequest firstRequest, boolean isLastPage) {
+                                                     PaginatedOperationWithResultKeyRequest firstRequest, boolean isLastPage) {
         this.client = client;
         this.firstRequest = firstRequest;
         this.isLastPage = isLastPage;
@@ -111,7 +111,7 @@ public final SdkPublisher<SimpleStruct> items() {
             return Collections.emptyIterator();
         };
         return PaginatedItemsPublisher.builder().nextPageFetcher(new PaginatedOperationWithResultKeyResponseFetcher())
-                .iteratorFunction(getIterator).isLastPage(isLastPage).build();
+                                      .iteratorFunction(getIterator).isLastPage(isLastPage).build();
     }
 
     /**
@@ -124,7 +124,7 @@ public final SdkPublisher<SimpleStruct> items() {
     private final PaginatedOperationWithResultKeyPublisher resume(PaginatedOperationWithResultKeyResponse lastSuccessfulPage) {
         if (nextPageFetcher.hasNextPage(lastSuccessfulPage)) {
             return new PaginatedOperationWithResultKeyPublisher(client, firstRequest.toBuilder()
-                    .nextToken(lastSuccessfulPage.nextToken()).build());
+                                                                                    .nextToken(lastSuccessfulPage.nextToken()).build());
         }
         return new PaginatedOperationWithResultKeyPublisher(client, firstRequest, true) {
             @Override
@@ -135,16 +135,16 @@ public void subscribe(Subscriber<? super PaginatedOperationWithResultKeyResponse
     }
 
     private class PaginatedOperationWithResultKeyResponseFetcher implements
-            AsyncPageFetcher<PaginatedOperationWithResultKeyResponse> {
+                                                                 AsyncPageFetcher<PaginatedOperationWithResultKeyResponse> {
         @Override
         public boolean hasNextPage(final PaginatedOperationWithResultKeyResponse previousPage) {
             return previousPage.nextToken() != null && !SdkAutoConstructList.class.isInstance(previousPage.nextToken())
-                    && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());
+                   && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());
         }
 
         @Override
         public CompletableFuture<PaginatedOperationWithResultKeyResponse> nextPage(
-                final PaginatedOperationWithResultKeyResponse previousPage) {
+            final PaginatedOperationWithResultKeyResponse previousPage) {
             if (previousPage == null) {
                 return client.paginatedOperationWithResultKey(firstRequest);
             }
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithoutResultKeyPublisher.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/paginators/PaginatedOperationWithoutResultKeyPublisher.java
@@ -76,12 +76,12 @@ public class PaginatedOperationWithoutResultKeyPublisher implements SdkPublisher
     private boolean isLastPage;
 
     public PaginatedOperationWithoutResultKeyPublisher(JsonProtocolTestsAsyncClient client,
-            PaginatedOperationWithoutResultKeyRequest firstRequest) {
+                                                       PaginatedOperationWithoutResultKeyRequest firstRequest) {
         this(client, firstRequest, false);
     }
 
     private PaginatedOperationWithoutResultKeyPublisher(JsonProtocolTestsAsyncClient client,
-            PaginatedOperationWithoutResultKeyRequest firstRequest, boolean isLastPage) {
+                                                        PaginatedOperationWithoutResultKeyRequest firstRequest, boolean isLastPage) {
         this.client = client;
         this.firstRequest = firstRequest;
         this.isLastPage = isLastPage;
@@ -103,7 +103,7 @@ public void subscribe(Subscriber<? super PaginatedOperationWithoutResultKeyRespo
     private final PaginatedOperationWithoutResultKeyPublisher resume(PaginatedOperationWithoutResultKeyResponse lastSuccessfulPage) {
         if (nextPageFetcher.hasNextPage(lastSuccessfulPage)) {
             return new PaginatedOperationWithoutResultKeyPublisher(client, firstRequest.toBuilder()
-                    .nextToken(lastSuccessfulPage.nextToken()).build());
+                                                                                       .nextToken(lastSuccessfulPage.nextToken()).build());
         }
         return new PaginatedOperationWithoutResultKeyPublisher(client, firstRequest, true) {
             @Override
@@ -114,21 +114,21 @@ public void subscribe(Subscriber<? super PaginatedOperationWithoutResultKeyRespo
     }
 
     private class PaginatedOperationWithoutResultKeyResponseFetcher implements
-            AsyncPageFetcher<PaginatedOperationWithoutResultKeyResponse> {
+                                                                    AsyncPageFetcher<PaginatedOperationWithoutResultKeyResponse> {
         @Override
         public boolean hasNextPage(final PaginatedOperationWithoutResultKeyResponse previousPage) {
             return previousPage.nextToken() != null && !SdkAutoConstructList.class.isInstance(previousPage.nextToken())
-                    && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());
+                   && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());
         }
 
         @Override
         public CompletableFuture<PaginatedOperationWithoutResultKeyResponse> nextPage(
-                final PaginatedOperationWithoutResultKeyResponse previousPage) {
+            final PaginatedOperationWithoutResultKeyResponse previousPage) {
             if (previousPage == null) {
                 return client.paginatedOperationWithoutResultKey(firstRequest);
             }
             return client
-                    .paginatedOperationWithoutResultKey(firstRequest.toBuilder().nextToken(previousPage.nextToken()).build());
+                .paginatedOperationWithoutResultKey(firstRequest.toBuilder().nextToken(previousPage.nextToken()).build());
         }
     }
 }
diff --git a/core/sdk-core/build.properties b/core/sdk-core/build.properties
diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/json/SdkJsonProtocolFactory.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/json/SdkJsonProtocolFactory.java
@@ -52,7 +52,8 @@ protected StructuredJsonGenerator createGenerator(OperationInfo operationInfo) {
         }
     }
 
-    private StructuredJsonGenerator createGenerator() {
+    @SdkTestInternalApi
+    StructuredJsonGenerator createGenerator() {
         return JSON_FACTORY.createWriter(CONTENT_TYPE);
     }
 
diff --git a/services/kinesis/src/main/resources/codegen-resources/customization.config b/services/kinesis/src/main/resources/codegen-resources/customization.config
@@ -6,7 +6,6 @@
         "protocol": "cbor"
     },
     "skipSmokeTests": "true",
-    "skipSyncClientGeneration": true,
     "blacklistedSimpleMethods": ["deregisterStreamConsumer", "describeStreamConsumer", "listShards"],
-     "customRetryPolicy" : "software.amazon.awssdk.services.kinesis.KinesisRetryPolicy"
+    "customRetryPolicy" : "software.amazon.awssdk.services.kinesis.KinesisRetryPolicy"
 }
diff --git a/services/pom.xml b/services/pom.xml
@@ -88,7 +88,6 @@
         <module>iot</module>
         <module>iotdata</module>
         <module>kinesis</module>
-        <!-- <module>kinesis-bundle</module> -->
         <module>kinesisanalytics</module>
         <module>kinesisfirehose</module>
         <module>kms</module>
diff --git a/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java b/test/protocol-tests/src/test/java/software/amazon/awssdk/protocol/tests/ExecutionInterceptorTest.java
@@ -54,12 +54,12 @@
 import software.amazon.awssdk.core.SdkResponse;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.exception.SdkServiceException;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
-import software.amazon.awssdk.core.async.SdkPublisher;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
diff --git a/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java b/utils/src/main/java/software/amazon/awssdk/utils/async/SequentialSubscriber.java
@@ -58,9 +58,6 @@ public void onError(Throwable t) {
 
     @Override
     public void onComplete() {
-        // TODO Update spotbugs version when new version is released and remove this filter the spotbugs-suppressions.xml file
-        // SpotBugs incorrectly reports NP_NONNULL_PARAM_VIOLATION when passing null. The fix is not released yet
-        // https://github.com/spotbugs/spotbugs/issues/484
         future.complete(null);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ public TypeSpec poetSpec() {`
`88`	`88`	`if (model.hasPaginators()) {`
`89`	`89`	`classBuilder.addMethod(applyPaginatorUserAgentMethod(poetExtensions, model));`
`90`	`90`	`}`
`91`		`-`
`92`	`91`	`protocolSpec.createErrorResponseHandler().ifPresent(classBuilder::addMethod);`
`93`	`92`
`94`	`93`	`return classBuilder.build();`
Original file line number	Diff line number	Diff line change
`@@ -76,12 +76,12 @@ public class PaginatedOperationWithoutResultKeyPublisher implements SdkPublisher`
`76`	`76`	`private boolean isLastPage;`
`77`	`77`
`78`	`78`	`public PaginatedOperationWithoutResultKeyPublisher(JsonProtocolTestsAsyncClient client,`
`79`		`- PaginatedOperationWithoutResultKeyRequest firstRequest) {`
	`79`	`+ PaginatedOperationWithoutResultKeyRequest firstRequest) {`
`80`	`80`	`this(client, firstRequest, false);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`private PaginatedOperationWithoutResultKeyPublisher(JsonProtocolTestsAsyncClient client,`
`84`		`- PaginatedOperationWithoutResultKeyRequest firstRequest, boolean isLastPage) {`
	`84`	`+ PaginatedOperationWithoutResultKeyRequest firstRequest, boolean isLastPage) {`
`85`	`85`	`this.client = client;`
`86`	`86`	`this.firstRequest = firstRequest;`
`87`	`87`	`this.isLastPage = isLastPage;`
`@@ -103,7 +103,7 @@ public void subscribe(Subscriber<? super PaginatedOperationWithoutResultKeyRespo`
`103`	`103`	`private final PaginatedOperationWithoutResultKeyPublisher resume(PaginatedOperationWithoutResultKeyResponse lastSuccessfulPage) {`
`104`	`104`	`if (nextPageFetcher.hasNextPage(lastSuccessfulPage)) {`
`105`	`105`	`return new PaginatedOperationWithoutResultKeyPublisher(client, firstRequest.toBuilder()`
`106`		`- .nextToken(lastSuccessfulPage.nextToken()).build());`
	`106`	`+ .nextToken(lastSuccessfulPage.nextToken()).build());`
`107`	`107`	`}`
`108`	`108`	`return new PaginatedOperationWithoutResultKeyPublisher(client, firstRequest, true) {`
`109`	`109`	`@Override`
`@@ -114,21 +114,21 @@ public void subscribe(Subscriber<? super PaginatedOperationWithoutResultKeyRespo`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`private class PaginatedOperationWithoutResultKeyResponseFetcher implements`
`117`		`- AsyncPageFetcher<PaginatedOperationWithoutResultKeyResponse> {`
	`117`	`+ AsyncPageFetcher<PaginatedOperationWithoutResultKeyResponse> {`
`118`	`118`	`@Override`
`119`	`119`	`public boolean hasNextPage(final PaginatedOperationWithoutResultKeyResponse previousPage) {`
`120`	`120`	`return previousPage.nextToken() != null && !SdkAutoConstructList.class.isInstance(previousPage.nextToken())`
`121`		`- && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());`
	`121`	`+ && !SdkAutoConstructMap.class.isInstance(previousPage.nextToken());`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`@Override`
`125`	`125`	`public CompletableFuture<PaginatedOperationWithoutResultKeyResponse> nextPage(`
`126`		`- final PaginatedOperationWithoutResultKeyResponse previousPage) {`
	`126`	`+ final PaginatedOperationWithoutResultKeyResponse previousPage) {`
`127`	`127`	`if (previousPage == null) {`
`128`	`128`	`return client.paginatedOperationWithoutResultKey(firstRequest);`
`129`	`129`	`}`
`130`	`130`	`return client`
`131`		`- .paginatedOperationWithoutResultKey(firstRequest.toBuilder().nextToken(previousPage.nextToken()).build());`
	`131`	`+ .paginatedOperationWithoutResultKey(firstRequest.toBuilder().nextToken(previousPage.nextToken()).build());`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ protected StructuredJsonGenerator createGenerator(OperationInfo operationInfo) {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- private StructuredJsonGenerator createGenerator() {`
	`55`	`+ @SdkTestInternalApi`
	`56`	`+ StructuredJsonGenerator createGenerator() {`
`56`	`57`	`return JSON_FACTORY.createWriter(CONTENT_TYPE);`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`"protocol": "cbor"`
`7`	`7`	`},`
`8`	`8`	`"skipSmokeTests": "true",`
`9`		`- "skipSyncClientGeneration": true,`
`10`	`9`	`"blacklistedSimpleMethods": ["deregisterStreamConsumer", "describeStreamConsumer", "listShards"],`
`11`		`- "customRetryPolicy" : "software.amazon.awssdk.services.kinesis.KinesisRetryPolicy"`
	`10`	`+ "customRetryPolicy" : "software.amazon.awssdk.services.kinesis.KinesisRetryPolicy"`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,6 @@ public void onError(Throwable t) {`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`public void onComplete() {`
`61`		`- // TODO Update spotbugs version when new version is released and remove this filter the spotbugs-suppressions.xml file`
`62`		`- // SpotBugs incorrectly reports NP_NONNULL_PARAM_VIOLATION when passing null. The fix is not released yet`
`63`		`- // https://github.com/spotbugs/spotbugs/issues/484`
`64`	`61`	`future.complete(null);`
`65`	`62`	`}`
`66`	`63`	`}`