Use unformatted member names for serde

smithy-lang · Feb 22, 2024 · d7e51c4 · d7e51c4
1 parent 33bc02f
commit d7e51c4
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 13 deletions.
diff --git a/...degen/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeGenerator.java b/...degen/src/main/java/software/amazon/smithy/traitcodegen/generators/FromNodeGenerator.java
@@ -88,8 +88,8 @@ protected Void getDefault(Shape shape) {
 
         @Override
         public Void listShape(ListShape shape) {
-            writer.writeInline(getMemberPrefix() + "ArrayMember($1S, n -> $2C, builder::$1L)",
-                    symbolProvider.toMemberName(member),
+            writer.writeInline(getMemberPrefix() + "ArrayMember($1S, n -> $3C, builder::$2L)",
+                    member.getMemberName(), symbolProvider.toMemberName(member),
                     symbolProvider.toSymbol(shape.getMember()).expectProperty(SymbolProperties.FROM_NODE_MAPPER,
                     Mapper.class).with("n"));
             return null;
@@ -104,7 +104,7 @@ public Void mapShape(MapShape shape) {
             writer.disableNewlines();
             writer.openBlock(getMemberPrefix()
                             + "ObjectMember($S, o -> o.getMembers().forEach((k, v) -> {\n", "}))",
-                    symbolProvider.toMemberName(member),
+                    member.getMemberName(),
                     () -> writer.write("builder.put$L($C, $C);\n",
                             StringUtils.capitalize(symbolProvider.toMemberName(member)),
                             keyMapper.with("k"), valueMapper.with("v")));
@@ -115,8 +115,8 @@ public Void mapShape(MapShape shape) {
         @Override
         public Void stringShape(StringShape shape) {
             if (TraitCodegenUtils.isJavaString(symbolProvider.toSymbol(shape))) {
-                writer.writeInline(getMemberPrefix() + "StringMember($1S, builder::$1L)",
-                        symbolProvider.toMemberName(member));
+                writer.writeInline(getMemberPrefix() + "StringMember($S, builder::$L)",
+                        member.getMemberName(), symbolProvider.toMemberName(member));
             } else {
                 generateGenericMember(shape);
             }
@@ -130,8 +130,8 @@ public Void structureShape(StructureShape shape) {
         }
 
         private void generateGenericMember(Shape shape) {
-            writer.writeInline(getMemberPrefix() + "Member($1S, n -> $2C, builder::$1L)",
-                    symbolProvider.toMemberName(member),
+            writer.writeInline(getMemberPrefix() + "Member($1S, n -> $3C, builder::$2L)",
+                    member.getMemberName(), symbolProvider.toMemberName(member),
                     symbolProvider.toSymbol(shape)
                             .expectProperty(SymbolProperties.FROM_NODE_MAPPER, Mapper.class).with("n"));
         }

diff --git a/...codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/ToNodeGenerator.java b/...codegen/src/main/java/software/amazon/smithy/traitcodegen/generators/ToNodeGenerator.java
@@ -200,7 +200,8 @@ public Void structureShape(StructureShape shape) {
                 writer.writeInline(".sourceLocation(getSourceLocation())");
             }
             for (MemberShape member : shape.members()) {
-                member.accept(new MemberMapperVisitor(symbolProvider.toMemberName(member),
+                member.accept(new MemberMapperVisitor(member.getMemberName(),
+                        symbolProvider.toMemberName(member),
                         symbolProvider, member.isRequired()));
             }
             writer.writeWithNoFormatting(".build();");
@@ -216,14 +217,17 @@ private void generateNumberTraitCreator() {
     // Writes the per-member mapping from a member to an object node member node.
     private final class MemberMapperVisitor extends ShapeVisitor.Default<Void> {
         private final String memberName;
+        private final String formattedMemberName;
         private final SymbolProvider symbolProvider;
         private final boolean required;
 
         private MemberMapperVisitor(String memberName,
+                                    String formattedMemberName,
                                     SymbolProvider symbolProvider,
                                     boolean required
         ) {
             this.memberName = memberName;
+            this.formattedMemberName = formattedMemberName;
             this.symbolProvider = symbolProvider;
             this.required = required;
         }
@@ -234,10 +238,10 @@ protected Void getDefault(Shape shape) {
             if (required) {
                 writer.write(".withMember($S, $C)",
                         memberName,
-                        symbol.expectProperty(SymbolProperties.TO_NODE_MAPPER, Mapper.class).with(memberName));
+                        symbol.expectProperty(SymbolProperties.TO_NODE_MAPPER, Mapper.class).with(formattedMemberName));
             } else {
                 writer.write(".withOptionalMember($S, get$L().map(m -> $C))",
-                        memberName, StringUtils.capitalize(memberName),
+                        memberName, StringUtils.capitalize(formattedMemberName),
                         symbol.expectProperty(SymbolProperties.TO_NODE_MAPPER, Mapper.class).with("m"));
             }
             return null;
@@ -252,7 +256,7 @@ public Void memberShape(MemberShape shape) {
         public Void listShape(ListShape shape) {
             Symbol listTargetSymbol = symbolProvider.toSymbol(shape.getMember());
             writer.write(".withMember($S, get$L().stream().map(s -> $C).collect($T.collect()))",
-                    memberName, StringUtils.capitalize(memberName),
+                    memberName, StringUtils.capitalize(formattedMemberName),
                     listTargetSymbol.expectProperty(SymbolProperties.TO_NODE_MAPPER, Mapper.class).with("s"),
                     ArrayNode.class
             );
@@ -263,8 +267,7 @@ public Void listShape(ListShape shape) {
         public Void mapShape(MapShape shape) {
             Pair<Mapper, Mapper> mappers = getKeyValueMappers(shape);
             writer.openBlock(".withMember($S, get$L().entrySet().stream()", ")",
-                    memberName,
-                    StringUtils.capitalize(memberName),
+                    memberName, StringUtils.capitalize(formattedMemberName),
                     () -> writer.write(".map(entry -> new $T.SimpleImmutableEntry<>(", AbstractMap.class)
                             .indent()
                             .write("$C, $C))",

diff --git a/smithy-trait-codegen/src/test/resources/META-INF/smithy/manifest b/smithy-trait-codegen/src/test/resources/META-INF/smithy/manifest
@@ -2,4 +2,5 @@ test-traits.smithy
 ignored.smithy
 nested-namespace.smithy
 name-conflicts.smithy
+non-java-names.smithy
 
diff --git a/smithy-trait-codegen/src/test/resources/META-INF/smithy/non-java-names.smithy b/smithy-trait-codegen/src/test/resources/META-INF/smithy/non-java-names.smithy
@@ -0,0 +1,21 @@
+$version: "2.0"
+
+namespace test.smithy.traitcodegen.names
+
+/// Snake cased
+//@trait
+//structure snake_case_structure {
+//    snake_case_member: String
+//}
+//
+///// A camel-snake hybrid chimera
+//@trait
+//structure snake_camelStructure {
+//    camel_snakeMember: String
+//}
+//
+///// A camel-snake chimera
+//@trait
+//structure snake_camelStructure {
+//    camel_snakeMember: String
+//}