Fixing Lambda integ tests and adding protocol tests for status code

Author: shorea

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ParameterHttpMapping.java

@@ -173,6 +173,8 @@ public MarshallLocation getMarshallLocation() {
         switch (location) {
             default:
                 return MarshallLocation.PAYLOAD;
+            case STATUS_CODE:
+                return MarshallLocation.STATUS_CODE;
             case HEADER:
             case HEADERS:
                 return MarshallLocation.HEADER;

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

@@ -46,6 +46,7 @@ public final class JsonProtocolUnmarshaller<TypeT extends SdkPojo> {
 
     private static final UnmarshallerRegistry REGISTRY = UnmarshallerRegistry
         .builder()
+        .statusCodeUnmarshaller(MarshallingType.INTEGER, (context, json, f) -> context.response().statusCode())
         .headerUnmarshaller(MarshallingType.STRING, HeaderUnmarshaller.STRING)
         .headerUnmarshaller(MarshallingType.INTEGER, HeaderUnmarshaller.INTEGER)
         .headerUnmarshaller(MarshallingType.LONG, HeaderUnmarshaller.LONG)

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/protocol/json/unmarshall/UnmarshallerRegistry.java

@@ -66,6 +66,11 @@ public <T> Builder headerUnmarshaller(MarshallingType<T> marshallingType,
             return addUnmarshaller(MarshallLocation.HEADER, marshallingType, marshaller);
         }
 
+        public <T> Builder statusCodeUnmarshaller(MarshallingType<T> marshallingType,
+                                                  JsonUnmarshaller<T> marshaller) {
+            return addUnmarshaller(MarshallLocation.STATUS_CODE, marshallingType, marshaller);
+        }
+
         private <T> Builder addUnmarshaller(MarshallLocation marshallLocation,
                                             MarshallingType<T> marshallingType,
                                             JsonUnmarshaller<T> marshaller) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/protocol/MarshallLocation.java

@@ -48,5 +48,11 @@ public enum MarshallLocation {
      * the only difference is whether it's URL encoded or not. Members bound to the {@link #PATH} will be URL
      * encoded before replacing, members bound to {@link #GREEDY_PATH} will not be URL encoded.
      */
-    GREEDY_PATH
+    GREEDY_PATH,
+
+    /**
+     * HTTP status code of response.
+     */
+    STATUS_CODE;
+
 }

test/protocol-tests-core/src/main/resources/software/amazon/awssdk/protocol/suites/cases/rest-json-output.json

@@ -97,5 +97,22 @@
         "IsoTimestampMember": 1398796238000
       }
     }
+  },
+  {
+    "description": "Integer bound to HTTP status code is unmarshalled correctly",
+    "given": {
+      "response": {
+        "status_code": 201
+      }
+    },
+    "when": {
+      "action": "unmarshall",
+      "operation": "StatusCodeInOutputOperation"
+    },
+    "then": {
+      "deserializedAs": {
+        "StatusCodeMember": 201
+      }
+    }
   }
 ]

test/protocol-tests/src/main/resources/codegen-resources/restjson/customization.config

@@ -15,6 +15,7 @@
         "headOperation",
         "jsonValuesOperation",
         "nestedContainers",
-        "furtherNestedContainers"
+        "furtherNestedContainers",
+        "statusCodeInOutputOperation"
     ]
 }

test/protocol-tests/src/main/resources/codegen-resources/restjson/service-2.json

@@ -167,6 +167,14 @@
       },
       "input":{"shape":"QueryParamWithoutValueInput"}
     },
+    "StatusCodeInOutputOperation":{
+      "name":"StatusCodeInOutputOperation",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2016-03-11/statusCodeInOutput"
+      },
+      "output":{"shape":"StatusCodeInOutputStructure"}
+    },
     "StreamingInputOperation":{
       "name":"StreamingInputOperation",
       "http":{
@@ -603,6 +611,15 @@
         "StringMember":{"shape":"String"}
       }
     },
+    "StatusCodeInOutputStructure":{
+      "type":"structure",
+      "members":{
+        "StatusCodeMember":{
+          "shape":"Integer",
+          "location":"statusCode"
+        }
+      }
+    },
     "StreamType":{
       "type":"blob",
       "streaming":true