Added OpenAPI removeOperationIdPrefix test (#633)

Author: CharlesDuboisSAP

datamodel/openapi/openapi-generator/src/test/java/com/sap/cloud/sdk/datamodel/openapi/generator/DataModelGeneratorIntegrationTest.java

@@ -9,6 +9,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Map;
 import java.util.function.Predicate;
 
 import org.junit.jupiter.api.io.TempDir;
@@ -20,14 +21,12 @@
 import com.sap.cloud.sdk.datamodel.openapi.generator.model.GenerationResult;
 
 import io.vavr.control.Try;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 
 class DataModelGeneratorIntegrationTest
 {
     @RequiredArgsConstructor
-    @AllArgsConstructor
     private enum TestCase
     {
         API_CLASS_FOR_AI_SDK(
@@ -38,42 +37,43 @@ private enum TestCase
             ApiMaturity.RELEASED,
             true,
             6,
-            null,
-            null,
-            null,
-            "true"),
+            Map.of("aiSdkConstructor", "true")),
         API_CLASS_VENDOR_EXTENSION_YAML(
             "api-class-vendor-extension-yaml",
             "sodastore.yaml",
             "com.sap.cloud.sdk.services.apiclassvendorextension.api",
             "com.sap.cloud.sdk.services.apiclassvendorextension.model",
             ApiMaturity.RELEASED,
             false,
-            4),
+            4,
+            Map.of()),
         API_CLASS_VENDOR_EXTENSION_JSON(
             "api-class-vendor-extension-json",
             "sodastore.json",
             "com.sap.cloud.sdk.services.apiclassvendorextension.api",
             "com.sap.cloud.sdk.services.apiclassvendorextension.model",
             ApiMaturity.RELEASED,
             false,
-            6),
+            6,
+            Map.of()),
         INPUT_SPEC_WITH_UPPERCASE_FILE_EXTENSION(
             "input-spec-with-uppercase-file-extension",
             "sodastore.JSON",
             "com.sap.cloud.sdk.services.uppercasefileextension.api",
             "com.sap.cloud.sdk.services.uppercasefileextension.model",
             ApiMaturity.RELEASED,
             false,
-            6),
+            6,
+            Map.of()),
         INPUT_SPEC_WITH_ANYOF_ONEOF(
             "input-spec-with-anyof-oneof",
             "AggregatorNestedSchemaChild.json",
             "com.sap.cloud.sdk.services.anyofoneof.api",
             "com.sap.cloud.sdk.services.anyofoneof.model",
             ApiMaturity.RELEASED,
             true,
-            7),
+            7,
+            Map.of()),
         INPUT_SPEC_WITH_BUILDER(
             "input-spec-with-builder",
             "sodastore.JSON",
@@ -82,10 +82,30 @@ private enum TestCase
             ApiMaturity.RELEASED,
             true,
             6,
-            "builder",
-            "build",
-            "private",
-            null),;
+            Map
+                .of(
+                    "pojoBuilderMethodName",
+                    "builder",
+                    "pojoBuildMethodName",
+                    "build",
+                    "pojoConstructorVisibility",
+                    "private")),
+        REMOVE_OPERATION_ID_PREFIX(
+            "remove-operation-id-prefix",
+            "sodastore.json",
+            "com.sap.cloud.sdk.services.builder.api",
+            "com.sap.cloud.sdk.services.builder.model",
+            ApiMaturity.RELEASED,
+            true,
+            6,
+            Map
+                .of(
+                    "removeOperationIdPrefix",
+                    "true",
+                    "removeOperationIdPrefixDelimiter",
+                    "\\.",
+                    "removeOperationIdPrefixCount",
+                    "3")),;
 
         final String testCaseName;
         final String inputSpecFileName;
@@ -94,10 +114,7 @@ private enum TestCase
         final ApiMaturity apiMaturity;
         final boolean anyOfOneOfGenerationEnabled;
         final int expectedNumberOfGeneratedFiles;
-        String methodBuilder = null;
-        String methodBuild = null;
-        String constructorVisibility = null;
-        String aiSdkConstructor = null;
+        final Map<String, String> additionalProperties;
     }
 
     @ParameterizedTest
@@ -115,7 +132,7 @@ void integrationTests( final TestCase testCase, @TempDir final Path path )
         assertThat(tempOutputDirectory).exists().isReadable().isDirectory();
         assertThat(comparisonDirectory).exists().isReadable().isDirectory();
 
-        final GenerationConfiguration generationConfiguration =
+        final var generationConfiguration =
             GenerationConfiguration
                 .builder()
                 .apiPackage(testCase.apiPackageName)
@@ -125,15 +142,11 @@ void integrationTests( final TestCase testCase, @TempDir final Path path )
                 .outputDirectory(tempOutputDirectory.toAbsolutePath().toString())
                 .withSapCopyrightHeader(true)
                 .oneOfAnyOfGenerationEnabled(testCase.anyOfOneOfGenerationEnabled)
-                .additionalProperty("useAbstractionForFiles", "true")
-                .additionalProperty("pojoBuilderMethodName", testCase.methodBuilder)
-                .additionalProperty("pojoBuildMethodName", testCase.methodBuild)
-                .additionalProperty("pojoConstructorVisibility", testCase.constructorVisibility)
-                .additionalProperty("aiSdkConstructor", testCase.aiSdkConstructor)
-                .build();
+                .additionalProperty("useAbstractionForFiles", "true");
+        testCase.additionalProperties.forEach(generationConfiguration::additionalProperty);
 
         final Try<GenerationResult> maybeGenerationResult =
-            new DataModelGenerator().generateDataModel(generationConfiguration);
+            new DataModelGenerator().generateDataModel(generationConfiguration.build());
 
         assertThat(maybeGenerationResult.get().getGeneratedFiles()).hasSize(testCase.expectedNumberOfGeneratedFiles);
 
@@ -152,7 +165,7 @@ void generateDataModelForComparison( final TestCase testCase )
         assertThat(inputDirectory).exists().isReadable().isDirectory();
         assertThat(outputDirectory).exists().isReadable().isDirectory();
 
-        final GenerationConfiguration generationConfiguration =
+        final var generationConfiguration =
             GenerationConfiguration
                 .builder()
                 .apiPackage(testCase.apiPackageName)
@@ -163,14 +176,11 @@ void generateDataModelForComparison( final TestCase testCase )
                 .deleteOutputDirectory(true)
                 .withSapCopyrightHeader(true)
                 .oneOfAnyOfGenerationEnabled(testCase.anyOfOneOfGenerationEnabled)
-                .additionalProperty("useAbstractionForFiles", "true")
-                .additionalProperty("pojoBuilderMethodName", testCase.methodBuilder)
-                .additionalProperty("pojoBuildMethodName", testCase.methodBuild)
-                .additionalProperty("pojoConstructorVisibility", testCase.constructorVisibility)
-                .additionalProperty("aiSdkConstructor", testCase.aiSdkConstructor)
-                .build();
-
-        new DataModelGenerator().generateDataModel(generationConfiguration);
+                .additionalProperty("useAbstractionForFiles", "true");
+        testCase.additionalProperties.forEach(generationConfiguration::additionalProperty);
+
+        GenerationConfiguration build = generationConfiguration.build();
+        new DataModelGenerator().generateDataModel(build);
     }
 
     private static Path getInputDirectory( final TestCase testCase )