Fix Enum naming and test (#363)

* Fix Enum naming and test

* Bump Version

Author: jemacineiras

multiapi-engine/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.sngular</groupId>
   <artifactId>multiapi-engine</artifactId>
-  <version>6.2.0</version>
+  <version>6.2.1</version>
   <packaging>jar</packaging>
 
   <properties>

multiapi-engine/src/main/java/com/sngular/api/generator/plugin/common/tools/ModelBuilder.java

@@ -789,7 +789,8 @@ private static SchemaFieldObject processEnumField(
           break;
         case TypeConstants.STRING:
         default:
-          enumValuesMap.put(StringUtils.upperCase(valueName), '"' + enumValue + '"');
+          enumValuesMap.put(StringUtils.replace(StringUtils.upperCase(valueName), " ", "_"),
+                  '"' + enumValue + '"');
           break;
       }
     }

multiapi-engine/src/test/java/com/sngular/api/generator/plugin/openapi/OpenApiGeneratorFixtures.java

@@ -392,6 +392,18 @@ public final class OpenApiGeneratorFixtures {
           .build()
   );
 
+  static final List<SpecFile> TEST_CREATE_DTO_WITH_ENUM = List.of(
+      SpecFile
+          .builder()
+          .filePath("openapigenerator/testCreateDTOWithEnum/api-test.yml")
+          .apiPackage("com.sngular.multifileplugin.testCreateDTOWithEnum")
+          .modelPackage("com.sngular.multifileplugin.testCreateDTOWithEnum.model")
+          .clientPackage("com.sngular.multifileplugin.testCreateDTOWithEnum.client")
+          .modelNameSuffix("DTO")
+          .useLombokModelAnnotation(true)
+          .build()
+  );
+
   static final List<SpecFile> TEST_CREATE_BASIC_DTO = List.of(
       SpecFile
           .builder()
@@ -1391,6 +1403,30 @@ static Function<Path, Boolean> validateCreateDTO() {
     return path -> commonTest(path, expectedTestApiFile, expectedTestApiModelFiles, DEFAULT_TARGET_API, DEFAULT_MODEL_API, Collections.emptyList(), DEFAULT_EXCEPTION_API);
   }
 
+  static Function<Path, Boolean> validateCreateDTOWithEnum() {
+
+    final String DEFAULT_TARGET_API = "generated/com/sngular/multifileplugin/testCreateDTOWithEnum";
+
+    final String DEFAULT_MODEL_API = "generated/com/sngular/multifileplugin/testCreateDTOWithEnum/model";
+
+    final String DEFAULT_EXCEPTION_API = "generated/com/sngular/multifileplugin/testCreateDTOWithEnum/model/exception";
+
+    final String COMMON_PATH = "openapigenerator/testCreateDTOWithEnum/";
+
+    final String ASSETS_PATH = COMMON_PATH + "assets/";
+
+    final List<String> expectedTestApiFile = List.of(
+        ASSETS_PATH + "TestApi.java"
+    );
+
+    final List<String> expectedTestApiModelFiles = List.of(
+        ASSETS_PATH + "model/AddressDTO.java",
+        ASSETS_PATH + "model/TestDTO.java"
+    );
+
+    return path -> commonTest(path, expectedTestApiFile, expectedTestApiModelFiles, DEFAULT_TARGET_API, DEFAULT_MODEL_API, Collections.emptyList(), DEFAULT_EXCEPTION_API);
+  }
+
   static Function<Path, Boolean> validateCreateBasicDTO() {
 
     final String DEFAULT_TARGET_API = "generated/com/sngular/multifileplugin/testCreateBasicDTO";

multiapi-engine/src/test/java/com/sngular/api/generator/plugin/openapi/OpenApiGeneratorTest.java

@@ -103,6 +103,8 @@ static Stream<Arguments> fileSpecToProcess() {
                      OpenApiGeneratorFixtures.validateValidationAnnotationsLombok(SPRING_BOOT_VERSION)),
         Arguments.of("testCreateDTO", OpenApiGeneratorFixtures.TEST_CREATE_DTO,
                      OpenApiGeneratorFixtures.validateCreateDTO()),
+        Arguments.of("testCreateDTOWithEnum", OpenApiGeneratorFixtures.TEST_CREATE_DTO_WITH_ENUM,
+                    OpenApiGeneratorFixtures.validateCreateDTOWithEnum()),
         Arguments.of("testCreateBasicDTO", OpenApiGeneratorFixtures.TEST_CREATE_BASIC_DTO,
                      OpenApiGeneratorFixtures.validateCreateBasicDTO()),
         Arguments.of("testIssueFaker", OpenApiGeneratorFixtures.TEST_ISSUE_FAKER,

multiapi-engine/src/test/resources/openapigenerator/testCreateDTOWithEnum/api-test.yml

@@ -0,0 +1,72 @@
+---
+openapi: "3.0.0"
+info:
+  contact:
+    name: Os3 Team
+    email: os3-info@sngular.com
+  version: 1.0.0
+  title: Testing example file
+  license:
+    name: MIT
+  description: Testing example file
+servers:
+- url: http://localhost:8080/v1
+tags:
+- name: testAdditionalProperties
+  description: Test service
+paths:
+  /test:
+    summary: testCreateDTO
+    get:
+      summary: testCreateDTO
+      description: Test File for SCC MultiApi Plugin.
+      tags:
+      - test
+      operationId: testCreateDTO
+      responses:
+        '200':
+          $ref: '#/components/responses/testCreate'
+components:
+  responses:
+    testCreate:
+      description: An object with additional properties
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/test'
+  schemas:
+    test:
+      type: object
+      required:
+      - id
+      - age
+      - properties
+      properties:
+        id:
+          type: string
+        age:
+          type: number
+          format: int32
+        properties:
+          type: string
+          enum:
+            - Enum Value 1
+            - Enum Value 2
+            - Enum Value 3
+        address:
+          type: object
+          required:
+          - country
+          - city
+          properties:
+            street:
+              type: string
+            country:
+              type: string
+              enum:
+                - Country ES
+                - Country EN
+                - Country PT
+                - Country TR
+            city:
+              type: string

multiapi-engine/src/test/resources/openapigenerator/testCreateDTOWithEnum/assets/TestApi.java

@@ -0,0 +1,46 @@
+package com.sngular.multifileplugin.testCreateDTOWithEnum;
+
+import java.util.Optional;
+import java.util.List;
+import java.util.Map;
+import javax.validation.Valid;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import org.springframework.http.MediaType;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import com.sngular.multifileplugin.testCreateDTOWithEnum.model.TestDTO;
+
+public interface TestApi {
+
+  /**
+   * GET /test: testCreateDTO
+   * @return  An object with additional properties; (status code 200)
+   */
+
+  @Operation(
+    operationId = "testCreateDTO",
+    summary = "testCreateDTO",
+    tags = {"test"},
+    responses = {
+      @ApiResponse(responseCode = "200", description = "An object with additional properties", content = @Content(mediaType = "application/json", schema = @Schema(implementation = TestDTO.class)))
+    }
+  )
+  @RequestMapping(
+    method = RequestMethod.GET,
+    value = "/test",
+    produces = {"application/json"}
+  )
+
+  default ResponseEntity<TestDTO> testCreateDTO() {
+    return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+  }
+
+}

multiapi-engine/src/test/resources/openapigenerator/testCreateDTOWithEnum/assets/model/AddressDTO.java

@@ -0,0 +1,57 @@
+package com.sngular.multifileplugin.testCreateDTOWithEnum.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+
+@Value
+public class AddressDTO {
+
+  @JsonProperty(value ="country")
+  @NonNull
+  private Country country;
+
+  public enum Country {
+    COUNTRY_ES("Country ES"),
+    COUNTRY_TR("Country TR"),
+    COUNTRY_EN("Country EN"),
+    COUNTRY_PT("Country PT");
+
+    private String value;
+
+    Country(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  @JsonProperty(value ="city")
+  @NonNull
+  private String city;
+
+  @JsonProperty(value ="street")
+  private String street;
+
+
+  @Builder
+  @Jacksonized
+  private AddressDTO(@NonNull Country country, @NonNull String city, String street) {
+    this.country = country;
+    this.city = city;
+    this.street = street;
+
+  }
+
+}

multiapi-engine/src/test/resources/openapigenerator/testCreateDTOWithEnum/assets/model/TestDTO.java

@@ -0,0 +1,62 @@
+package com.sngular.multifileplugin.testCreateDTOWithEnum.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.math.BigDecimal;
+import lombok.Builder;
+import lombok.NonNull;
+import lombok.Value;
+import lombok.extern.jackson.Jacksonized;
+
+@Value
+public class TestDTO {
+
+  @JsonProperty(value ="properties")
+  @NonNull
+  private Properties properties;
+
+  public enum Properties {
+    ENUM_VALUE_1("Enum Value 1"),
+    ENUM_VALUE_3("Enum Value 3"),
+    ENUM_VALUE_2("Enum Value 2");
+
+    private String value;
+
+    Properties(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+  }
+
+  @JsonProperty(value ="id")
+  @NonNull
+  private String id;
+
+  @JsonProperty(value ="address")
+  private AddressDTO address;
+
+  @JsonProperty(value ="age")
+  @NonNull
+  private BigDecimal age;
+
+
+  @Builder
+  @Jacksonized
+  private TestDTO(@NonNull Properties properties, @NonNull String id, AddressDTO address, @NonNull BigDecimal age) {
+    this.properties = properties;
+    this.id = id;
+    this.address = address;
+    this.age = age;
+
+  }
+
+}

scs-multiapi-gradle-plugin/build.gradle

@@ -20,7 +20,7 @@ repositories {
 }
 
 group = 'com.sngular'
-version = '6.2.0'
+version = '6.2.1'
 
 def SCSMultiApiPluginGroupId = group
 def SCSMultiApiPluginVersion = version
@@ -30,7 +30,7 @@ dependencies {
   shadow localGroovy()
   shadow gradleApi()
 
-  implementation 'com.sngular:multiapi-engine:6.2.0'
+  implementation 'com.sngular:multiapi-engine:6.2.1'
   testImplementation 'org.assertj:assertj-core:3.24.2'
   testImplementation 'com.puppycrawl.tools:checkstyle:10.12.3'
   testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
@@ -99,7 +99,7 @@ testing {
 
     integrationTest(JvmTestSuite) {
       dependencies {
-        implementation 'com.sngular:scs-multiapi-gradle-plugin:6.2.0'
+        implementation 'com.sngular:scs-multiapi-gradle-plugin:6.2.1'
         implementation 'org.assertj:assertj-core:3.24.2'
       }
 

scs-multiapi-maven-plugin/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.sngular</groupId>
   <artifactId>scs-multiapi-maven-plugin</artifactId>
-    <version>6.2.0</version>
+    <version>6.2.1</version>
   <packaging>maven-plugin</packaging>
 
   <name>AsyncApi - OpenApi Code Generator Maven Plugin</name>
@@ -271,7 +271,7 @@
     <dependency>
       <groupId>com.sngular</groupId>
       <artifactId>multiapi-engine</artifactId>
-      <version>6.2.0</version>
+      <version>6.2.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>