Throw invalid model for lowercase shape names

Author: dagnir

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/LowercaseShapeValidatorProcessor.java

@@ -18,6 +18,10 @@
 import software.amazon.awssdk.codegen.customization.CodegenCustomizationProcessor;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.validation.ModelInvalidException;
+import software.amazon.awssdk.codegen.validation.ValidationEntry;
+import software.amazon.awssdk.codegen.validation.ValidationErrorId;
+import software.amazon.awssdk.codegen.validation.ValidationErrorSeverity;
 
 /**
  * A processor that validates shape names in service models to ensure they start with uppercase letters.
@@ -31,11 +35,12 @@ public void preprocess(ServiceModel serviceModel) {
 
         serviceModel.getShapes().forEach((shapeName, shape) -> {
             if ("structure".equals(shape.getType()) && Character.isLowerCase(shapeName.charAt(0))) {
-                throw new IllegalStateException(
-                    String.format("Shape name '%s' starts with a lowercase character." +
-                                  "Shape names must start with an uppercase character." +
-                                  "Please update the shape name in your service model",
-                                  shapeName));
+                String errorMsg = String.format("Shape name '%s' starts with a lowercase character. Shape names must start with"
+                                                + " an uppercase character. Please update the shape name in your service model",
+                                                shapeName);
+                ValidationEntry entry = ValidationEntry.create(ValidationErrorId.INVALID_IDENTIFIER_NAME,
+                                                               ValidationErrorSeverity.DANGER, errorMsg);
+                throw ModelInvalidException.fromEntry(entry);
             }
         });
     }

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

@@ -28,7 +28,9 @@ public enum ValidationErrorId {
     UNKNOWN_OPERATION("The model references an unknown operation."),
     INVALID_IDENTIFIER_NAME("The model contains an invalid or non-idiomatic name or identifier."),
     SHARED_EVENTSTREAM_EVENT("Event shape shared between multiple EventStreams. "
-                             + "Missing duplicateAndRenameSharedEvents customization.");
+                             + "Missing duplicateAndRenameSharedEvents customization."),
+
+    INVALID_SHAPE_NAME("The model contains an invalid shape name.");
 
     private final String description;
 

codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/LowercaseShapeValidatorProcessorTest.java

@@ -23,6 +23,10 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
 import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+import software.amazon.awssdk.codegen.validation.ModelInvalidException;
+import software.amazon.awssdk.codegen.validation.ValidationEntry;
+import software.amazon.awssdk.codegen.validation.ValidationErrorId;
+import software.amazon.awssdk.codegen.validation.ValidationErrorSeverity;
 
 public class LowercaseShapeValidatorProcessorTest {
 
@@ -40,7 +44,14 @@ public static void setUp() throws IOException {
     @Test
     public void preprocess_serviceWithLowercaseShape_throwsException() {
         assertThatThrownBy(() -> processor.preprocess(serviceModel))
-            .isInstanceOf(IllegalStateException.class)
-            .hasMessageContaining("Shape name 'lowercaseshape' starts with a lowercase character");
+            .isInstanceOf(ModelInvalidException.class)
+            .hasMessageContaining("Shape name 'lowercaseshape' starts with a lowercase character")
+            .matches(e -> {
+                ModelInvalidException modelInvalid = (ModelInvalidException) e;
+                ValidationEntry entry = modelInvalid.validationEntries().get(0);
+
+                return entry.getErrorId() == ValidationErrorId.INVALID_IDENTIFIER_NAME &&
+                       entry.getSeverity() == ValidationErrorSeverity.DANGER;
+            }, "Validation entry details are correct");
     }
 }