Delete codegen config related files

Author: varunnvs92

codegen-maven-plugin/src/main/java/software/amazon/awssdk/codegen/maven/plugin/GenerationMojo.java

@@ -31,7 +31,6 @@
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.CodeGenerator;
 import software.amazon.awssdk.codegen.internal.Utils;
-import software.amazon.awssdk.codegen.model.config.BasicCodeGenConfig;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.ServiceExamples;
 import software.amazon.awssdk.codegen.model.service.Paginators;
@@ -46,7 +45,6 @@
 public class GenerationMojo extends AbstractMojo {
 
     private static final String MODEL_FILE = "service-2.json";
-    private static final String CODE_GEN_CONFIG_FILE = "codegen.config";
     private static final String CUSTOMIZATION_CONFIG_FILE = "customization.config";
     private static final String EXAMPLES_FILE = "examples-1.json";
     private static final String WAITERS_FILE = "waiters-2.json";
@@ -71,7 +69,6 @@ public void execute() throws MojoExecutionException {
         findModelRoots().forEach(p -> {
             getLog().info("Loading from: " + p.toString());
             generateCode(C2jModels.builder()
-                                  .applyMutation(b -> loadCodeGenConfig(p).ifPresent(b::codeGenConfig))
                                   .customizationConfig(loadCustomizationConfig(p))
                                   .serviceModel(loadServiceModel(p))
                                   .waitersModel(loadWaiterModel(p))
@@ -111,10 +108,6 @@ private void generateCode(C2jModels models) {
                      .execute();
     }
 
-    private Optional<BasicCodeGenConfig> loadCodeGenConfig(Path root) {
-        return loadOptionalModel(BasicCodeGenConfig.class, root.resolve(CODE_GEN_CONFIG_FILE));
-    }
-
     private CustomizationConfig loadCustomizationConfig(Path root) {
         return ModelLoaderUtils.loadOptionalModel(CustomizationConfig.class,
                                                   root.resolve(CUSTOMIZATION_CONFIG_FILE).toFile(),

codegen/src/main/java/software/amazon/awssdk/codegen/AddMetadata.java

@@ -16,8 +16,6 @@
 package software.amazon.awssdk.codegen;
 
 import software.amazon.awssdk.codegen.internal.Constant;
-import software.amazon.awssdk.codegen.internal.Utils;
-import software.amazon.awssdk.codegen.model.config.BasicCodeGenConfig;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.Metadata;
 import software.amazon.awssdk.codegen.model.intermediate.Protocol;
@@ -39,7 +37,6 @@ private AddMetadata() {
 
 
     public static Metadata constructMetadata(ServiceModel serviceModel,
-                                             BasicCodeGenConfig codeGenConfig,
                                              CustomizationConfig customizationConfig) {
 
         Metadata metadata = new Metadata();
@@ -50,18 +47,17 @@ public static Metadata constructMetadata(ServiceModel serviceModel,
         String serviceName;
         String rootPackageName;
 
-        // API Gateway uses additional codegen.config settings
         if (serviceMetadata.getProtocol().equals(Protocol.API_GATEWAY.getValue())) {
-            // TODO: The meaning of root package name has changed a bit since this code was written. Specifically, the root for
-            // AWS no longer includes the service name. This changed the behavior of the API gateway generation, but we're not
-            // keeping it up to date at this time. Just be aware this has happened when updating the API gateway code.
-            serviceName = codeGenConfig.getInterfaceName();
-            rootPackageName = codeGenConfig.getPackageName();
-
-            metadata.withDefaultEndpoint(codeGenConfig.getEndpoint())
-                    .withDefaultEndpointWithoutHttpProtocol(
-                            Utils.getDefaultEndpointWithoutHttpProtocol(codeGenConfig.getEndpoint()))
-                    .withDefaultRegion(codeGenConfig.getDefaultRegion());
+            // TODO: We don't use codegen config for aws services in v2. Revisit this code when we support
+            // API gateway generation in V2
+            //            serviceName = codeGenConfig.getInterfaceName();
+            //            rootPackageName = codeGenConfig.getPackageName();
+            //
+            //            metadata.withDefaultEndpoint(codeGenConfig.getEndpoint())
+            //                    .withDefaultEndpointWithoutHttpProtocol(
+            //                            Utils.getDefaultEndpointWithoutHttpProtocol(codeGenConfig.getEndpoint()))
+            //                    .withDefaultRegion(codeGenConfig.getDefaultRegion());
+            throw new UnsupportedOperationException("Java SDK V2 doesn't support api-gateway protocol yet");
         } else {
             serviceName = namingStrategy.getServiceName();
             rootPackageName = AWS_PACKAGE_PREFIX;

codegen/src/main/java/software/amazon/awssdk/codegen/C2jModels.java

@@ -15,7 +15,6 @@
 
 package software.amazon.awssdk.codegen;
 
-import software.amazon.awssdk.codegen.model.config.BasicCodeGenConfig;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.ServiceExamples;
 import software.amazon.awssdk.codegen.model.service.Paginators;
@@ -31,17 +30,17 @@ public class C2jModels {
     private final ServiceModel serviceModel;
     private final Waiters waitersModel;
     private final ServiceExamples examplesModel;
-    private final BasicCodeGenConfig codeGenConfig;
     private final CustomizationConfig customizationConfig;
     private final Paginators paginatorsModel;
 
-    private C2jModels(ServiceModel serviceModel, Waiters waitersModel, ServiceExamples examplesModel,
-                      BasicCodeGenConfig codeGenConfig, CustomizationConfig customizationConfig,
+    private C2jModels(ServiceModel serviceModel,
+                      Waiters waitersModel,
+                      ServiceExamples examplesModel,
+                      CustomizationConfig customizationConfig,
                       Paginators paginatorsModel) {
         this.serviceModel = serviceModel;
         this.waitersModel = waitersModel;
         this.examplesModel = examplesModel;
-        this.codeGenConfig = codeGenConfig;
         this.customizationConfig = customizationConfig;
         this.paginatorsModel = paginatorsModel;
     }
@@ -62,10 +61,6 @@ public ServiceExamples examplesModel() {
         return examplesModel;
     }
 
-    public BasicCodeGenConfig codeGenConfig() {
-        return codeGenConfig;
-    }
-
     public CustomizationConfig customizationConfig() {
         return customizationConfig;
     }
@@ -79,7 +74,6 @@ public static class Builder implements SdkBuilder<Builder, C2jModels> {
         private ServiceModel serviceModel;
         private Waiters waitersModel;
         private ServiceExamples examplesModel;
-        private BasicCodeGenConfig codeGenConfig;
         private CustomizationConfig customizationConfig;
         private Paginators paginatorsModel;
 
@@ -101,11 +95,6 @@ public Builder examplesModel(ServiceExamples examplesModel) {
             return this;
         }
 
-        public Builder codeGenConfig(BasicCodeGenConfig codeGenConfig) {
-            this.codeGenConfig = codeGenConfig;
-            return this;
-        }
-
         public Builder customizationConfig(CustomizationConfig customizationConfig) {
             this.customizationConfig = customizationConfig;
             return this;
@@ -120,7 +109,7 @@ public C2jModels build() {
             Waiters waiters = waitersModel != null ? waitersModel : Waiters.none();
             Paginators paginators = paginatorsModel != null ? paginatorsModel : Paginators.none();
             ServiceExamples examples = examplesModel != null ? examplesModel : ServiceExamples.none();
-            return new C2jModels(serviceModel, waiters, examples, codeGenConfig, customizationConfig, paginators);
+            return new C2jModels(serviceModel, waiters, examples, customizationConfig, paginators);
         }
     }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java

@@ -31,7 +31,6 @@
 import software.amazon.awssdk.codegen.internal.Constant;
 import software.amazon.awssdk.codegen.internal.TypeUtils;
 import software.amazon.awssdk.codegen.internal.Utils;
-import software.amazon.awssdk.codegen.model.config.BasicCodeGenConfig;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.intermediate.AuthorizerModel;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
@@ -55,7 +54,6 @@ public class IntermediateModelBuilder {
 
     private static final Logger log = LoggerFactory.getLogger(IntermediateModelBuilder.class);
     private final CustomizationConfig customConfig;
-    private final BasicCodeGenConfig codeGenConfig;
     private final ServiceModel service;
     private final ServiceExamples examples;
     private final NamingStrategy namingStrategy;
@@ -65,7 +63,6 @@ public class IntermediateModelBuilder {
 
     public IntermediateModelBuilder(C2jModels models) {
         this.customConfig = models.customizationConfig();
-        this.codeGenConfig = models.codeGenConfig();
         this.service = models.serviceModel();
         this.examples = models.examplesModel();
         this.namingStrategy = new DefaultNamingStrategy(service, customConfig);
@@ -117,7 +114,7 @@ public IntermediateModel build() {
         log.info("{} shapes found in total.", shapes.size());
 
         IntermediateModel fullModel = new IntermediateModel(
-            constructMetadata(service, codeGenConfig, customConfig), operations, shapes,
+            constructMetadata(service, customConfig), operations, shapes,
             customConfig, examples, authorizers, paginators.getPaginators(), namingStrategy);
 
         customization.postprocess(fullModel);
@@ -261,10 +258,6 @@ public CustomizationConfig getCustomConfig() {
         return customConfig;
     }
 
-    public BasicCodeGenConfig codeGenConfig() {
-        return codeGenConfig;
-    }
-
     public ServiceModel getService() {
         return service;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/internal/Constant.java

@@ -17,8 +17,6 @@
 
 public final class Constant {
 
-    public static final String CODEGEN_CONFIG_FILE = "codegen.config";
-
     public static final String CUSTOMIZATION_CONFIG_FILE = "customization.config";
 
     public static final String ASYNC_CLIENT_INTERFACE_NAME_PATTERN = "%sAsyncClient";