chore(codegen): use SerdeElision knowledge index

aws · May 9, 2023 · 5f80e2d · 5f80e2d
1 parent 326913b
commit 5f80e2d
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/...n/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberDeserVisitor.java b/...n/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberDeserVisitor.java
@@ -44,7 +44,7 @@ final class JsonMemberDeserVisitor extends DocumentMemberDeserVisitor {
         super(context, dataSource, defaultTimestampFormat);
         this.memberShape = memberShape;
         context.getWriter().addImport("_json", null, "@aws-sdk/smithy-client");
-        serdeElision.setEnabledForModel(!context.getSettings().generateServerSdk());
+        this.serdeElisionEnabled = !context.getSettings().generateServerSdk();
     }
 
     JsonMemberDeserVisitor(GenerationContext context,

diff --git a/...gen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberSerVisitor.java b/...gen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonMemberSerVisitor.java
@@ -36,10 +36,10 @@ final class JsonMemberSerVisitor extends DocumentMemberSerVisitor {
     /**
      * @inheritDoc
      */
-    JsonMemberSerVisitor(GenerationContext context, String dataSource, Format defaultTimestampFormat) {
+        JsonMemberSerVisitor(GenerationContext context, String dataSource, Format defaultTimestampFormat) {
         super(context, dataSource, defaultTimestampFormat);
         context.getWriter().addImport("_json", null, "@aws-sdk/smithy-client");
-        serdeElision.setEnabledForModel(!context.getSettings().generateServerSdk());
+        this.serdeElisionEnabled = !context.getSettings().generateServerSdk();
     }
 
     @Override

diff --git a/...src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java b/...src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonRpcProtocolGenerator.java
@@ -67,14 +67,14 @@ protected Format getDocumentTimestampFormat() {
     protected void generateDocumentBodyShapeSerializers(GenerationContext context, Set<Shape> shapes) {
         AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes,
                 // AWS JSON does not support jsonName
-                new JsonShapeSerVisitor(context, (shape, name) -> name));
+                new JsonShapeSerVisitor(context, (shape, name) -> name, enableSerdeElision()));
     }
 
     @Override
     protected void generateDocumentBodyShapeDeserializers(GenerationContext context, Set<Shape> shapes) {
         AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes,
                 // AWS JSON does not support jsonName
-                new JsonShapeDeserVisitor(context, (shape, name) -> name));
+                new JsonShapeDeserVisitor(context, (shape, name) -> name, enableSerdeElision()));
     }
 
     @Override

diff --git a/...en/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java b/...en/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeDeserVisitor.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.function.BiFunction;
+import software.amazon.smithy.aws.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.CollectionShape;
@@ -41,7 +42,6 @@
 import software.amazon.smithy.typescript.codegen.integration.DocumentMemberDeserVisitor;
 import software.amazon.smithy.typescript.codegen.integration.DocumentShapeDeserVisitor;
 import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator.GenerationContext;
-import software.amazon.smithy.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
 /**
@@ -58,16 +58,19 @@ final class JsonShapeDeserVisitor extends DocumentShapeDeserVisitor {
 
     private final BiFunction<MemberShape, String, String> memberNameStrategy;
 
-    JsonShapeDeserVisitor(GenerationContext context) {
+    JsonShapeDeserVisitor(GenerationContext context, boolean serdeElisionEnabled) {
         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));
+            .orElse(memberName),
+            serdeElisionEnabled);
     }
 
-    JsonShapeDeserVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy) {
+    JsonShapeDeserVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy,
+            boolean serdeElisionEnabled) {
         super(context);
+        this.serdeElisionEnabled = serdeElisionEnabled;
         this.memberNameStrategy = memberNameStrategy;
     }
 

diff --git a/...egen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java b/...egen/src/main/java/software/amazon/smithy/aws/typescript/codegen/JsonShapeSerVisitor.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.function.BiFunction;
+import software.amazon.smithy.aws.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.CollectionShape;
@@ -37,7 +38,6 @@
 import software.amazon.smithy.typescript.codegen.integration.DocumentMemberSerVisitor;
 import software.amazon.smithy.typescript.codegen.integration.DocumentShapeSerVisitor;
 import software.amazon.smithy.typescript.codegen.integration.ProtocolGenerator.GenerationContext;
-import software.amazon.smithy.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
 /**
@@ -55,16 +55,19 @@ final class JsonShapeSerVisitor extends DocumentShapeSerVisitor {
 
     private final BiFunction<MemberShape, String, String> memberNameStrategy;
 
-    JsonShapeSerVisitor(GenerationContext context) {
+    JsonShapeSerVisitor(GenerationContext context, boolean serdeElisionEnabled) {
         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));
+                        .orElse(memberName),
+                serdeElisionEnabled);
     }
 
-    JsonShapeSerVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy) {
+    JsonShapeSerVisitor(GenerationContext context, BiFunction<MemberShape, String, String> memberNameStrategy,
+            boolean serdeElisionEnabled) {
         super(context);
+        this.serdeElisionEnabled = serdeElisionEnabled;
         this.memberNameStrategy = memberNameStrategy;
     }
 
@@ -111,6 +114,9 @@ public void serializeDocument(GenerationContext context, DocumentShape shape) {
 
     @Override
     public void serializeMap(GenerationContext context, MapShape shape) {
+        if (shape.getId().getName().equals("DenseBooleanMap")) {
+            System.out.println("here");
+        }
         TypeScriptWriter writer = context.getWriter();
         Shape target = context.getModel().expectShape(shape.getValue().getTarget());
         SymbolProvider symbolProvider = context.getSymbolProvider();

diff --git a/...rc/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java b/...rc/main/java/software/amazon/smithy/aws/typescript/codegen/RestJsonProtocolGenerator.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Set;
+import software.amazon.smithy.aws.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.model.knowledge.HttpBinding;
 import software.amazon.smithy.model.shapes.DocumentShape;
@@ -33,7 +34,6 @@
 import software.amazon.smithy.typescript.codegen.integration.DocumentMemberDeserVisitor;
 import software.amazon.smithy.typescript.codegen.integration.DocumentMemberSerVisitor;
 import software.amazon.smithy.typescript.codegen.integration.HttpBindingProtocolGenerator;
-import software.amazon.smithy.typescript.codegen.validation.UnaryFunctionCall;
 import software.amazon.smithy.utils.IoUtils;
 import software.amazon.smithy.utils.SmithyInternalApi;
 
@@ -68,12 +68,14 @@ protected TimestampFormatTrait.Format getDocumentTimestampFormat() {
 
     @Override
     protected void generateDocumentBodyShapeSerializers(GenerationContext context, Set<Shape> shapes) {
-        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeSerVisitor(context));
+        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeSerVisitor(context,
+            (!context.getSettings().generateServerSdk() && enableSerdeElision())));
     }
 
     @Override
     protected void generateDocumentBodyShapeDeserializers(GenerationContext context, Set<Shape> shapes) {
-        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeDeserVisitor(context));
+        AwsProtocolUtils.generateDocumentBodyShapeSerde(context, shapes, new JsonShapeDeserVisitor(context,
+            (!context.getSettings().generateServerSdk() && enableSerdeElision())));
     }
 
     @Override