Feature/master/unmarshalling single pass

.changes/next-release/feature-AWSSDKforJavav2-70d110c.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "feature", 
+    "description": "Improve unmarshalling performance of all JSON protocols by unifying parsing with unmarshalling instead of doing one after the other."
+}

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -347,6 +347,11 @@ public class CustomizationConfig {
      */
     private boolean batchManagerSupported;
 
+    /**
+     * A boolean flag to indicate if the fast unmarshaller code path is enabled.
+     */
+    private boolean enableFastUnmarshaller = true;
+
     private CustomizationConfig() {
     }
 
@@ -914,4 +919,11 @@ public void setBatchManagerSupported(boolean batchManagerSupported) {
         this.batchManagerSupported = batchManagerSupported;
     }
 
+    public boolean getEnableFastUnmarshaller() {
+        return enableFastUnmarshaller;
+    }
+
+    public void setEnableFastUnmarshaller(boolean enableFastUnmarshaller) {
+        this.enableFastUnmarshaller = enableFastUnmarshaller;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -73,6 +73,7 @@
 import software.amazon.awssdk.identity.spi.IdentityProvider;
 import software.amazon.awssdk.identity.spi.IdentityProviders;
 import software.amazon.awssdk.identity.spi.TokenIdentity;
+import software.amazon.awssdk.protocols.json.internal.unmarshall.SdkClientJsonProtocolAdvancedOption;
 import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
 import software.amazon.awssdk.utils.AttributeMap;
 import software.amazon.awssdk.utils.CollectionUtils;
@@ -479,6 +480,13 @@ private MethodSpec finalizeServiceConfigurationMethod() {
                .addCode("    .fipsEnabled(c.get($T.FIPS_ENDPOINT_ENABLED))", AwsClientOption.class)
                .addCode("    .build());");
 
+        if (model.getMetadata().isJsonProtocol()) {
+            if (model.getCustomizationConfig().getEnableFastUnmarshaller()) {
+                builder.addStatement("builder.option($1T.ENABLE_FAST_UNMARSHALLER, true)",
+                                     SdkClientJsonProtocolAdvancedOption.class);
+            }
+        }
+
         builder.addStatement("return builder.build()");
         return builder.build();
     }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java

@@ -38,6 +38,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -98,7 +99,6 @@ public TypeSpec poetSpec() {
         if (shapeModel.isEventStream()) {
             return eventStreamInterfaceSpec();
         }
-
         List<FieldSpec> fields = shapeModelSpec.fields();
 
         TypeSpec.Builder specBuilder = TypeSpec.classBuilder(className())
@@ -110,9 +110,9 @@ public TypeSpec poetSpec() {
                                                .addFields(fields)
                                                .addFields(shapeModelSpec.staticFields())
                                                .addMethod(addModifier(sdkFieldsMethod(), FINAL))
+                                               .addMethod(addModifier(sdkFieldNameToFieldMethod(), FINAL))
                                                .addTypes(nestedModelClassTypes());
 
-
         if (shapeModel.isUnion()) {
             specBuilder.addField(unionTypeField());
         }
@@ -316,6 +316,17 @@ private MethodSpec sdkFieldsMethod() {
                          .build();
     }
 
+    private MethodSpec sdkFieldNameToFieldMethod() {
+        ParameterizedTypeName sdkFieldType = ParameterizedTypeName.get(ClassName.get(SdkField.class),
+                                                                       WildcardTypeName.subtypeOf(ClassName.get(Object.class)));
+        return MethodSpec.methodBuilder("sdkFieldNameToField")
+                         .addModifiers(PUBLIC)
+                         .addAnnotation(Override.class)
+                         .returns(ParameterizedTypeName.get(ClassName.get(Map.class), ClassName.get(String.class), sdkFieldType))
+                         .addCode("return SDK_NAME_TO_FIELD;")
+                         .build();
+    }
+
     private MethodSpec getterCreator() {
         TypeVariableName t = TypeVariableName.get("T");
         return MethodSpec.methodBuilder("getter")

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ModelBuilderSpecs.java

@@ -31,6 +31,7 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import javax.lang.model.element.Modifier;
@@ -141,6 +142,7 @@ public TypeSpec beanStyleBuilder() {
         builderClassBuilder.addMethods(accessors());
         builderClassBuilder.addMethod(buildMethod());
         builderClassBuilder.addMethod(sdkFieldsMethod());
+        builderClassBuilder.addMethod(sdkFieldNameToFieldMethod());
 
         if (shapeModel.isUnion()) {
             builderClassBuilder.addMethod(handleUnionValueChangeMethod());
@@ -169,6 +171,17 @@ private MethodSpec sdkFieldsMethod() {
                          .build();
     }
 
+    private MethodSpec sdkFieldNameToFieldMethod() {
+        ParameterizedTypeName sdkFieldType = ParameterizedTypeName.get(ClassName.get(SdkField.class),
+                                                                       WildcardTypeName.subtypeOf(ClassName.get(Object.class)));
+        return MethodSpec.methodBuilder("sdkFieldNameToField")
+                         .addModifiers(PUBLIC)
+                         .addAnnotation(Override.class)
+                         .returns(ParameterizedTypeName.get(ClassName.get(Map.class), ClassName.get(String.class), sdkFieldType))
+                         .addCode("return SDK_NAME_TO_FIELD;")
+                         .build();
+    }
+
     private TypeName builderImplSuperClass() {
         if (isRequest()) {
             return new AwsServiceBaseRequestSpec(intermediateModel).className().nestedClass("BuilderImpl");

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/ShapeModelSpec.java

@@ -23,7 +23,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Modifier;
@@ -95,6 +98,7 @@ public List<FieldSpec> fields(Modifier... modifiers) {
 
     public Iterable<FieldSpec> staticFields(Modifier... modifiers) {
         List<FieldSpec> fields = new ArrayList<>();
+        Map<String, String> nameToField = new LinkedHashMap<>();
         shapeModel.getNonStreamingMembers().stream()
                   // Exceptions can be members of event stream shapes, need to filter those out of the models
                   .filter(m -> m.getShape() == null || m.getShape().getShapeType() != ShapeType.Exception)
@@ -107,6 +111,8 @@ public Iterable<FieldSpec> staticFields(Modifier... modifiers) {
                                                    Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
                                           .initializer(sdkFieldInitializer(m))
                                           .build());
+                      String name = m.getHttp().getMarshallLocationName();
+                      nameToField.put(name, namingStrategy.getSdkFieldFieldName(m));
                   });
 
         ParameterizedTypeName sdkFieldType = ParameterizedTypeName.get(ClassName.get(SdkField.class),
@@ -115,13 +121,15 @@ public Iterable<FieldSpec> staticFields(Modifier... modifiers) {
         fields.add(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(List.class),
                                                                sdkFieldType), "SDK_FIELDS",
                                      Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
-                            .initializer("$T.unmodifiableList($T.asList($L))",
-                                         ClassName.get(Collections.class),
-                                         ClassName.get(Arrays.class),
-                                         fields.stream()
-                                               .map(f -> f.name)
-                                               .collect(Collectors.joining(",")))
+                            .initializer(sdkFieldsInitializer(fields))
                             .build());
+        fields.add(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(Map.class),
+                                                               ClassName.get(String.class),
+                                                               sdkFieldType),
+                                     "SDK_NAME_TO_FIELD",
+                                     Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
+                       .initializer(memberNameToFieldInitializer(nameToField))
+                       .build());
         return fields;
     }
 
@@ -369,4 +377,33 @@ private CodeBlock constructor(MemberModel m) {
         }
     }
 
+    private CodeBlock sdkFieldsInitializer(List<FieldSpec> fields) {
+        CodeBlock.Builder builder = CodeBlock.builder();
+        if (fields.isEmpty()) {
+            builder.add("$T.emptyList()", Collections.class);
+            return builder.build();
+        }
+        builder.add("$T.unmodifiableList($T.asList($L))",
+                    ClassName.get(Collections.class),
+                    ClassName.get(Arrays.class),
+                    fields.stream()
+                          .map(f -> f.name)
+                          .collect(Collectors.joining(",")));
+        return builder.build();
+    }
+
+    private CodeBlock memberNameToFieldInitializer(Map<String, String> nameToField) {
+        CodeBlock.Builder builder = CodeBlock.builder();
+        if (nameToField.isEmpty()) {
+            builder.add("$T.emptyMap()", Collections.class);
+            return builder.build();
+        }
+        builder.add("$T.unmodifiableMap(", Collections.class);
+        builder.add("new $T<$T, $T<?>>() {{\n", HashMap.class, String.class, SdkField.class);
+        nameToField.forEach((name, field) -> builder.add("put($S, $L);\n", name, field));
+        builder.add("}}");
+        builder.add(")");
+        return builder.build();
+    }
+
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesrequest.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -450,6 +451,48 @@ SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
             POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD, UNDERSCORE_NAME_TYPE_FIELD, MY_DOCUMENT_FIELD,
             ALL_TYPES_UNION_STRUCTURE_FIELD));
 
+    private static final Map<String, SdkField<?>> SDK_NAME_TO_FIELD = Collections
+            .unmodifiableMap(new HashMap<String, SdkField<?>>() {
+                {
+                    put("StringMember", STRING_MEMBER_FIELD);
+                    put("IntegerMember", INTEGER_MEMBER_FIELD);
+                    put("BooleanMember", BOOLEAN_MEMBER_FIELD);
+                    put("FloatMember", FLOAT_MEMBER_FIELD);
+                    put("DoubleMember", DOUBLE_MEMBER_FIELD);
+                    put("LongMember", LONG_MEMBER_FIELD);
+                    put("ShortMember", SHORT_MEMBER_FIELD);
+                    put("ByteMember", BYTE_MEMBER_FIELD);
+                    put("SimpleList", SIMPLE_LIST_FIELD);
+                    put("ListOfEnums", LIST_OF_ENUMS_FIELD);
+                    put("ListOfMaps", LIST_OF_MAPS_FIELD);
+                    put("ListOfStructs", LIST_OF_STRUCTS_FIELD);
+                    put("ListOfMapOfEnumToString", LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD);
+                    put("ListOfMapOfStringToStruct", LIST_OF_MAP_OF_STRING_TO_STRUCT_FIELD);
+                    put("MapOfStringToIntegerList", MAP_OF_STRING_TO_INTEGER_LIST_FIELD);
+                    put("MapOfStringToString", MAP_OF_STRING_TO_STRING_FIELD);
+                    put("MapOfStringToSimpleStruct", MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD);
+                    put("MapOfEnumToEnum", MAP_OF_ENUM_TO_ENUM_FIELD);
+                    put("MapOfEnumToString", MAP_OF_ENUM_TO_STRING_FIELD);
+                    put("MapOfStringToEnum", MAP_OF_STRING_TO_ENUM_FIELD);
+                    put("MapOfEnumToSimpleStruct", MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD);
+                    put("MapOfEnumToListOfEnums", MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD);
+                    put("MapOfEnumToMapOfStringToEnum", MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD);
+                    put("TimestampMember", TIMESTAMP_MEMBER_FIELD);
+                    put("StructWithNestedTimestampMember", STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD);
+                    put("BlobArg", BLOB_ARG_FIELD);
+                    put("StructWithNestedBlob", STRUCT_WITH_NESTED_BLOB_FIELD);
+                    put("BlobMap", BLOB_MAP_FIELD);
+                    put("ListOfBlobs", LIST_OF_BLOBS_FIELD);
+                    put("RecursiveStruct", RECURSIVE_STRUCT_FIELD);
+                    put("PolymorphicTypeWithSubTypes", POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD);
+                    put("PolymorphicTypeWithoutSubTypes", POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD);
+                    put("EnumType", ENUM_TYPE_FIELD);
+                    put("Underscore_Name_Type", UNDERSCORE_NAME_TYPE_FIELD);
+                    put("MyDocument", MY_DOCUMENT_FIELD);
+                    put("AllTypesUnionStructure", ALL_TYPES_UNION_STRUCTURE_FIELD);
+                }
+            });
+
     private final String stringMember;
 
     private final Integer integerMember;
@@ -1604,6 +1647,11 @@ public final List<SdkField<?>> sdkFields() {
         return SDK_FIELDS;
     }
 
+    @Override
+    public final Map<String, SdkField<?>> sdkFieldNameToField() {
+        return SDK_NAME_TO_FIELD;
+    }
+
     private static <T> Function<Object, T> getter(Function<AllTypesRequest, T> g) {
         return obj -> g.apply((AllTypesRequest) obj);
     }
@@ -3065,5 +3113,10 @@ public AllTypesRequest build() {
         public List<SdkField<?>> sdkFields() {
             return SDK_FIELDS;
         }
+
+        @Override
+        public Map<String, SdkField<?>> sdkFieldNameToField() {
+            return SDK_NAME_TO_FIELD;
+        }
     }
 }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/alltypesresponse.java

@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -449,6 +450,48 @@ SdkField.<SdkBytes> builder(MarshallingType.SDK_BYTES)
             POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD, ENUM_TYPE_FIELD, UNDERSCORE_NAME_TYPE_FIELD, MY_DOCUMENT_FIELD,
             ALL_TYPES_UNION_STRUCTURE_FIELD));
 
+    private static final Map<String, SdkField<?>> SDK_NAME_TO_FIELD = Collections
+            .unmodifiableMap(new HashMap<String, SdkField<?>>() {
+                {
+                    put("StringMember", STRING_MEMBER_FIELD);
+                    put("IntegerMember", INTEGER_MEMBER_FIELD);
+                    put("BooleanMember", BOOLEAN_MEMBER_FIELD);
+                    put("FloatMember", FLOAT_MEMBER_FIELD);
+                    put("DoubleMember", DOUBLE_MEMBER_FIELD);
+                    put("LongMember", LONG_MEMBER_FIELD);
+                    put("ShortMember", SHORT_MEMBER_FIELD);
+                    put("ByteMember", BYTE_MEMBER_FIELD);
+                    put("SimpleList", SIMPLE_LIST_FIELD);
+                    put("ListOfEnums", LIST_OF_ENUMS_FIELD);
+                    put("ListOfMaps", LIST_OF_MAPS_FIELD);
+                    put("ListOfStructs", LIST_OF_STRUCTS_FIELD);
+                    put("ListOfMapOfEnumToString", LIST_OF_MAP_OF_ENUM_TO_STRING_FIELD);
+                    put("ListOfMapOfStringToStruct", LIST_OF_MAP_OF_STRING_TO_STRUCT_FIELD);
+                    put("MapOfStringToIntegerList", MAP_OF_STRING_TO_INTEGER_LIST_FIELD);
+                    put("MapOfStringToString", MAP_OF_STRING_TO_STRING_FIELD);
+                    put("MapOfStringToSimpleStruct", MAP_OF_STRING_TO_SIMPLE_STRUCT_FIELD);
+                    put("MapOfEnumToEnum", MAP_OF_ENUM_TO_ENUM_FIELD);
+                    put("MapOfEnumToString", MAP_OF_ENUM_TO_STRING_FIELD);
+                    put("MapOfStringToEnum", MAP_OF_STRING_TO_ENUM_FIELD);
+                    put("MapOfEnumToSimpleStruct", MAP_OF_ENUM_TO_SIMPLE_STRUCT_FIELD);
+                    put("MapOfEnumToListOfEnums", MAP_OF_ENUM_TO_LIST_OF_ENUMS_FIELD);
+                    put("MapOfEnumToMapOfStringToEnum", MAP_OF_ENUM_TO_MAP_OF_STRING_TO_ENUM_FIELD);
+                    put("TimestampMember", TIMESTAMP_MEMBER_FIELD);
+                    put("StructWithNestedTimestampMember", STRUCT_WITH_NESTED_TIMESTAMP_MEMBER_FIELD);
+                    put("BlobArg", BLOB_ARG_FIELD);
+                    put("StructWithNestedBlob", STRUCT_WITH_NESTED_BLOB_FIELD);
+                    put("BlobMap", BLOB_MAP_FIELD);
+                    put("ListOfBlobs", LIST_OF_BLOBS_FIELD);
+                    put("RecursiveStruct", RECURSIVE_STRUCT_FIELD);
+                    put("PolymorphicTypeWithSubTypes", POLYMORPHIC_TYPE_WITH_SUB_TYPES_FIELD);
+                    put("PolymorphicTypeWithoutSubTypes", POLYMORPHIC_TYPE_WITHOUT_SUB_TYPES_FIELD);
+                    put("EnumType", ENUM_TYPE_FIELD);
+                    put("Underscore_Name_Type", UNDERSCORE_NAME_TYPE_FIELD);
+                    put("MyDocument", MY_DOCUMENT_FIELD);
+                    put("AllTypesUnionStructure", ALL_TYPES_UNION_STRUCTURE_FIELD);
+                }
+            });
+
     private final String stringMember;
 
     private final Integer integerMember;
@@ -1603,6 +1646,11 @@ public final List<SdkField<?>> sdkFields() {
         return SDK_FIELDS;
     }
 
+    @Override
+    public final Map<String, SdkField<?>> sdkFieldNameToField() {
+        return SDK_NAME_TO_FIELD;
+    }
+
     private static <T> Function<Object, T> getter(Function<AllTypesResponse, T> g) {
         return obj -> g.apply((AllTypesResponse) obj);
     }
@@ -3046,5 +3094,10 @@ public AllTypesResponse build() {
         public List<SdkField<?>> sdkFields() {
             return SDK_FIELDS;
         }
+
+        @Override
+        public Map<String, SdkField<?>> sdkFieldNameToField() {
+            return SDK_NAME_TO_FIELD;
+        }
     }
 }