changed parsers to be more generic

Author: kai-ion

…ors/PaginationCompilationTestParser.java …or/generators/CompilationTestParser.javatools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationCompilationTestParser.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CompilationTestParser.java tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationCompilationTestParser.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CompilationTestParser.java

@@ -7,42 +7,42 @@
 import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.model.shapes.*;
 import software.amazon.smithy.aws.traits.ServiceTrait;
-import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
-import com.amazonaws.util.awsclientsmithygenerator.generators.templates.PaginationCompilationTestGenerator;
-import com.amazonaws.util.awsclientsmithygenerator.generators.OperationData;
-import software.amazon.smithy.model.traits.PaginatedTrait;
+import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
 import java.util.*;
+import java.util.function.Consumer;
 
-public class PaginationCompilationTestParser {
+public class CompilationTestParser<T> {
     private final PluginContext context;
     private final ServiceShape service;
-    private final List<OperationData<PaginatedTrait>> paginatedOps;
+    private final List<T> operations;
     private final CppWriterDelegator writerDelegator;
+    private final String testType;
+    private final Consumer<CppWriter> renderFunction;
 
-    public PaginationCompilationTestParser(PluginContext context, ServiceShape service, List<OperationData<PaginatedTrait>> paginatedOps) {
+    public CompilationTestParser(PluginContext context, ServiceShape service, List<T> operations, 
+                                String testType, Consumer<CppWriter> renderFunction) {
         this.context = context;
         this.service = service;
-        this.paginatedOps = paginatedOps;
+        this.operations = operations;
         this.writerDelegator = new CppWriterDelegator(context.getFileManifest());
+        this.testType = testType;
+        this.renderFunction = renderFunction;
     }
 
     public void run() {
-        List<ServiceShape> services = List.of(service);
-        generateSingleHeaderCompilationTest(services, paginatedOps);
+        generateCompilationTest();
         writerDelegator.flushWriters();
     }
 
-    private void generateSingleHeaderCompilationTest(List<ServiceShape> services, List<OperationData<PaginatedTrait>> allPaginatedOps) {
+    private void generateCompilationTest() {
         String serviceName = getServiceName(service);
         String c2jServiceName = getC2jServiceName(service);
 
-        // Generate single compilation test for all pagination headers in service's client-gen-tests
         writerDelegator.useFileWriter(
-            "generated/tests/" + c2jServiceName + "-gen-tests/" + serviceName + "PaginationCompilationTests.cpp",
-            writer -> new PaginationCompilationTestGenerator(services, allPaginatedOps).render(writer)
+            "generated/tests/" + c2jServiceName + "-gen-tests/" + serviceName + testType + "CompilationTests.cpp",
+            renderFunction
         );
     }
-
 
     private String getServiceName(ServiceShape service) {
         return service.getTrait(ServiceTrait.class)

tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/CppWriter.java

@@ -28,15 +28,18 @@ public CppWriter() {
         });
     }
 
-    public void writeInclude(String header) {
+    public CppWriter writeInclude(String header) {
         write("#include <$L>", header);
+        return this;
     }
 
-    public void writeNamespaceOpen(String namespace) {
+    public CppWriter writeNamespaceOpen(String namespace) {
         write("namespace $L\n{", namespace);
+        return this;
     }
 
-    public void writeNamespaceClose(String namespace) {
+    public CppWriter writeNamespaceClose(String namespace) {
         write("} // namespace $L", namespace);
+        return this;
     }
 }

…nerator/generators/PaginationParser.java …ygenerator/generators/FeatureParser.javatools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationParser.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/FeatureParser.java tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationParser.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/FeatureParser.java

@@ -10,26 +10,24 @@
 import software.amazon.smithy.model.node.ObjectNode;
 import software.amazon.smithy.model.shapes.*;
 import software.amazon.smithy.aws.traits.ServiceTrait;
-import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriterDelegator;
-import com.amazonaws.util.awsclientsmithygenerator.generators.OperationData;
-import software.amazon.smithy.model.traits.PaginatedTrait;
-import com.amazonaws.util.awsclientsmithygenerator.generators.PaginationHeaderWriter;
-import com.amazonaws.util.awsclientsmithygenerator.generators.templates.PaginationClientTemplate;
 import java.util.*;
+import java.util.function.Consumer;
 
-public class PaginationParser {
+public class FeatureParser<T> {
     private final PluginContext context;
     private final Model model;
     private final ServiceShape service;
-    private final List<OperationData<PaginatedTrait>> paginatedOps;
+    private final List<T> operations;
     private final CppWriterDelegator writerDelegator;
-    private Map<String, String> c2jMap;
+    private final Map<String, String> c2jMap;
+    private final String featureName;
 
-    public PaginationParser(PluginContext context, ServiceShape service, List<OperationData<PaginatedTrait>> paginatedOps) {
+    public FeatureParser(PluginContext context, ServiceShape service, List<T> operations, String featureName) {
         this.context = context;
         this.model = context.getModel();
         this.service = service;
-        this.paginatedOps = paginatedOps;
+        this.operations = operations;
+        this.featureName = featureName;
         this.writerDelegator = new CppWriterDelegator(context.getFileManifest());
 
         // Initialize c2j map
@@ -47,26 +45,28 @@ public PaginationParser(PluginContext context, ServiceShape service, List<Operat
         }
     }
 
-    public void run() {
-        generatePaginationFiles(service, paginatedOps);
+    public void run(Consumer<FeatureParser<T>> generationLogic) {
+        generationLogic.accept(this);
         writerDelegator.flushWriters();
     }
 
-    private void generatePaginationFiles(ServiceShape service, List<OperationData<PaginatedTrait>> paginatedOps) {
+    public void generateClientHeader(String fileName, Consumer<CppWriter> generator) {
         String serviceName = getServiceName(service);
         String c2jServiceName = getC2jServiceName(service);
 
-        // Generate client pagination header
         writerDelegator.useFileWriter(
-            "include/aws/" + c2jServiceName + "/" + serviceName + "ClientPagination.h",
-            writer -> new PaginationClientTemplate(service, paginatedOps).render(writer)
+            "include/aws/" + c2jServiceName + "/" + fileName,
+            generator
         );
-        
-        // Generate pagination traits headers
-        PaginationHeaderWriter headerWriter = new PaginationHeaderWriter(context, service, paginatedOps, c2jServiceName);
-        headerWriter.write();
     }
 
+    public PluginContext getContext() { return context; }
+    public ServiceShape getService() { return service; }
+    public List<T> getOperations() { return operations; }
+    public String getFeatureName() { return featureName; }
+    public String getServiceName() { return getServiceName(service); }
+    public String getC2jServiceName() { return getC2jServiceName(service); }
+    
     private String getServiceName(ServiceShape service) {
         return service.getTrait(ServiceTrait.class)
             .map(ServiceTrait::getSdkId)
@@ -85,4 +85,4 @@ private String getC2jServiceName(ServiceShape service) {
 
         return c2jMap.getOrDefault(sdkId, sdkId);
     }
-}
+}

tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationCodegenPlugin.java

@@ -10,8 +10,11 @@
 import software.amazon.smithy.model.traits.PaginatedTrait;
 import software.amazon.smithy.model.shapes.*;
 import com.amazonaws.util.awsclientsmithygenerator.generators.OperationData;
+import com.amazonaws.util.awsclientsmithygenerator.generators.FeatureParser;
+import com.amazonaws.util.awsclientsmithygenerator.generators.templates.PaginationTraitsGenerator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.templates.PaginationClientHeaderGenerator;
+import com.amazonaws.util.awsclientsmithygenerator.generators.templates.PaginationCompilationTestGenerator;
 import software.amazon.smithy.model.traits.PaginatedTrait;
-import com.amazonaws.util.awsclientsmithygenerator.generators.PaginationCompilationTestParser;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,12 +38,29 @@ public void execute(PluginContext context) {
 
             if (!paginatedOps.isEmpty()) {
                 // Generate pagination files
-                PaginationParser parser = new PaginationParser(context, service, paginatedOps);
-                parser.run();
+                FeatureParser<OperationData<PaginatedTrait>> parser = new FeatureParser<>(context, service, paginatedOps, "Pagination");
+                parser.run(featureParser -> {
+                    String serviceName = featureParser.getServiceName();
+                    
+                    // Generate client pagination header
+                    featureParser.generateClientHeader(
+                        serviceName + "ClientPagination.h",
+                        writer -> new PaginationClientHeaderGenerator(featureParser.getService(), featureParser.getOperations()).render(writer)
+                    );
+                    
+                    // Generate pagination traits headers
+                    PaginationTraitsGenerator headerWriter = new PaginationTraitsGenerator(
+                        featureParser.getContext(), 
+                        featureParser.getService(), 
+                        featureParser.getOperations(), 
+                        featureParser.getC2jServiceName()
+                    );
+                    headerWriter.write();
+                });
 
                 // Generate header compilation test
-                PaginationCompilationTestParser headerParser = new PaginationCompilationTestParser(context, service, paginatedOps);
-                headerParser.run();
+                PaginationCompilationTestGenerator headerGenerator = new PaginationCompilationTestGenerator(context, service, paginatedOps);
+                headerGenerator.run();
             }
         }
     }

tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/PaginationHeaderWriter.java

@@ -11,11 +11,11 @@
 import software.amazon.smithy.model.traits.PaginatedTrait;
 import java.util.List;
 
-public class PaginationClientTemplate {
+public class PaginationClientHeaderGenerator {
     private final ServiceShape service;
     private final List<OperationData<PaginatedTrait>> paginatedOps;
 
-    public PaginationClientTemplate(ServiceShape service, List<OperationData<PaginatedTrait>> paginatedOps) {
+    public PaginationClientHeaderGenerator(ServiceShape service, List<OperationData<PaginatedTrait>> paginatedOps) {
         this.service = service;
         this.paginatedOps = paginatedOps;
     }

…/templates/PaginationClientTemplate.java …tes/PaginationClientHeaderGenerator.javatools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/templates/PaginationClientTemplate.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/templates/PaginationClientHeaderGenerator.java tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/templates/PaginationClientTemplate.java renamed to tools/code-generation/smithy/codegen/cpp-pagination-codegen/src/main/java/com/amazonaws/util/awsclientsmithygenerator/generators/templates/PaginationClientHeaderGenerator.java

@@ -4,23 +4,37 @@
  */
 package com.amazonaws.util.awsclientsmithygenerator.generators.templates;
 
+import software.amazon.smithy.build.PluginContext;
 import software.amazon.smithy.model.shapes.*;
 import com.amazonaws.util.awsclientsmithygenerator.generators.CppWriter;
+import com.amazonaws.util.awsclientsmithygenerator.generators.CompilationTestParser;
 import com.amazonaws.util.awsclientsmithygenerator.generators.OperationData;
 import software.amazon.smithy.model.traits.PaginatedTrait;
 import java.util.*;
 
 public class PaginationCompilationTestGenerator {
-    private final List<ServiceShape> services;
+    private final CompilationTestParser<OperationData<PaginatedTrait>> parser;
     private final List<OperationData<PaginatedTrait>> allPaginatedOps;
 
-    public PaginationCompilationTestGenerator(List<ServiceShape> services, List<OperationData<PaginatedTrait>> allPaginatedOps) {
-        this.services = services;
+    public PaginationCompilationTestGenerator(PluginContext context, ServiceShape service, List<OperationData<PaginatedTrait>> allPaginatedOps) {
         this.allPaginatedOps = allPaginatedOps;
+        this.parser = new CompilationTestParser<>(
+            context,
+            service,
+            allPaginatedOps,
+            "Pagination",
+            this::render
+        );
+    }
+
+    public void run() {
+        parser.run();
     }
 
     public void render(CppWriter writer) {
-        String serviceName = getServiceName(services.get(0));
+        // Get service from the first operation since all operations belong to the same service
+        ServiceShape service = allPaginatedOps.get(0).getService();
+        String serviceName = getServiceName(service);
 
         writer.write("/**")
               .write(" * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.")
@@ -72,4 +86,5 @@ private String getServiceName(ServiceShape service) {
             .replace("-", "");
     }
 
+
 }