refactor logic to use switch case

aws · Nov 6, 2024 · 2ae3246 · 2ae3246
1 parent 7c4bde0
commit 2ae3246
Show file tree

Hide file tree

Showing 372 changed files with 4,059 additions and 142,110 deletions.
diff --git a/...go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/JsonShapeDeserVisitor.java b/...go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/JsonShapeDeserVisitor.java
@@ -181,20 +181,8 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
             });
         });
 
-        boolean isErrorStructure = shape.hasTrait(ErrorTrait.class);
-        if (isErrorStructure) {
-            writer.write("var errorMessage string");
-        }
-
         // Iterate through the decoder. The member visitor will handle popping tokens.
         writer.openBlock("for key, value := range shape {", "}", () -> {
-            if (isErrorStructure) {
-                writer.write("keyLower := strings.ToLower(key)");
-                writer.write("if keyLower == \"message\" {");
-                writer.write("    errorMessage = value.(string)");
-                writer.write("    continue");
-                writer.write("}");
-            }
 
             writer.openBlock("switch key {", "}", () -> {
                 Set<MemberShape> members = new TreeSet<>(shape.members());
@@ -204,10 +192,16 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
                     }
                     String memberName = symbolProvider.toMemberName(member);
                     String serializedMemberName = getSerializedMemberName(member);
-                    writer.openBlock("case $S:", "", serializedMemberName, () -> {
-                        String dest = "sv." + memberName;
-                        context.getModel().expectShape(member.getTarget()).accept(getMemberDeserVisitor(member, dest));
-                    });
+
+                    boolean isErrorStructure = shape.hasTrait(ErrorTrait.class);
+
+                    if(isErrorStructure && memberName.equals("Message")){
+                        writer.write("case \"message\", \"Message\":");
+                    } else {
+                        writer.write("case $S:",serializedMemberName);
+                    }
+                    String dest = "sv." + memberName;
+                    context.getModel().expectShape(member.getTarget()).accept(getMemberDeserVisitor(member, dest));
                 }
 
                 writer.openBlock("default:", "", () -> {
@@ -216,11 +210,6 @@ protected void deserializeStructure(GenerationContext context, StructureShape sh
             });
         });
 
-        if (isErrorStructure) {
-            writer.write("if errorMessage != \"\" {");
-            writer.write("    sv.Message = &errorMessage");
-            writer.write("}");
-        }
 
         writer.write("*v = sv");
         writer.write("return nil");