Merge pull request #3884 from aws/hdavidh/revert-remove-fast-unmarshaller

Revert remove fast unmarshaller

Author: davidh44

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

@@ -81,6 +81,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;
@@ -507,6 +508,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);
+            }
+        }
+
         if (hasRequestAlgorithmMember(model) || hasResponseAlgorithms(model)) {
             builder.addStatement("$T clientConfig = config", SdkClientConfiguration.class);
 

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/BaseAwsJsonProtocolFactory.java

@@ -53,6 +53,7 @@
 import software.amazon.awssdk.protocols.json.internal.unmarshall.JsonProtocolUnmarshaller;
 import software.amazon.awssdk.protocols.json.internal.unmarshall.JsonResponseHandler;
 import software.amazon.awssdk.protocols.json.internal.unmarshall.ProtocolUnmarshallDependencies;
+import software.amazon.awssdk.protocols.json.internal.unmarshall.SdkClientJsonProtocolAdvancedOption;
 
 @SdkProtectedApi
 public abstract class BaseAwsJsonProtocolFactory {
@@ -87,7 +88,16 @@ protected BaseAwsJsonProtocolFactory(Builder<?> builder) {
         this.customErrorCodeFieldName = builder.customErrorCodeFieldName;
         this.hasAwsQueryCompatible = builder.hasAwsQueryCompatible;
         this.clientConfiguration = builder.clientConfiguration;
+        Boolean enableFastUnmarshalling = false;
+        if (clientConfiguration != null) {
+            enableFastUnmarshalling =
+                clientConfiguration.option(SdkClientJsonProtocolAdvancedOption.ENABLE_FAST_UNMARSHALLER);
+            if (enableFastUnmarshalling == null) {
+                enableFastUnmarshalling = false;
+            }
+        }
         this.protocolUnmarshaller = JsonProtocolUnmarshaller.builder()
+                                                            .enableFastUnmarshalling(enableFastUnmarshalling)
                                                             .protocolUnmarshallDependencies(
                                                                 builder.protocolUnmarshallDependencies.get())
                                                             .build();

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

@@ -48,6 +48,7 @@
 import software.amazon.awssdk.protocols.json.internal.MarshallerUtil;
 import software.amazon.awssdk.protocols.json.internal.unmarshall.document.DocumentUnmarshaller;
 import software.amazon.awssdk.protocols.jsoncore.JsonNode;
+import software.amazon.awssdk.protocols.jsoncore.JsonNodeParser;
 import software.amazon.awssdk.protocols.jsoncore.JsonValueNodeFactory;
 import software.amazon.awssdk.utils.Lazy;
 import software.amazon.awssdk.utils.builder.Buildable;
@@ -58,24 +59,42 @@
  */
 @SdkInternalApi
 @ThreadSafe
-public final class JsonProtocolUnmarshaller {
+public class JsonProtocolUnmarshaller {
     private static final Lazy<DefaultProtocolUnmarshallDependencies> DEFAULT_DEPENDENCIES =
         new Lazy<>(JsonProtocolUnmarshaller::newProtocolUnmarshallDependencies);
 
     private final JsonUnmarshallerRegistry registry;
     private final JsonUnmarshallingParser unmarshallingParser;
+    private final JsonNodeParser parser;
 
     private JsonProtocolUnmarshaller(Builder builder) {
         ProtocolUnmarshallDependencies dependencies = builder.protocolUnmarshallDependencies;
         this.registry = dependencies.jsonUnmarshallerRegistry();
-        this.unmarshallingParser = JsonUnmarshallingParser.builder()
-                                                          .jsonValueNodeFactory(dependencies.nodeValueFactory())
-                                                          .jsonFactory(dependencies.jsonFactory())
-                                                          .unmarshallerRegistry(dependencies.jsonUnmarshallerRegistry())
-                                                          .defaultTimestampFormat(dependencies.timestampFormats()
-                                                                                              .get(MarshallLocation.PAYLOAD))
+        if (builder.enableFastUnmarshalling) {
+            this.unmarshallingParser = JsonUnmarshallingParser.builder()
+                                                              .jsonValueNodeFactory(dependencies.nodeValueFactory())
+                                                              .jsonFactory(dependencies.jsonFactory())
+                                                              .unmarshallerRegistry(dependencies.jsonUnmarshallerRegistry())
+                                                              .defaultTimestampFormat(dependencies.timestampFormats()
+                                                                                                  .get(MarshallLocation.PAYLOAD))
+
+                                                              .build();
+            this.parser = null;
+        } else {
+            this.unmarshallingParser = null;
+            this.parser = createParser(builder, dependencies);
+        }
+    }
 
-                                                          .build();
+    private JsonNodeParser createParser(Builder builder, ProtocolUnmarshallDependencies dependencies) {
+        if (builder.parser != null) {
+            return builder.parser;
+        }
+        return JsonNodeParser
+            .builder()
+            .jsonFactory(dependencies.jsonFactory())
+            .jsonValueNodeFactory(dependencies.nodeValueFactory())
+            .build();
     }
 
     public static DefaultProtocolUnmarshallDependencies defaultProtocolUnmarshallDependencies() {
@@ -220,6 +239,15 @@ public T unmarshall(JsonUnmarshallerContext context,
 
     public <TypeT extends SdkPojo> TypeT unmarshall(SdkPojo sdkPojo,
                                                     SdkHttpFullResponse response) throws IOException {
+        if (this.unmarshallingParser != null) {
+            return fastUnmarshall(sdkPojo, response);
+        }
+        JsonNode jsonNode = hasJsonPayload(sdkPojo, response) ? parser.parse(response.content().get()) : null;
+        return unmarshall(sdkPojo, response, jsonNode);
+    }
+
+    private <TypeT extends SdkPojo> TypeT fastUnmarshall(SdkPojo sdkPojo,
+                                                    SdkHttpFullResponse response) throws IOException {
         if (!hasJsonPayload(sdkPojo, response)) {
             return unmarshallResponse(sdkPojo, response);
         }
@@ -425,11 +453,23 @@ public static JsonUnmarshallerRegistry timestampFormatRegistryFactory(
      * Builder for {@link JsonProtocolUnmarshaller}.
      */
     public static final class Builder {
+
+        private JsonNodeParser parser;
         private ProtocolUnmarshallDependencies protocolUnmarshallDependencies;
+        private boolean enableFastUnmarshalling = false;
 
         private Builder() {
         }
 
+        /**
+         * @param parser JSON parser to use.
+         * @return This builder for method chaining.
+         */
+        public Builder parser(JsonNodeParser parser) {
+            this.parser = parser;
+            return this;
+        }
+
         /**
          * @param formats The default timestamp formats for each location in the HTTP response.
          * @return This builder for method chaining.
@@ -451,6 +491,15 @@ public Builder protocolUnmarshallDependencies(
             return this;
         }
 
+        /**
+         * @param enableFastUnmarshalling Whether to enable the fast unmarshalling codepath. Default to {@code false}.
+         * @return This builder for method chaining.
+         */
+        public Builder enableFastUnmarshalling(boolean enableFastUnmarshalling) {
+            this.enableFastUnmarshalling = enableFastUnmarshalling;
+            return this;
+        }
+
         /**
          * @return New instance of {@link JsonProtocolUnmarshaller}.
          */

services/accessanalyzer/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/account/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/acm/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "listCertificates"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/acmpca/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "listCertificateAuthorities"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/amp/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/amplify/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "listApps"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/amplifybackend/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/amplifyuibuilder/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/apigateway/src/main/resources/codegen-resources/customization.config

@@ -24,5 +24,6 @@
     "interceptors": [
         "software.amazon.awssdk.services.apigateway.internal.AcceptJsonInterceptor"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/apigatewaymanagementapi/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/apigatewayv2/src/main/resources/codegen-resources/customization.config

@@ -3,5 +3,6 @@
         "getApis",
         "getDomainNames"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appconfig/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appconfigdata/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appfabric/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appflow/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appintegrations/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/applicationautoscaling/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/applicationcostprofiler/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/applicationdiscovery/src/main/resources/codegen-resources/customization.config

@@ -17,5 +17,6 @@
         "DescribeExportConfigurations",
         "ExportConfigurations"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/applicationinsights/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/applicationsignals/src/main/resources/codegen-resources/customization.config

@@ -1,2 +1,3 @@
 {
+    "enableFastUnmarshaller": true
 }

services/appmesh/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "listMeshes"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/apprunner/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appstream/src/main/resources/codegen-resources/customization.config

@@ -10,5 +10,6 @@
         "describeImages",
         "describeStacks"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/appsync/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "listGraphqlApis"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/apptest/src/main/resources/codegen-resources/customization.config

@@ -1,2 +1,3 @@
 {
+    "enableFastUnmarshaller": true
 }

services/arczonalshift/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/artifact/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/athena/src/main/resources/codegen-resources/customization.config

@@ -3,5 +3,6 @@
         "listNamedQueries",
         "listQueryExecutions"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/auditmanager/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/autoscalingplans/src/main/resources/codegen-resources/customization.config

@@ -2,5 +2,6 @@
     "verifiedSimpleMethods": [
         "describeScalingPlans"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/b2bi/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/backup/src/main/resources/codegen-resources/customization.config

@@ -10,5 +10,6 @@
         "listProtectedResources",
         "listRestoreJobs"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/backupgateway/src/main/resources/codegen-resources/customization.config

@@ -1,3 +1,4 @@
 {
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }

services/backupsearch/src/main/resources/codegen-resources/customization.config

@@ -1,2 +1,3 @@
 {
+    "enableFastUnmarshaller": true
 }

services/batch/src/main/resources/codegen-resources/customization.config

@@ -7,5 +7,6 @@
     "excludedSimpleMethods": [
         "listJobs"
     ],
-    "enableGenerateCompiledEndpointRules": true
+    "enableGenerateCompiledEndpointRules": true,
+    "enableFastUnmarshaller": true
 }