Fixing CBOR unmarshalling of blobs and running Kinesis integ test

Author: shorea

.changes/next-release/bugfix-AWSSDKforJavaV2-7ae0927.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java V2", 
+    "type": "bugfix", 
+    "description": "Fixes Issue [#864](https://github.com/aws/aws-sdk-java-v2/issues/864) by checking for embedded JSON objects while unmarshalling bytes."
+}

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkEmbeddedObject.java

@@ -37,6 +37,7 @@ private SdkEmbeddedObject(Object embeddedObject) {
     /**
      * @return The embedded object that was returned by the {@link JsonParser}.
      */
+    @Override
     public Object embeddedObject() {
         return embeddedObject;
     }

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/dom/SdkJsonNode.java

@@ -37,6 +37,13 @@ default String asText() {
         return null;
     }
 
+    /**
+     * @return The embedded object value of the node. See {@link SdkEmbeddedObject}.
+     */
+    default Object embeddedObject() {
+        return null;
+    }
+
     /**
      * @param fieldName Field to get value for.
      * @return Value of field in the JSON object if this node represents an object, otherwise returns null.

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/unmarshall/JsonProtocolUnmarshaller.java

@@ -15,6 +15,8 @@
 
 package software.amazon.awssdk.protocols.json.internal.unmarshall;
 
+import static software.amazon.awssdk.protocols.core.StringToValueConverter.TO_SDK_BYTES;
+
 import java.io.IOException;
 import java.time.Instant;
 import java.util.Collections;
@@ -77,7 +79,7 @@ private static JsonUnmarshallerRegistry createUnmarshallerRegistry() {
             .payloadUnmarshaller(MarshallingType.BIG_DECIMAL, new SimpleTypeJsonUnmarshaller<>(
                 StringToValueConverter.TO_BIG_DECIMAL))
             .payloadUnmarshaller(MarshallingType.BOOLEAN, new SimpleTypeJsonUnmarshaller<>(StringToValueConverter.TO_BOOLEAN))
-            .payloadUnmarshaller(MarshallingType.SDK_BYTES, new SimpleTypeJsonUnmarshaller<>(StringToValueConverter.TO_SDK_BYTES))
+            .payloadUnmarshaller(MarshallingType.SDK_BYTES, JsonProtocolUnmarshaller::unmarshallSdkBytes)
             .payloadUnmarshaller(MarshallingType.INSTANT, new SimpleTypeJsonUnmarshaller<>(INSTANT_STRING_TO_VALUE))
             .payloadUnmarshaller(MarshallingType.SDK_POJO, JsonProtocolUnmarshaller::unmarshallStructured)
             .payloadUnmarshaller(MarshallingType.LIST, JsonProtocolUnmarshaller::unmarshallList)
@@ -92,6 +94,21 @@ private static Map<MarshallLocation, TimestampFormatTrait.Format> getDefaultTime
         return Collections.unmodifiableMap(formats);
     }
 
+    private static SdkBytes unmarshallSdkBytes(JsonUnmarshallerContext context,
+                                               SdkJsonNode jsonContent,
+                                               SdkField<SdkBytes> field) {
+        if (jsonContent == null || jsonContent.isNull()) {
+            return null;
+        }
+        // Binary protocols like CBOR may already have the raw bytes extracted.
+        if (jsonContent.embeddedObject() != null) {
+            return SdkBytes.fromByteArray((byte[]) jsonContent.embeddedObject());
+        } else {
+            // Otherwise decode the JSON string as Base64
+            return TO_SDK_BYTES.convert(jsonContent.asText(), field);
+        }
+    }
+
     private static SdkPojo unmarshallStructured(JsonUnmarshallerContext context, SdkJsonNode jsonContent, SdkField<SdkPojo> f) {
         if (jsonContent == null || jsonContent.isNull()) {
             return null;

pom.xml

@@ -687,6 +687,7 @@
                                 <configuration>
                                     <includes>
                                         <include>**/*IntegrationTest.java</include>
+                                        <include>**/*IntegrationTests.java</include>
                                         <include>**/*IntegTest.java</include>
                                         <include>**/RunCucumberTest.java</include>
                                     </includes>