Fix checkstyle errors, add stability tests

zoewangg · zoewangg · commit c4a065336927 · 2021-03-19T10:28:36.000-07:00
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClient.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClient.java
@@ -17,7 +17,7 @@
 
 import software.amazon.awssdk.annotations.SdkPreviewApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.services.s3.internal.DefaultS3CrtClientBuilder;
+import software.amazon.awssdk.services.s3.internal.s3crt.DefaultS3CrtClientBuilder;
 
 /**
  * Service client for accessing Amazon S3 asynchronously using the AWS Common Runtime S3 client. This can be created using the
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/CrtResponseDataConsumerAdapter.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/CrtResponseDataConsumerAdapter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 import com.amazonaws.s3.ResponseDataConsumer;
 import com.amazonaws.s3.model.GetObjectOutput;
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/DefaultS3CrtAsyncClient.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/DefaultS3CrtAsyncClient.java
@@ -13,23 +13,22 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 
-import static software.amazon.awssdk.services.s3.internal.S3CrtUtils.createCrtCredentialsProvider;
+import static software.amazon.awssdk.services.s3.internal.s3crt.S3CrtUtils.createCrtCredentialsProvider;
 
 import com.amazonaws.s3.RequestDataSupplier;
 import com.amazonaws.s3.S3NativeClient;
+import com.amazonaws.s3.model.PutObjectOutput;
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider;
 import software.amazon.awssdk.services.s3.S3CrtAsyncClient;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
-import com.amazonaws.s3.model.PutObjectOutput;
-import software.amazon.awssdk.core.async.AsyncRequestBody;
-import software.amazon.awssdk.services.s3.internal.s3crt.RequestDataSupplierAdapter;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
 
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/DefaultS3CrtClientBuilder.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/DefaultS3CrtClientBuilder.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 import java.net.URI;
 import java.util.function.Consumer;
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/RequestDataSupplierAdapter.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/RequestDataSupplierAdapter.java
@@ -36,11 +36,11 @@
  */
 @SdkInternalApi
 public final class RequestDataSupplierAdapter implements RequestDataSupplier {
-    private static final Logger LOG = Logger.loggerFor(RequestDataSupplierAdapter.class);
-
     static final long DEFAULT_REQUEST_SIZE = 8;
+    private static final Logger LOG = Logger.loggerFor(RequestDataSupplierAdapter.class);
 
-    private final AtomicReference<SubscriptionStatus> subscriptionStatus = new AtomicReference<>(SubscriptionStatus.NOT_SUBSCRIBED);
+    private final AtomicReference<SubscriptionStatus> subscriptionStatus =
+        new AtomicReference<>(SubscriptionStatus.NOT_SUBSCRIBED);
     private final BlockingQueue<Subscription> subscriptionQueue = new LinkedBlockingQueue<>(1);
     private final BlockingDeque<Event> eventBuffer = new LinkedBlockingDeque<>();
 
@@ -189,7 +189,7 @@ static class SubscriberImpl implements Subscriber<ByteBuffer> {
         private final Deque<Event> eventBuffer;
         private boolean subscribed = false;
 
-        public SubscriberImpl(Consumer<Subscription> subscriptionSetter, Deque<Event> eventBuffer) {
+        SubscriberImpl(Consumer<Subscription> subscriptionSetter, Deque<Event> eventBuffer) {
             this.subscriptionSetter = subscriptionSetter;
             this.eventBuffer = eventBuffer;
         }
@@ -258,22 +258,23 @@ private enum EventType {
         ERROR
     }
 
-    private interface Event {
-        Subscriber subscriber();
+    interface Event {
+        Subscriber<? super ByteBuffer> subscriber();
+
         EventType type();
     }
 
-    private static class DataEvent implements Event {
-        private final Subscriber subscriber;
+    private static final class DataEvent implements Event {
+        private final Subscriber<? super ByteBuffer> subscriber;
         private final ByteBuffer data;
 
-        public DataEvent(Subscriber subscriber, ByteBuffer data) {
+        DataEvent(Subscriber<? super ByteBuffer> subscriber, ByteBuffer data) {
             this.subscriber = subscriber;
             this.data = data;
         }
 
         @Override
-        public Subscriber subscriber() {
+        public Subscriber<? super ByteBuffer> subscriber() {
             return subscriber;
         }
 
@@ -282,20 +283,20 @@ public EventType type() {
             return EventType.DATA;
         }
 
-        public final ByteBuffer data() {
+        public ByteBuffer data() {
             return data;
         }
     }
 
-    private static class CompleteEvent implements Event {
-        private final Subscriber subscriber;
+    private static final class CompleteEvent implements Event {
+        private final Subscriber<? super ByteBuffer> subscriber;
 
-        public CompleteEvent(Subscriber subscriber) {
+        CompleteEvent(Subscriber<? super ByteBuffer> subscriber) {
             this.subscriber = subscriber;
         }
 
         @Override
-        public Subscriber subscriber() {
+        public Subscriber<? super ByteBuffer> subscriber() {
             return subscriber;
         }
 
@@ -305,17 +306,17 @@ public EventType type() {
         }
     }
 
-    private static class ErrorEvent implements Event {
-        private final Subscriber subscriber;
+    private static final class ErrorEvent implements Event {
+        private final Subscriber<? super ByteBuffer> subscriber;
         private final Throwable error;
 
-        public ErrorEvent(Subscriber subscriber, Throwable error) {
+        ErrorEvent(Subscriber<? super ByteBuffer> subscriber, Throwable error) {
             this.subscriber = subscriber;
             this.error = error;
         }
 
         @Override
-        public Subscriber subscriber() {
+        public Subscriber<? super ByteBuffer> subscriber() {
             return subscriber;
         }
 
@@ -324,7 +325,7 @@ public EventType type() {
             return EventType.ERROR;
         }
 
-        public final Throwable error() {
+        public Throwable error() {
             return error;
         }
     }
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3CrtDataPublisher.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3CrtDataPublisher.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 import java.nio.ByteBuffer;
 import java.util.Queue;
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3CrtUtils.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3CrtUtils.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 import com.amazonaws.s3.model.ObjectCannedACL;
 import com.amazonaws.s3.model.ObjectLockLegalHoldStatus;
diff --git a/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3NativeClientConfiguration.java b/services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/s3crt/S3NativeClientConfiguration.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.services.s3.internal;
+package software.amazon.awssdk.services.s3.internal.s3crt;
 
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtDataPublisherTckTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtDataPublisherTckTest.java
@@ -20,6 +20,7 @@
 import org.reactivestreams.Publisher;
 import org.reactivestreams.tck.TestEnvironment;
 import software.amazon.awssdk.core.internal.async.FileAsyncRequestBody;
+import software.amazon.awssdk.services.s3.internal.s3crt.S3CrtDataPublisher;
 
 /**
  * TCK verification test for {@link FileAsyncRequestBody}.
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtDataPublisherTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtDataPublisherTest.java
@@ -29,6 +29,7 @@
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
+import software.amazon.awssdk.services.s3.internal.s3crt.S3CrtDataPublisher;
 
 public class S3CrtDataPublisherTest {
 
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtUtilsTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/S3CrtUtilsTest.java
@@ -26,6 +26,7 @@
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
 import software.amazon.awssdk.crt.auth.credentials.Credentials;
 import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider;
+import software.amazon.awssdk.services.s3.internal.s3crt.S3CrtUtils;
 
 public class S3CrtUtilsTest {
 
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java
@@ -63,7 +63,13 @@ protected String getTestBucketName() {
 
     @RetryableTest(maxRetries = 3, retryableException = StabilityTestsRetryableException.class)
     public void largeObject_put_get_usingFile() {
-        //TODO: add upload once upload and download code is merged
+        uploadLargeObjectFromFile();
         downloadLargeObjectToFile();
     }
+
+    @RetryableTest(maxRetries = 3, retryableException = StabilityTestsRetryableException.class)
+    public void putObject_getObject_highConcurrency() {
+        putObject();
+        getObject();
+    }
 }
diff --git a/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3WithCrtAsyncHttpClientStabilityTest.java b/test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3WithCrtAsyncHttpClientStabilityTest.java
@@ -16,9 +16,9 @@
 /**
  * Stability tests for {@link S3AsyncClient} using {@link AwsCrtAsyncHttpClient}
  */
-public class S3CrtAsyncStabilityTest extends S3BaseStabilityTest {
+public class S3WithCrtAsyncHttpClientStabilityTest extends S3BaseStabilityTest {
 
-    private static String bucketName = "s3crtasyncstabilitytests" + System.currentTimeMillis();
+    private static String bucketName = "s3withcrtasyncclientstabilitytests" + System.currentTimeMillis();
 
     private static S3AsyncClient s3CrtClient;
 

Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@`
`36`	`36`	`*/`
`37`	`37`	`@SdkInternalApi`
`38`	`38`	`public final class RequestDataSupplierAdapter implements RequestDataSupplier {`
`39`		`- private static final Logger LOG = Logger.loggerFor(RequestDataSupplierAdapter.class);`
`40`		`-`
`41`	`39`	`static final long DEFAULT_REQUEST_SIZE = 8;`
	`40`	`+ private static final Logger LOG = Logger.loggerFor(RequestDataSupplierAdapter.class);`
`42`	`41`
`43`		`- private final AtomicReference<SubscriptionStatus> subscriptionStatus = new AtomicReference<>(SubscriptionStatus.NOT_SUBSCRIBED);`
	`42`	`+ private final AtomicReference<SubscriptionStatus> subscriptionStatus =`
	`43`	`+ new AtomicReference<>(SubscriptionStatus.NOT_SUBSCRIBED);`
`44`	`44`	`private final BlockingQueue<Subscription> subscriptionQueue = new LinkedBlockingQueue<>(1);`
`45`	`45`	`private final BlockingDeque<Event> eventBuffer = new LinkedBlockingDeque<>();`
`46`	`46`
`@@ -189,7 +189,7 @@ static class SubscriberImpl implements Subscriber<ByteBuffer> {`
`189`	`189`	`private final Deque<Event> eventBuffer;`
`190`	`190`	`private boolean subscribed = false;`
`191`	`191`
`192`		`- public SubscriberImpl(Consumer<Subscription> subscriptionSetter, Deque<Event> eventBuffer) {`
	`192`	`+ SubscriberImpl(Consumer<Subscription> subscriptionSetter, Deque<Event> eventBuffer) {`
`193`	`193`	`this.subscriptionSetter = subscriptionSetter;`
`194`	`194`	`this.eventBuffer = eventBuffer;`
`195`	`195`	`}`
`@@ -258,22 +258,23 @@ private enum EventType {`
`258`	`258`	`ERROR`
`259`	`259`	`}`
`260`	`260`
`261`		`- private interface Event {`
`262`		`- Subscriber subscriber();`
	`261`	`+ interface Event {`
	`262`	`+ Subscriber<? super ByteBuffer> subscriber();`
	`263`	`+`
`263`	`264`	`EventType type();`
`264`	`265`	`}`
`265`	`266`
`266`		`- private static class DataEvent implements Event {`
`267`		`- private final Subscriber subscriber;`
	`267`	`+ private static final class DataEvent implements Event {`
	`268`	`+ private final Subscriber<? super ByteBuffer> subscriber;`
`268`	`269`	`private final ByteBuffer data;`
`269`	`270`
`270`		`- public DataEvent(Subscriber subscriber, ByteBuffer data) {`
	`271`	`+ DataEvent(Subscriber<? super ByteBuffer> subscriber, ByteBuffer data) {`
`271`	`272`	`this.subscriber = subscriber;`
`272`	`273`	`this.data = data;`
`273`	`274`	`}`
`274`	`275`
`275`	`276`	`@Override`
`276`		`- public Subscriber subscriber() {`
	`277`	`+ public Subscriber<? super ByteBuffer> subscriber() {`
`277`	`278`	`return subscriber;`
`278`	`279`	`}`
`279`	`280`
`@@ -282,20 +283,20 @@ public EventType type() {`
`282`	`283`	`return EventType.DATA;`
`283`	`284`	`}`
`284`	`285`
`285`		`- public final ByteBuffer data() {`
	`286`	`+ public ByteBuffer data() {`
`286`	`287`	`return data;`
`287`	`288`	`}`
`288`	`289`	`}`
`289`	`290`
`290`		`- private static class CompleteEvent implements Event {`
`291`		`- private final Subscriber subscriber;`
	`291`	`+ private static final class CompleteEvent implements Event {`
	`292`	`+ private final Subscriber<? super ByteBuffer> subscriber;`
`292`	`293`
`293`		`- public CompleteEvent(Subscriber subscriber) {`
	`294`	`+ CompleteEvent(Subscriber<? super ByteBuffer> subscriber) {`
`294`	`295`	`this.subscriber = subscriber;`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`@Override`
`298`		`- public Subscriber subscriber() {`
	`299`	`+ public Subscriber<? super ByteBuffer> subscriber() {`
`299`	`300`	`return subscriber;`
`300`	`301`	`}`
`301`	`302`
`@@ -305,17 +306,17 @@ public EventType type() {`
`305`	`306`	`}`
`306`	`307`	`}`
`307`	`308`
`308`		`- private static class ErrorEvent implements Event {`
`309`		`- private final Subscriber subscriber;`
	`309`	`+ private static final class ErrorEvent implements Event {`
	`310`	`+ private final Subscriber<? super ByteBuffer> subscriber;`
`310`	`311`	`private final Throwable error;`
`311`	`312`
`312`		`- public ErrorEvent(Subscriber subscriber, Throwable error) {`
	`313`	`+ ErrorEvent(Subscriber<? super ByteBuffer> subscriber, Throwable error) {`
`313`	`314`	`this.subscriber = subscriber;`
`314`	`315`	`this.error = error;`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`@Override`
`318`		`- public Subscriber subscriber() {`
	`319`	`+ public Subscriber<? super ByteBuffer> subscriber() {`
`319`	`320`	`return subscriber;`
`320`	`321`	`}`
`321`	`322`
`@@ -324,7 +325,7 @@ public EventType type() {`
`324`	`325`	`return EventType.ERROR;`
`325`	`326`	`}`
`326`	`327`
`327`		`- public final Throwable error() {`
	`328`	`+ public Throwable error() {`
`328`	`329`	`return error;`
`329`	`330`	`}`
`330`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,13 @@ protected String getTestBucketName() {`
`63`	`63`
`64`	`64`	`@RetryableTest(maxRetries = 3, retryableException = StabilityTestsRetryableException.class)`
`65`	`65`	`public void largeObject_put_get_usingFile() {`
`66`		`- //TODO: add upload once upload and download code is merged`
	`66`	`+ uploadLargeObjectFromFile();`
`67`	`67`	`downloadLargeObjectToFile();`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ @RetryableTest(maxRetries = 3, retryableException = StabilityTestsRetryableException.class)`
	`71`	`+ public void putObject_getObject_highConcurrency() {`
	`72`	`+ putObject();`
	`73`	`+ getObject();`
	`74`	`+ }`
`69`	`75`	`}`