fix: change function name for positional trait (#714)

smithy-lang · Nov 13, 2024 · 78b79ae · 78b79ae
1 parent b4b811e
commit 78b79ae
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 8 deletions.
diff --git a/...codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java b/...codegen/src/main/java/software/amazon/polymorph/smithygo/codegen/ValidationGenerator.java
@@ -473,7 +473,8 @@ private void renderListShape(
     ) {
       final String funcName = Constants.funcNameGenerator(
         memberShape,
-        "Validate"
+        "Validate",
+        context.model()
       );
       final String funcInput = dataSource.startsWith("input") ? "" : dataSource;
       if (!funcInput.isEmpty()) {
@@ -567,7 +568,11 @@ private void renderMapShape(
       !validationFuncMap.containsKey(memberShape) &&
       (!keyValidation.isEmpty() || !valueValidation.isEmpty())
     ) {
-      final var funcName = Constants.funcNameGenerator(memberShape, "Validate");
+      final var funcName = Constants.funcNameGenerator(
+        memberShape,
+        "Validate",
+        context.model()
+      );
       final var funcInput = dataSource.startsWith("input") ? "" : dataSource;
       if (!funcInput.isEmpty()) {
         final var currServiceShapeNamespace = SmithyNameResolver.shapeNamespace(
@@ -634,7 +639,11 @@ private void renderUnionShape(
     final StringBuilder validationCode,
     final String dataSource
   ) {
-    final var funcName = Constants.funcNameGenerator(memberShape, "Validate");
+    final var funcName = Constants.funcNameGenerator(
+      memberShape,
+      "Validate",
+      context.model()
+    );
     final var funcInput = dataSource.startsWith("input") ? "" : dataSource;
     var dataSourceForUnion = dataSource;
     final var currServiceShapeNamespace =

diff --git a/...tware/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java b/...tware/amazon/polymorph/smithygo/localservice/DafnyLocalServiceTypeConversionProtocol.java
@@ -1470,7 +1470,11 @@ private void generateSerializerFunctions(
                 return $L
             }
             """,
-            Constants.funcNameGenerator(visitingMemberShape, "ToDafny"),
+            Constants.funcNameGenerator(
+              visitingMemberShape,
+              "ToDafny",
+              context.model()
+            ),
             inputType,
             outputType,
             SmithyToDafnyShapeVisitor.getConversionFunc(visitingMemberShape)
@@ -1560,7 +1564,11 @@ private void generateDeserializerFunctions(
             func $L(input interface{})($L) {
                 $L
             }""",
-            Constants.funcNameGenerator(visitingMemberShape, "FromDafny"),
+            Constants.funcNameGenerator(
+              visitingMemberShape,
+              "FromDafny",
+              context.model()
+            ),
             outputType,
             DafnyToSmithyShapeVisitor.getConversionFunc(visitingMemberShape)
           );

diff --git a/...java/software/amazon/polymorph/smithygo/localservice/shapevisitor/ShapeVisitorHelper.java b/...java/software/amazon/polymorph/smithygo/localservice/shapevisitor/ShapeVisitorHelper.java
@@ -94,7 +94,8 @@ public static String toNativeShapeVisitorWriter(
     }
     final String funcName = Constants.funcNameGenerator(
       memberShape,
-      "FromDafny"
+      "FromDafny",
+      context.model()
     );
     return (funcName.concat("(").concat(dataSource).concat(")"));
   }
@@ -145,7 +146,11 @@ public static String toDafnyShapeVisitorWriter(
         )
       );
     }
-    final String funcName = Constants.funcNameGenerator(memberShape, "ToDafny");
+    final String funcName = Constants.funcNameGenerator(
+      memberShape,
+      "ToDafny",
+      context.model()
+    );
     return (funcName.concat("(").concat(dataSource).concat(")"));
   }
 }
diff --git a/...mithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java b/...mithy-dafny-codegen/src/main/java/software/amazon/polymorph/smithygo/utils/Constants.java
@@ -1,6 +1,10 @@
 package software.amazon.polymorph.smithygo.utils;
 
+import software.amazon.polymorph.traits.PositionalTrait;
+import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.MemberShape;
+import software.amazon.smithy.model.shapes.Shape;
+import software.amazon.smithy.utils.StringUtils;
 
 public class Constants {
 
@@ -9,7 +13,31 @@ public class Constants {
 
   // TODO: Is it possible to make this function name shorter and in camelCase?
   /**
-   * Generates a function name for shape visitors for AWS SDK and localservice.
+   * Generates a function name for memberShapes.
+   * Generates private function for all shape excepts memberShape whose containerShape has positional trait
+   *
+   * @param memberShape The visiting MemberShape
+   * @param suffix A string to be appended at the end of the generated function name
+   * @param model The smithy model being used
+   * @return A string representing the generated function name
+   */
+  public static String funcNameGenerator(
+    final MemberShape memberShape,
+    final String suffix,
+    final Model model
+  ) {
+    String funcName = funcNameGenerator(memberShape, suffix);
+    final Shape containerShape = model.expectShape(memberShape.getContainer());
+    // membershape inside a container shape with positional trait has to be exposed.
+    if (containerShape.hasTrait(PositionalTrait.class)) {
+      funcName = StringUtils.capitalize(funcName);
+    }
+    return funcName;
+  }
+
+  /**
+   * Generates a function name for memberShapes.
+   * Always generates private function for all shape
    *
    * @param memberShape The visiting MemberShape
    * @param suffix A string to be appended at the end of the generated function name