Fixing glacier marshalling

Author: shorea

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

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.codegen.model.config.customization;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import software.amazon.awssdk.codegen.model.config.templates.CodeGenTemplatesConfig;
@@ -126,7 +127,7 @@ public class CustomizationConfig {
     private String sdkResponseBaseClassName;
     private String defaultExceptionUnmarshaller;
 
-    private Map<String, String> modelMarshallerDefaultValueSupplier;
+    private Map<String, String> modelMarshallerDefaultValueSupplier = new HashMap<>();
 
     private boolean useAutoConstructList = true;
 

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

@@ -73,7 +73,8 @@ public AwsServiceModel(IntermediateModel intermediateModel, ShapeModel shapeMode
         this.shapeModelSpec = new ShapeModelSpec(this.shapeModel,
                                                  typeProvider,
                                                  poetExtensions,
-                                                 intermediateModel.getNamingStrategy());
+                                                 intermediateModel.getNamingStrategy(),
+                                                 intermediateModel.getCustomizationConfig());
         this.modelMethodOverrides = new ModelMethodOverrides(this.poetExtensions);
         this.modelBuilderSpecs = new ModelBuilderSpecs(intermediateModel, this.shapeModel, this.typeProvider);
     }

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

@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Modifier;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
@@ -34,7 +35,7 @@
 import software.amazon.awssdk.core.protocol.MarshallLocation;
 import software.amazon.awssdk.core.protocol.MarshallingType;
 import software.amazon.awssdk.core.protocol.SdkField;
-import software.amazon.awssdk.core.protocol.traits.IdempotencyTrait;
+import software.amazon.awssdk.core.protocol.traits.DefaultValueTrait;
 import software.amazon.awssdk.core.protocol.traits.JsonValueTrait;
 import software.amazon.awssdk.core.protocol.traits.ListTrait;
 import software.amazon.awssdk.core.protocol.traits.LocationTrait;
@@ -51,15 +52,18 @@ class ShapeModelSpec {
     private final TypeProvider typeProvider;
     private final PoetExtensions poetExtensions;
     private final NamingStrategy namingStrategy;
+    private final CustomizationConfig customizationConfig;
 
     ShapeModelSpec(ShapeModel shapeModel,
                    TypeProvider typeProvider,
                    PoetExtensions poetExtensions,
-                   NamingStrategy namingStrategy) {
+                   NamingStrategy namingStrategy,
+                   CustomizationConfig customizationConfig) {
         this.shapeModel = shapeModel;
         this.typeProvider = typeProvider;
         this.poetExtensions = poetExtensions;
         this.namingStrategy = namingStrategy;
+        this.customizationConfig = customizationConfig;
     }
 
     ClassName className() {
@@ -155,6 +159,10 @@ private CodeBlock traits(MemberModel m) {
         if (m.isIdempotencyToken()) {
             traits.add(createIdempotencyTrait());
         }
+        String customDefaultValueSupplier = customizationConfig.getModelMarshallerDefaultValueSupplier().get(m.getC2jName());
+        if (customDefaultValueSupplier != null) {
+            traits.add(createDefaultValueTrait(customDefaultValueSupplier));
+        }
         if (m.getTimestampFormat() != null) {
             traits.add(createTimestampFormatTrait(m));
         }
@@ -187,7 +195,14 @@ private CodeBlock createLocationTrait(MemberModel m) {
 
     private CodeBlock createIdempotencyTrait() {
         return CodeBlock.builder()
-                        .add("$T.create()", ClassName.get(IdempotencyTrait.class))
+                        .add("$T.idempotencyToken()", ClassName.get(DefaultValueTrait.class))
+                        .build();
+    }
+
+    private CodeBlock createDefaultValueTrait(String customDefaultValueSupplier) {
+        return CodeBlock.builder()
+                        .add("$T.create($T.getInstance())", ClassName.get(DefaultValueTrait.class),
+                             ClassName.bestGuess(customDefaultValueSupplier))
                         .build();
     }
 

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

@@ -30,7 +30,7 @@
 import software.amazon.awssdk.core.protocol.SdkField;
 import software.amazon.awssdk.core.protocol.SdkPojo;
 import software.amazon.awssdk.core.protocol.json.StructuredJsonGenerator;
-import software.amazon.awssdk.core.protocol.traits.IdempotencyTrait;
+import software.amazon.awssdk.core.protocol.traits.DefaultValueTrait;
 import software.amazon.awssdk.core.protocol.traits.PayloadTrait;
 import software.amazon.awssdk.core.util.UriResourcePathUtils;
 
@@ -172,8 +172,8 @@ public Request<OrigRequestT> marshall(SdkPojo pojo) {
     }
 
     private Object resolveValue(Object val, SdkField<?> marshallingInfo) {
-        IdempotencyTrait trait = marshallingInfo.getTrait(IdempotencyTrait.class);
-        return trait == null ? val : trait.resolveValue((String) val);
+        DefaultValueTrait trait = marshallingInfo.getTrait(DefaultValueTrait.class);
+        return trait == null ? val : trait.resolveValue(val);
     }
 
     private Request<OrigRequestT> finishMarshalling() {

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.core.protocol.traits;
+
+import java.util.function.Supplier;
+import software.amazon.awssdk.annotations.SdkProtectedApi;
+import software.amazon.awssdk.core.util.IdempotentUtils;
+
+/**
+ * Trait that supplies a default value when none is present for a given field.
+ */
+@SdkProtectedApi
+public final class DefaultValueTrait implements Trait {
+
+    private final Supplier<?> defaultValueSupplier;
+
+    private DefaultValueTrait(Supplier<?> defaultValueSupplier) {
+        this.defaultValueSupplier = defaultValueSupplier;
+    }
+
+    /**
+     * If the value is null then the default value supplier is used to get a default
+     * value for the field. Otherwise 'val' is returned.
+     *
+     * @param val Value to resolve.
+     * @return Resolved value.
+     */
+    public Object resolveValue(Object val) {
+        return val != null ? val : defaultValueSupplier.get();
+    }
+
+    /**
+     * Creates a new {@link DefaultValueTrait} with a custom {@link Supplier}.
+     *
+     * @param supplier Supplier of default value for the field.
+     * @return New trait instance.
+     */
+    public static DefaultValueTrait create(Supplier<?> supplier) {
+        return new DefaultValueTrait(supplier);
+    }
+
+    /**
+     * Creates a precanned {@link DefaultValueTrait} using the idempotency token generation which
+     * creates a new UUID if a field is null. This is used when the 'idempotencyToken' trait in the service
+     * model is present.
+     *
+     * @return New trait instance.
+     */
+    public static DefaultValueTrait idempotencyToken() {
+        return new DefaultValueTrait(IdempotentUtils.getGenerator());
+    }
+}

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

@@ -1,4 +1,5 @@
 {
+
     "customErrorCodeFieldName": "code",
 
     "shapeModifiers" : {
@@ -34,6 +35,6 @@
         }
     },
     "modelMarshallerDefaultValueSupplier": {
-        "AccountId" : "software.amazon.awssdk.services.glacier.transform.DefaultAccountIdSupplier.getInstance()"
+        "accountId" : "software.amazon.awssdk.services.glacier.transform.DefaultAccountIdSupplier"
     }
 }