Adding valitation errors for when both underscore configs are supplied

Author: RanVaknin

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

@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ForkJoinTask;
 import software.amazon.awssdk.codegen.emitters.GeneratorTask;
@@ -29,6 +29,7 @@
 import software.amazon.awssdk.codegen.internal.Jackson;
 import software.amazon.awssdk.codegen.internal.Utils;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.validation.CustomizationConfigValidator;
 import software.amazon.awssdk.codegen.validation.ModelInvalidException;
 import software.amazon.awssdk.codegen.validation.ModelValidationContext;
 import software.amazon.awssdk.codegen.validation.ModelValidationReport;
@@ -41,8 +42,9 @@ public class CodeGenerator {
     private static final Logger log = Logger.loggerFor(CodeGenerator.class);
     private static final String MODEL_DIR_NAME = "models";
 
-    private static final List<ModelValidator> DEFAULT_MODEL_VALIDATORS = Collections.singletonList(
-        new SharedModelsValidator()
+    private static final List<ModelValidator> DEFAULT_MODEL_VALIDATORS = Arrays.asList(
+            new SharedModelsValidator(),
+            new CustomizationConfigValidator()
     );
 
     private final C2jModels c2jModels;

codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

@@ -499,13 +499,12 @@ private void validateCustomerVisibleName(String name, String location) {
         }
 
         if (name.contains("_")) {
+            UnderscoresInNameBehavior behavior = customizationConfig.getUnderscoresInNameBehavior();
             List<String> allowedNames = customizationConfig.getAllowedUnderscoreNames();
             if (allowedNames != null && allowedNames.contains(name)) {
                 return;
             }
 
-            UnderscoresInNameBehavior behavior = customizationConfig.getUnderscoresInNameBehavior();
-
             String supportedBehaviors = Arrays.toString(UnderscoresInNameBehavior.values());
             if (behavior == null) {
                 throw ModelInvalidException.fromEntry(ValidationEntry.create(

codegen/src/main/java/software/amazon/awssdk/codegen/validation/CustomizationConfigValidator.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.codegen.validation;
+
+import java.util.Collections;
+import java.util.List;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.config.customization.UnderscoresInNameBehavior;
+
+public class CustomizationConfigValidator implements ModelValidator{
+    @Override
+    public List<ValidationEntry> validateModels(ModelValidationContext context) {
+        CustomizationConfig config = context.intermediateModel().getCustomizationConfig();
+
+        if (config.getUnderscoresInNameBehavior() == UnderscoresInNameBehavior.ALLOW &&
+            config.getAllowedUnderscoreNames() != null &&
+            !config.getAllowedUnderscoreNames().isEmpty()) {
+
+            return Collections.singletonList(
+                ValidationEntry.create(
+                    ValidationErrorId.INVALID_CODEGEN_CUSTOMIZATION,
+                    ValidationErrorSeverity.DANGER,
+                    "Cannot set both 'underscoresInNameBehavior=ALLOW' and 'allowedUnderscoreNames'. " +
+                    "Use 'allowedUnderscoreNames' for granular control or 'underscoresInNameBehavior=ALLOW' for all underscores."
+                )
+            );
+        }
+
+        return Collections.emptyList();
+    }
+
+}

codegen/src/test/java/software/amazon/awssdk/codegen/CodeGeneratorTest.java

@@ -41,6 +41,7 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.codegen.internal.Jackson;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.config.customization.UnderscoresInNameBehavior;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.rules.endpoints.EndpointTestSuiteModel;
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
@@ -97,6 +98,24 @@ void execute_invokesModelValidators() {
         verify(mockValidator).validateModels(any());
     }
 
+    @Test
+    void execute_conflictingUnderscoreConfigs_throwsValidationError() {
+        CustomizationConfig config = CustomizationConfig.create();
+        config.setAllowedUnderscoreNames(Collections.singletonList("foo_bar"));
+        config.setUnderscoresInNameBehavior(UnderscoresInNameBehavior.ALLOW);
+
+        C2jModels referenceModels = ClientTestModels.awsJsonServiceC2jModels();
+
+        C2jModels modelsWithConflict = C2jModels.builder()
+                 .customizationConfig(config)
+                 .serviceModel(referenceModels.serviceModel())
+                 .build();
+
+        assertThatThrownBy(() -> generateCodeFromC2jModels(modelsWithConflict, outputDir))
+            .isInstanceOf(RuntimeException.class)
+            .hasMessageContaining("Validation failed");
+    }
+
     @Test
     void execute_c2jModelsAndIntermediateModel_generateSameCode() throws IOException {
         Path c2jModelsOutputDir = outputDir.resolve("c2jModels");