Syncing client with latest model

Author: shorea

bundle/pom.xml

@@ -74,6 +74,7 @@
                             <include>commons-codec:commons-codec</include>
                             <include>software.amazon.awssdk.ion:ion-java</include>
                             <include>software.amazon.awssdk:*</include>
+                            <include>software.amazon:*</include>
                             <include>commons-logging:*</include>
                         </includes>
                     </artifactSet>

core/src/main/java/software/amazon/awssdk/core/auth/Aws4Signer.java

@@ -30,7 +30,6 @@
 import java.util.concurrent.TimeUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.annotations.ReviewBeforeRelease;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.core.auth.internal.Aws4SignerRequestParams;
 import software.amazon.awssdk.core.auth.internal.Aws4SignerUtils;
@@ -56,10 +55,7 @@ public class Aws4Signer extends AbstractAwsSigner
 
     private static final int SIGNER_CACHE_MAX_SIZE = 300;
     private static final FifoCache<SignerKey> SIGNER_CACHE = new FifoCache<>(SIGNER_CACHE_MAX_SIZE);
-    // TODO sigv4 auth
-    @ReviewBeforeRelease("Remove this when Sigv4 auth is implemented properly service side.")
-    private static final List<String> LIST_OF_HEADERS_TO_IGNORE_IN_LOWER_CASE = Arrays.asList("connection", "x-amzn-trace-id", "host");
-    //private static final List<String> LIST_OF_HEADERS_TO_IGNORE_IN_LOWER_CASE = Arrays.asList("connection", "x-amzn-trace-id");
+    private static final List<String> LIST_OF_HEADERS_TO_IGNORE_IN_LOWER_CASE = Arrays.asList("connection", "x-amzn-trace-id" );
 
     /**
      * Service name override for use when the endpoint can't be used to

core/src/main/java/software/amazon/awssdk/core/http/pipeline/stages/ApplyTransactionIdStage.java

@@ -39,9 +39,6 @@ public class ApplyTransactionIdStage implements MutableRequestToRequestPipeline
     public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, RequestExecutionContext context)
         throws Exception {
         InterruptMonitor.checkInterrupted();
-        //        for (int i = 1; i < 50; i++) {
-        //            request.header("x-amz-shorea-" + i, UUID.randomUUID().toString());
-        //        }
         return request.header(HEADER_SDK_TRANSACTION_ID, new UUID(random.nextLong(), random.nextLong()).toString());
     }
 }

flow/src/main/java/software/amazon/eventstream/MessageDecoder.java

@@ -15,18 +15,23 @@ public final class MessageDecoder {
 
     public MessageDecoder(Consumer<Message> messageConsumer) {
         this.messageConsumer = messageConsumer;
-        this.buf = ByteBuffer.allocate(128 * 1024);
+        this.buf = ByteBuffer.allocate(16 * 128 * 1024);
     }
 
     public void feed(byte[] bytes) {
         feed(bytes, 0, bytes.length);
     }
 
     public void feed(byte[] bytes, int offset, int length) {
+        // TODO instead of blindly putting bytes can we first calculate the prelude if available then cache, then
+        // put all bytes up to the length of the frame then decode then clear and reset for next prelude
+        // Also we can detect the length of the payload and grow if needed
         buf.put(bytes, offset, length);
         ByteBuffer readView = (ByteBuffer) buf.duplicate().flip();
         int bytesConsumed = 0;
         while (readView.remaining() >= 15) {
+            // TODO seems wasteful to decode the prelude multiple times. Can we cache until we've read all the data for
+            // this frame?
             int totalMessageLength = toIntExact(Prelude.decode(readView.duplicate()).getTotalLength());
 
             if (readView.remaining() >= totalMessageLength) {

services/kinesis/pom.xml

@@ -31,10 +31,14 @@
     <url>https://aws.amazon.com/sdkforjava</url>
 
     <dependencies>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>log4j</groupId>-->
+            <!--<artifactId>log4j</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.slf4j</groupId>-->
+            <!--<artifactId>slf4j-log4j12</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>netty-nio-client</artifactId>

services/kinesis/src/it/java/log4j.properties

@@ -1,4 +1,4 @@
-log4j.rootLogger=INFO, A1
+log4j.rootLogger=DEBUG, A1
 log4j.appender.A1=org.apache.log4j.ConsoleAppender
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
 

services/kinesis/src/main/java/software/amazon/awssdk/services/kinesis/DefaultKinesisAsyncClient.java

@@ -5,6 +5,7 @@
     "customServiceMetadata": {
         "protocol": "cbor"
     },
-    "skipSmokeTests": "true"
+    "skipSmokeTests": "true",
+    "verifiedSimpleMethods": ["deregisterStreamConsumer"]
 
 }