cleanup + resolve PR comments

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppBlockWriter.java

@@ -8,22 +8,34 @@
 import java.util.List;
 import lombok.Data;
 
-//Helper class for C++ code blocks for scope management
+/*
+    Generic Helper class for C++ code blocks for scope management
+    C++ code has blocks, for example function, loops, empty blocks.
+
+    Variables defined in those blocks have their scope defined in them. 
+    Blocks can be deeply nested.
+    This class manages blocks, scope of variables in such blocks 
+    along with indentation of code defined in those blocks. 
+
+    One of the use cases:
+    Code writer keeps adding blocks to say 5 levels, at the fifth level 
+    if the writer wants to extract the code, all the nested blocks will be
+    automaticallty closed in order of the stack making top level writer not
+    worry about it.
+*/
 public class CppBlockWriter {
 
-    public static String GetForLoopRangeInitializer(String variableName, String iterableExpr)
-    {
+    //preset logic for some types of blocks
+    public static String GetForLoopRangeInitializer(String variableName, String iterableExpr){
         return String.format("for (auto %s in %s)", variableName, iterableExpr);
     }
 
-    public static String GetContainerDeclaration(String containerType, String containerTemplateParam, String variableName)
-    {
+    public static String GetContainerDeclaration(String containerType, String containerTemplateParam, String variableName){
         return String.format("%s<%s> %s",containerType, containerTemplateParam,variableName );
     }
 
     //args  will always be even number Type followed by name
-    public static String GetFunctionBlock(String returnType, String functionName, String... args)
-    {   
+    public static String GetFunctionBlock(String returnType, String functionName, String... args){   
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < args.length - 1; i += 2)
         {
@@ -37,8 +49,7 @@ public static String GetFunctionBlock(String returnType, String functionName, St
     }
 
 
-    public static String GetLambdaBlock(String returnType, String functionName, String... args)
-    {   
+    public static String GetLambdaBlock(String returnType, String functionName, String... args){   
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < args.length - 1; i += 2)
         {
@@ -116,8 +127,7 @@ public CppBlockWriter(int level){
     }
 
     //opens a new block
-    public CppBlockWriter openCodeBlock(String blockHead)
-    {
+    public CppBlockWriter openCodeBlock(String blockHead){
         //add new block to stack
         //use its string builder to add "{"
         Block block = new Block(blockHead, indentLevel);
@@ -126,8 +136,7 @@ public CppBlockWriter openCodeBlock(String blockHead)
         return this;
     }
 
-    public CppBlockWriter continueCodeBlock(String code)
-    {
+    public CppBlockWriter continueCodeBlock(String code){
         //add new block to stack
         //use its string builder to add "{"
         Block block = new Block(indentLevel);
@@ -144,8 +153,7 @@ public CppBlockWriter continueCodeBlock(String code)
 
 
     //add code to current block
-    public CppBlockWriter addCode(String code)
-    {
+    public CppBlockWriter addCode(String code){
         if (!blockStack.isEmpty()) {
 
             Block top = blockStack.peek();
@@ -155,8 +163,7 @@ public CppBlockWriter addCode(String code)
     }
 
     //closes current block
-    public CppBlockWriter closeCodeBlock()
-    {
+    public CppBlockWriter closeCodeBlock(){
         List<String> codeLines = new ArrayList<String>();
         //if root block is not a new scope and it is the root block, 
         //need not close scope then

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppImportContainer.java

@@ -25,7 +25,7 @@ public final class CppImportContainer implements ImportContainer {
      public CppImportContainer(String namespace) {
         this.clientNamespace = SmokeTestsParser.removeSpaces(namespace);
         this.folderNamespace = SmokeTestsParser.toKebabCase(namespace);
-        this.c2jNamespace = SmithyC2JNamespaceMap.getC2JServiceName(this.folderNamespace);
+        this.c2jNamespace = SmithyC2JNamespaceMap.getInstance().getC2JServiceName(this.folderNamespace);
         this.coreHeaders = new HashSet<>();
         this.dynamicHeaders = new HashSet<>();
         Collections.addAll(coreHeaders, 

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppSymbolVisitor.java

@@ -5,9 +5,37 @@
 
  package com.amazonaws.util.awsclientsmithygenerator.generators;
 
- import software.amazon.smithy.codegen.core.*;
+ import software.amazon.smithy.codegen.core.Symbol;
+ import software.amazon.smithy.codegen.core.SymbolProvider;
+ import software.amazon.smithy.codegen.core.CodegenException;
  import software.amazon.smithy.model.Model;
- import software.amazon.smithy.model.shapes.*;
+ import software.amazon.smithy.model.shapes.OperationShape;
+ import software.amazon.smithy.model.shapes.ServiceShape;
+ import software.amazon.smithy.model.shapes.DocumentShape;
+ import software.amazon.smithy.model.shapes.LongShape;
+ import software.amazon.smithy.model.shapes.StringShape;
+ import software.amazon.smithy.model.shapes.MemberShape;
+ import software.amazon.smithy.model.shapes.UnionShape;
+ import software.amazon.smithy.model.shapes.ResourceShape;
+ import software.amazon.smithy.model.shapes.ByteShape;
+ import software.amazon.smithy.model.shapes.BlobShape;
+ import software.amazon.smithy.model.shapes.BooleanShape;
+ import software.amazon.smithy.model.shapes.ListShape;
+ import software.amazon.smithy.model.shapes.MapShape;
+ import software.amazon.smithy.model.shapes.IntEnumShape;
+ import software.amazon.smithy.model.shapes.DoubleShape;
+ import software.amazon.smithy.model.shapes.ShortShape;
+ import software.amazon.smithy.model.shapes.FloatShape;
+ import software.amazon.smithy.model.shapes.Shape;
+ import software.amazon.smithy.model.shapes.ShapeVisitor;
+ import software.amazon.smithy.model.shapes.EnumShape;
+ import software.amazon.smithy.model.shapes.TimestampShape;
+ import software.amazon.smithy.model.shapes.BigDecimalShape;
+ import software.amazon.smithy.model.shapes.BigIntegerShape;
+ import software.amazon.smithy.model.shapes.StructureShape;
+ import software.amazon.smithy.model.shapes.IntegerShape;
+
+
  import software.amazon.smithy.utils.StringUtils;
 
  import java.util.logging.Logger;

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/GenericCodegenAdapter.java

@@ -13,8 +13,6 @@ public interface GenericCodegenAdapter<SHAPE, DATA> {
 
     public SHAPE getShapeFromOperation(String OperationName);
 
-    //public boolean isEnum(DATA d);
-
     public boolean isFloat(DATA d);
 
     public boolean isBoolean(DATA d);
@@ -153,8 +151,7 @@ else if (isMap(value) && isMapShape(shape))
 
             //prepare function code and save it for the variable name
             //return only the function name
-            blockWriter.addCode(String.format("return %s;\n",varName))
-                .closeCodeBlock();
+            blockWriter.addCode(String.format("return %s;\n",varName)).closeCodeBlock();
             functionMap.put(functionName, blockWriter.getCode() );
             functionOrder.add(functionName);
             functionName = functionName.concat("()");
@@ -173,11 +170,9 @@ else if (isList(value) && isListShape(shape))
 
             String returnType = "Aws::Vector<"+listType+">";
             //open function body and use vector setter
-            CppBlockWriter blockWriter = new CppBlockWriter
-            (
-            CppBlockWriter.GetLambdaBlock(returnType, functionName), 0).
-            addCode(String.format("Aws::Vector<%s> %s = ",listType, varName))
-            .openCodeBlock("");
+            CppBlockWriter blockWriter = new CppBlockWriter(CppBlockWriter.GetLambdaBlock(returnType, functionName), 0)
+                        .addCode(String.format("Aws::Vector<%s> %s = ",listType, varName))
+                        .openCodeBlock("");
 
             for (int i = 0; i < list.size(); i++)
             {
@@ -213,7 +208,7 @@ else if (isString(value) && isEnumShape(shape))
         }
         else
         {
-            System.err.println(String.format("shape not supported:%s",shape));
+            throw new Exception(String.format("shape not supported:%s",shape));
         }
 
         return functionName;

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/SmokeTestsParser.java

@@ -39,7 +39,6 @@ public class SmokeTestsParser implements Runnable{
     final private CppSymbolVisitor symbolProvider;
     final private Map<ShapeId, String> operationToServiceMap;
     final private Map<String, ServiceShape> serviceShapeMap;
-    // Static member to store the flipped map
     final private  Set<String> serviceFilter;
 
     public SmokeTestsParser(PluginContext context)
@@ -109,8 +108,6 @@ public SmokeTestsParser(PluginContext context)
                     this.serviceShapeMap.put(serviceName, serviceShape);
                 });
         });
-
-        //System.out.println(String.format("Number of services with smoke tests detected=%d",serviceShapeMap.size()));
     }
 
     public static String removeSpaces(String input)
@@ -127,7 +124,6 @@ private String getServiceName(ServiceShape serviceShape) throws Exception
     {   
         if(!serviceShape.getTrait(ServiceTrait.class).isPresent())
         {
-            //System.err.println(String.format("No service trait detected in service shape with name=%s",serviceShape.getId().getName()));
             throw new Exception(String.format("No service trait detected in service shape with name=%s",serviceShape.getId().getName()));
         }
 
@@ -302,9 +298,6 @@ public Map<ServiceShape, List<SmokeTestData> > extractServiceSmokeTests()
             //get serviceShape
             String serviceName = operationToServiceMap.get(operationShape.getId());
             ServiceShape serviceShape = serviceShapeMap.get(serviceName);
-            //System.out.println("OperationShape: " + operationShape.getId().getName());
-            //System.out.println("serviceName: " + serviceName);
-
             //for one service, we have one smoke test file
             //So, we for a given service we import dependencies (symbol types and their respective headers)
             List<SmokeTestData> tests = serviceSmokeTestsMap.getOrDefault(serviceShape, new ArrayList<>());
@@ -323,7 +316,6 @@ public Map<ServiceShape, List<SmokeTestData> > extractServiceSmokeTests()
 
     @Override
     public void run(){
-        //System.out.println("run smoke tests parser");
 
         Map<ServiceShape, List<SmokeTestData> > smoketests =  extractServiceSmokeTests();
 
@@ -334,7 +326,7 @@ public void run(){
                 SmokeTestsCMakeDelegator cmakedelegator = new SmokeTestsCMakeDelegator(this.context.getFileManifest(), this.symbolProvider);
 
                 String client = getServiceName(serviceShape);
-                String c2jClientname = SmithyC2JNamespaceMap.getC2JServiceName(toKebabCase(client));
+                String c2jClientname = SmithyC2JNamespaceMap.getInstance().getC2JServiceName(toKebabCase(client));
 
                 Path relativePath = Paths.get(c2jClientname);
                 System.out.println(toKebabCase(client) + " mapped to " + c2jClientname);

tools/code-generation/smithy/codegen/cpp-smoke-tests-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/SmokeTestsSourceWriter.java

@@ -13,12 +13,11 @@ public final class SmokeTestsSourceWriter extends SymbolWriter<SmokeTestsSourceW
     private final String c2jNamespace;
     private final List<SmokeTestData> smoketests;
 
-    //protected CppBlockWriter blockWriter;    
     public SmokeTestsSourceWriter(String namespace,List<SmokeTestData> smoketests) {
         super(new CppImportContainer(namespace));
         this.clientNamespace = SmokeTestsParser.removeSpaces(namespace);
         this.folderNamespace = SmokeTestsParser.toKebabCase(namespace);
-        this.c2jNamespace = SmithyC2JNamespaceMap.getC2JServiceName(this.folderNamespace);
+        this.c2jNamespace = SmithyC2JNamespaceMap.getInstance().getC2JServiceName(this.folderNamespace);
         this.smoketests = smoketests;
     }
 
@@ -148,7 +147,7 @@ public String generate()
     }
 
     /**
-        * The Factory class for creating CppWriters
+     * The Factory class for creating CppWriters
      */
     public static final class SmokeTestsSourceWriterFactory implements SymbolWriter.Factory<SmokeTestsSourceWriter> {
         private final List<SmokeTestData> smoketests;

tools/code-generation/smithy/codegen/cpp-smoke-tests/build.gradle.kts

@@ -2,7 +2,6 @@ import software.amazon.smithy.model.Model
 import software.amazon.smithy.model.node.Node
 import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.aws.traits.ServiceTrait
-//import software.amazon.smithy.smoketests.traits.SmokeTestsTrait
 import software.amazon.smithy.model.shapes.OperationShape
 plugins {
     id("java-library")
@@ -19,7 +18,6 @@ buildscript {
         classpath(codegen.model)
         classpath(codegen.aws.traits)
         classpath(codegen.aws.smoke.test.model)
-        //classpath(codegen.velocity.engine.core)
     }
 }
 dependencies {
@@ -77,9 +75,7 @@ tasks.register("generate-smithy-build") {
                         .replace(" ", "-")   
                         .replace("_", "-")   
                         .lowercase()
-
-            //println("evaluating filter: $sdkId")
-
+
             //service names must be match
             if (filteredServiceList.isNotEmpty()) 
             {
@@ -89,8 +85,6 @@ tasks.register("generate-smithy-build") {
                 }
             }
 
-            //println("matched filter: $sdkId")
-
             val projectionContents = Node.objectNodeBuilder()
                     .withMember("imports", Node.fromStrings("${models.absolutePath}${File.separator}${file.name}"))
                     .withMember("plugins", Node.objectNode()

tools/scripts/run_code_generation.py

@@ -536,13 +536,11 @@ def main():
     highly_refined_percent_of_cores_to_take = 0.9
     max_workers = max(1, int(highly_refined_percent_of_cores_to_take * os.cpu_count()))
 
-    #build reverse map
-    # Open a file using 'with' and read its contents
+    #build reverse map of c2j to smithy since in this script we use c2j names for legacy services
     smithy_c2j_data = {}
     c2j_smithy_data = {}        
     with open(os.path.abspath(SMITHY_TO_C2J_MAP_FILE), 'r') as file:
         smithy_c2j_data = json.load(file)
-        # Reverse the key-value pairs
         c2j_smithy_data = {value: key for key, value in smithy_c2j_data.items()}
 
     with ProcessPoolExecutor(max_workers=max_workers) as executor: