feat: Add new --discriminator-casing argument to specify default casing when no mapping exists

Author: ludovicianul

src/main/java/dev/dochia/cli/core/args/ProcessingArguments.java

@@ -128,6 +128,10 @@ public class ProcessingArguments {
             description = "When set to @|bold true|@, runs a minimal health check using the 'health-check' profile to verify API endpoints are reachable before full testing. Default: @|bold,underline ${DEFAULT-VALUE}|@")
     private boolean healthCheck;
 
+    @Setter
+    @CommandLine.Option(names = {"--discriminator-casing"},
+            description = "The casing convention used for discriminator values when no explicit enum or mapping is defined. Supported values: @|bold PascalCase|@, @|bold camelCase|@, @|bold UPPER_SNAKE_CASE|@, @|bold lower_snake_case|@, @|bold kebab-case|@, @|bold lowercase|@. Default: @|bold,underline ${DEFAULT-VALUE}|@")
+    private String discriminatorCasing = "UPPER_SNAKE_CASE";
 
 
     /**

src/main/java/dev/dochia/cli/core/factory/PlaybookDataFactory.java

@@ -563,7 +563,7 @@ static boolean hasContent(Operation operation) {
 
     private GenerationResult getRequestPayloadsSamples(MediaType mediaType, String reqSchemaName) {
         OpenAPIModelGenerator generator = new OpenAPIModelGenerator(globalContext, validDataFormat, processingArguments.examplesFlags(),
-                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), REQUEST_ARRAY_SIZE);
+                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), REQUEST_ARRAY_SIZE, processingArguments.getDiscriminatorCasing());
 
         /* Event though the media type might have an example set, we still generate samples in order to properly map each field with its corresponding data type*/
         List<String> result = this.generateSample(reqSchemaName, generator);
@@ -687,7 +687,8 @@ private Map<String, List<String>> getResponseContentTypes(Operation operation) {
     private Map<String, List<String>> getResponsePayloads(Operation operation) {
         Map<String, List<String>> responses = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         OpenAPIModelGenerator generator = new OpenAPIModelGenerator(globalContext, validDataFormat, processingArguments.examplesFlags(),
-                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), RESPONSES_ARRAY_SIZE, processingArguments.isResolveXxxOfCombinationForResponses());
+                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), RESPONSES_ARRAY_SIZE,
+                processingArguments.isResolveXxxOfCombinationForResponses(), processingArguments.getDiscriminatorCasing());
 
         for (String responseCode : operation.getResponses().keySet()) {
             List<String> openapiExamples = this.getExamplesFromApiResponseForResponseCode(operation, responseCode);
@@ -803,7 +804,7 @@ private void inlineSchemaIfNeeded(Parameter parameter) {
         parameter.setSchema(schema);
 
         List<String> examples = this.generateSample(schema.get$ref(), new OpenAPIModelGenerator(globalContext, validDataFormat, processingArguments.examplesFlags(),
-                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), REQUEST_ARRAY_SIZE));
+                processingArguments.getSelfReferenceDepth(), processingArguments.isUseDefaults(), REQUEST_ARRAY_SIZE, processingArguments.getDiscriminatorCasing()));
 
         schema.setExample(examples.getFirst());
     }

src/main/java/dev/dochia/cli/core/openapi/OpenAPIModelGenerator.java

@@ -25,7 +25,21 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -76,36 +90,54 @@ public class OpenAPIModelGenerator {
     private final boolean resolveAnyOfAsMultipleSchema;
     private int currentPropertiesDepth;
     private final int totalDepth;
+    private final String discriminatorCasing;
 
     /**
-     * Constructs an OpenAPIModelGeneratorV2 with the specified configuration.
+     * Constructs an OpenAPIModelGenerator with the specified configuration.
      * The default value for {@code resolveAnyOfAsMultipleSchema=true}. The default value for {@code totalDepth=200}.
      *
-     * @param globalContext       The global context.
+     * @param globalContext   The global context for DOCHIA.
      * @param validDataFormat     The format to use for generating valid data.
      * @param useExamplesArgument Flag indicating whether to use examples from the OpenAPI specification.
      * @param selfReferenceDepth  The maximum depth for generating self-referencing models.
      * @param useDefaults         Whether to use default values if available
      * @param maxArraySize        The maximum size for arrays
      */
     public OpenAPIModelGenerator(GlobalContext globalContext, ValidDataFormat validDataFormat, ProcessingArguments.ExamplesFlags useExamplesArgument, int selfReferenceDepth, boolean useDefaults, int maxArraySize) {
+        this(globalContext, validDataFormat, useExamplesArgument, selfReferenceDepth, useDefaults, maxArraySize, "UPPER_SNAKE_CASE");
+    }
+
+    /**
+     * Constructs an OpenAPIModelGenerator with the specified configuration.
+     * The default value for {@code resolveAnyOfAsMultipleSchema=true}. The default value for {@code totalDepth=200}.
+     *
+     * @param globalContext       The global context for dochia.
+     * @param validDataFormat     The format to use for generating valid data.
+     * @param useExamplesArgument Flag indicating whether to use examples from the OpenAPI specification.
+     * @param selfReferenceDepth  The maximum depth for generating self-referencing models.
+     * @param useDefaults         Whether to use default values if available
+     * @param maxArraySize        The maximum size for arrays
+     * @param discriminatorCasing The casing convention for discriminator values
+     */
+    public OpenAPIModelGenerator(GlobalContext globalContext, ValidDataFormat validDataFormat, ProcessingArguments.ExamplesFlags useExamplesArgument, int selfReferenceDepth, boolean useDefaults, int maxArraySize, String discriminatorCasing) {
         this.globalContext = globalContext;
-        this.random = CommonUtils.random();
+        this.random = DochiaRandom.instance();
         this.examplesFlags = useExamplesArgument;
         this.selfReferenceDepth = selfReferenceDepth;
         this.validDataFormat = validDataFormat;
         this.callStackCounter = new HashMap<>();
         this.useDefaults = useDefaults;
         this.maxArraySize = maxArraySize;
+        this.discriminatorCasing = discriminatorCasing;
 
         this.resolveAnyOfAsMultipleSchema = true;
         this.totalDepth = REQUEST_TOTAL_DEPTH;
     }
 
     /**
-     * Constructs an OpenAPIModelGeneratorV2 with the specified configuration. The default value for {@code totalDepth=50}
+     * Constructs an OpenAPIModelGenerator with the specified configuration. The default value for {@code totalDepth=50}
      *
-     * @param globalContext                The global context.
+     * @param globalContext            The global context for DOCHIA.
      * @param validDataFormat              The format to use for generating valid data.
      * @param useExamplesArgument          Flag indicating whether to use examples from the OpenAPI specification.
      * @param selfReferenceDepth           The maximum depth for generating self-referencing models.
@@ -114,15 +146,32 @@ public OpenAPIModelGenerator(GlobalContext globalContext, ValidDataFormat validD
      * @param maxArraySize                 The maximum size for arrays
      */
     public OpenAPIModelGenerator(GlobalContext globalContext, ValidDataFormat validDataFormat, ProcessingArguments.ExamplesFlags useExamplesArgument, int selfReferenceDepth, boolean useDefaults, int maxArraySize, boolean resolveAnyOfAsMultipleSchema) {
+        this(globalContext, validDataFormat, useExamplesArgument, selfReferenceDepth, useDefaults, maxArraySize, resolveAnyOfAsMultipleSchema, "UPPER_SNAKE_CASE");
+    }
+
+    /**
+     * Constructs an OpenAPIModelGenerator with the specified configuration. The default value for {@code totalDepth=50}
+     *
+     * @param globalContext            The global context for DOCHIA.
+     * @param validDataFormat              The format to use for generating valid data.
+     * @param useExamplesArgument          Flag indicating whether to use examples from the OpenAPI specification.
+     * @param selfReferenceDepth           The maximum depth for generating self-referencing models.
+     * @param resolveAnyOfAsMultipleSchema If true it will resolve all combinations of oneOf/anyOf schemas
+     * @param useDefaults                  Whether to use default values if available
+     * @param maxArraySize                 The maximum size for arrays
+     * @param discriminatorCasing          The casing convention for discriminator values
+     */
+    public OpenAPIModelGenerator(GlobalContext globalContext, ValidDataFormat validDataFormat, ProcessingArguments.ExamplesFlags useExamplesArgument, int selfReferenceDepth, boolean useDefaults, int maxArraySize, boolean resolveAnyOfAsMultipleSchema, String discriminatorCasing) {
         this.globalContext = globalContext;
-        this.random = CommonUtils.random();
+        this.random = DochiaRandom.instance();
         this.examplesFlags = useExamplesArgument;
         this.selfReferenceDepth = selfReferenceDepth;
         this.validDataFormat = validDataFormat;
         this.callStackCounter = new HashMap<>();
         this.useDefaults = useDefaults;
         this.maxArraySize = maxArraySize;
         this.resolveAnyOfAsMultipleSchema = resolveAnyOfAsMultipleSchema;
+        this.discriminatorCasing = discriminatorCasing;
         this.totalDepth = RESPONSE_TOTAL_DEPTH;
     }
 
@@ -489,7 +538,7 @@ private List<Map<String, Object>> resolveAllOfSchemaProperties(Schema schema, St
 
             String detectedCasing = parentWithDiscriminator != null
                     ? detectCasingConvention(parentWithDiscriminator, discriminatorPropertyName)
-                    : "UPPER_SNAKE_CASE";
+                    : this.discriminatorCasing;
             String discriminatorValue = WordUtils.convertToDetectedCasing(propertyName, detectedCasing);
 
             for (Map<String, Object> example : examples) {
@@ -767,14 +816,15 @@ private String detectCasingConvention(Schema schema, String propertyName) {
             return WordUtils.detectCasingFromString(firstEnum);
         }
 
-        // Try to detect from discriminator mappings
-        Optional<String> mappingValue = globalContext.getDiscriminators()
-                .stream()
-                .filter(discriminator -> discriminator.getPropertyName().equalsIgnoreCase(propertyName) && discriminator.getMapping() != null)
-                .findFirst()
-                .flatMap(discriminator -> discriminator.getMapping().keySet().stream().findFirst());
+        // Try to detect from the schema's own discriminator mapping only
+        if (schema.getDiscriminator() != null && schema.getDiscriminator().getMapping() != null) {
+            Optional<String> mappingKey = schema.getDiscriminator().getMapping().keySet().stream().findFirst();
+            if (mappingKey.isPresent()) {
+                return WordUtils.detectCasingFromString(mappingKey.get());
+            }
+        }
 
-        return mappingValue.map(WordUtils::detectCasingFromString).orElse("UPPER_SNAKE_CASE");
+        return this.discriminatorCasing;
     }
 
 

src/main/java/dev/dochia/cli/core/playbook/field/base/BaseFieldsPlaybook.java

@@ -277,7 +277,7 @@ private static boolean isValidDate(String value) {
     try {
       LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE);
       return true;
-    } catch (DateTimeParseException e) {
+    } catch (DateTimeParseException _) {
       return false;
     }
   }
@@ -286,7 +286,7 @@ private static boolean isValidDateTime(String value) {
     try {
       OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
       return true;
-    } catch (DateTimeParseException e) {
+    } catch (DateTimeParseException _) {
       return false;
     }
   }
@@ -295,7 +295,7 @@ private static boolean isValidUuid(String value) {
     try {
       UUID.fromString(value);
       return true;
-    } catch (IllegalArgumentException e) {
+    } catch (IllegalArgumentException _) {
       return false;
     }
   }

src/main/java/dev/dochia/cli/core/util/WordUtils.java

@@ -333,6 +333,12 @@ public static String detectCasingFromString(String sample) {
      * @return the converted string
      */
     public static String convertToDetectedCasing(String name, String casingConvention) {
+        if (name == null) {
+            return null;
+        }
+        if (casingConvention == null) {
+            return name;
+        }
         return switch (casingConvention) {
             case "lower_snake_case" -> name.replaceAll("([a-z])([A-Z])", "$1_$2")
                     .replaceAll("([A-Z])([A-Z][a-z])", "$1_$2")