feat(codegen): update to Smithy-1.16.3

adamthom-amzn · adamthom-amzn · commit 5b52ed684ce4 · 2022-01-19T17:38:03.000-08:00
Includes removal of @JsonName support from AWS JSON protocols, which is a change made to the spec in 1.16.
diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts
@@ -31,7 +31,7 @@ allprojects {
     version = "0.8.0"
 }
 
-extra["smithyVersion"] = "[1.15.0,1.16.0["
+extra["smithyVersion"] = "[1.16.3,1.17.0["
 
 // The root project doesn't produce a JAR.
 tasks["jar"].enabled = false
diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts
@@ -25,7 +25,7 @@ buildscript {
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.5.3"
+    id("software.amazon.smithy") version "0.6.0"
 }
 
 dependencies {
diff --git a/codegen/protocol-test-codegen/build.gradle.kts b/codegen/protocol-test-codegen/build.gradle.kts
@@ -25,7 +25,7 @@ buildscript {
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.5.3"
+    id("software.amazon.smithy") version "0.6.0"
 }
 
 dependencies {
diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts
@@ -31,7 +31,7 @@ buildscript {
 }
 
 plugins {
-    id("software.amazon.smithy") version "0.5.3"
+    id("software.amazon.smithy") version "0.6.0"
 }
 
 dependencies {
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java
@@ -64,12 +64,16 @@ protected Format getDocumentTimestampFormat() {
 
     @Override
     protected void generateDocumentBodyShapeSerializers(GenerationContext context, Set<Shape> shapes) {
-        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeSerVisitor(context));
+        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes,
+                // AWS JSON does not support jsonName
+                new JsonShapeSerVisitor(context, (shape, name) -> name));
     }
 
     @Override
     protected void generateDocumentBodyShapeDeserializers(GenerationContext context, Set<Shape> shapes) {
-        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeDeserVisitor(context));
+        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes,
+                // AWS JSON does not support jsonName
+                new JsonShapeDeserVisitor(context, (shape, name) -> name));
     }
 
     @Override
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java
@@ -17,6 +17,7 @@
 
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.function.BiFunction;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.CollectionShape;
@@ -51,8 +52,19 @@
 @SmithyInternalApi
 final class JsonShapeDeserVisitor extends DocumentShapeDeserVisitor {
 
+    private final BiFunction<MemberShape, String, String> memberNameStrategy;
+
     JsonShapeDeserVisitor(GenerationContext context) {
+        this(context,
+                // Use the jsonName trait value if present, otherwise use the member name.
+                (memberShape, memberName) -> memberShape.getTrait(JsonNameTrait.class)
+                .map(JsonNameTrait::getValue)
+                .orElse(memberName));
+    }
+
+    JsonShapeDeserVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy) {
         super(context);
+        this.memberNameStrategy = memberNameStrategy;
     }
 
     private DocumentMemberDeserVisitor getMemberVisitor(MemberShape memberShape, String dataSource) {
@@ -154,10 +166,7 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
         writer.openBlock("return {", "} as any;", () -> {
             // Set all the members to undefined to meet type constraints.
             members.forEach((memberName, memberShape) -> {
-                // Use the jsonName trait value if present, otherwise use the member name.
-                String locationName = memberShape.getTrait(JsonNameTrait.class)
-                        .map(JsonNameTrait::getValue)
-                        .orElse(memberName);
+                String locationName = memberNameStrategy.apply(memberShape, memberName);
                 Shape target = context.getModel().expectShape(memberShape.getTarget());
 
                 if (usesExpect(target)) {
@@ -195,10 +204,7 @@ protected void deserializeUnion(GenerationContext context, UnionShape shape) {
         Map<String, MemberShape> members = new TreeMap<>(shape.getAllMembers());
         members.forEach((memberName, memberShape) -> {
             Shape target = model.expectShape(memberShape.getTarget());
-            // Use the jsonName trait value if present, otherwise use the member name.
-            String locationName = memberShape.getTrait(JsonNameTrait.class)
-                    .map(JsonNameTrait::getValue)
-                    .orElse(memberName);
+            String locationName = memberNameStrategy.apply(memberShape, memberName);
 
             String memberValue = target.accept(getMemberVisitor(memberShape, "output." + locationName));
             if (usesExpect(target)) {
diff --git a/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java b/codegen/smithy-aws-typescript-codegen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java
@@ -17,6 +17,7 @@
 
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.function.BiFunction;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.CollectionShape;
@@ -51,10 +52,22 @@
 final class JsonShapeSerVisitor extends DocumentShapeSerVisitor {
     private static final Format TIMESTAMP_FORMAT = Format.EPOCH_SECONDS;
 
+    private final BiFunction<MemberShape, String, String> memberNameStrategy;
+
     JsonShapeSerVisitor(GenerationContext context) {
+        this(context,
+                // Use the jsonName trait value if present, otherwise use the member name.
+                (memberShape, memberName) -> memberShape.getTrait(JsonNameTrait.class)
+                        .map(JsonNameTrait::getValue)
+                        .orElse(memberName));
+    }
+
+    JsonShapeSerVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy) {
         super(context);
+        this.memberNameStrategy = memberNameStrategy;
     }
 
+
     private DocumentMemberSerVisitor getMemberVisitor(String dataSource) {
         return new JsonMemberSerVisitor(getContext(), dataSource, TIMESTAMP_FORMAT);
     }
@@ -125,10 +138,7 @@ public void serializeStructure(GenerationContext context, StructureShape shape)
             // Use a TreeMap to sort the members.
             Map<String, MemberShape> members = new TreeMap<>(shape.getAllMembers());
             members.forEach((memberName, memberShape) -> {
-                // Use the jsonName trait value if present, otherwise use the member name.
-                String locationName = memberShape.getTrait(JsonNameTrait.class)
-                        .map(JsonNameTrait::getValue)
-                        .orElse(memberName);
+                String locationName = memberNameStrategy.apply(memberShape, memberName);
                 Shape target = context.getModel().expectShape(memberShape.getTarget());
                 String inputLocation = "input." + memberName;
 
@@ -160,10 +170,7 @@ public void serializeUnion(GenerationContext context, UnionShape shape) {
             // Use a TreeMap to sort the members.
             Map<String, MemberShape> members = new TreeMap<>(shape.getAllMembers());
             members.forEach((memberName, memberShape) -> {
-                    // Use the jsonName trait value if present, otherwise use the member name.
-                    String locationName = memberShape.getTrait(JsonNameTrait.class)
-                            .map(JsonNameTrait::getValue)
-                            .orElse(memberName);
+                    String locationName = memberNameStrategy.apply(memberShape, memberName);
                     Shape target = model.expectShape(memberShape.getTarget());
                     // Dispatch to the input value provider for any additional handling.
                     writer.write("$L: value => ({ $S: $L }),", memberName, locationName,

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ allprojects {`
`31`	`31`	`version = "0.8.0"`
`32`	`32`	`}`
`33`	`33`
`34`		`-extra["smithyVersion"] = "[1.15.0,1.16.0["`
	`34`	`+extra["smithyVersion"] = "[1.16.3,1.17.0["`
`35`	`35`
`36`	`36`	`// The root project doesn't produce a JAR.`
`37`	`37`	`tasks["jar"].enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ buildscript {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`plugins {`
`28`		`- id("software.amazon.smithy") version "0.5.3"`
	`28`	`+ id("software.amazon.smithy") version "0.6.0"`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ buildscript {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`plugins {`
`34`		`- id("software.amazon.smithy") version "0.5.3"`
	`34`	`+ id("software.amazon.smithy") version "0.6.0"`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`dependencies {`