Add test to swagger problem

Author: adrian-palanques-cloudappi

generator-core/src/test/java/org/apiaddicts/apitools/apigen/generatorcore/config/extractors/ConfigurationExtractorTest.java

@@ -1,6 +1,7 @@
 package org.apiaddicts.apitools.apigen.generatorcore.config.extractors;
 
 import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.OpenAPIV3Parser;
 import io.swagger.v3.parser.core.models.ParseOptions;
 import org.apiaddicts.apitools.apigen.generatorcore.config.Configuration;
@@ -12,27 +13,18 @@
 import org.apiaddicts.apitools.apigen.generatorcore.config.validation.Validation;
 import org.apiaddicts.apitools.apigen.generatorcore.config.validation.ValidationType;
 import org.apiaddicts.apitools.apigen.generatorcore.spec.OpenAPIExtended;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import static org.apiaddicts.apitools.apigen.generatorcore.config.controller.Endpoint.Method.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 // TODO #14909 refactor tests to use individualized api fragments
 class ConfigurationExtractorTest {
 
-    private static Configuration configuration;
-
-    @BeforeAll
-    static void prepareTest() {
-        OpenAPIExtended openAPIExtended = load("testApi.yaml");
-        configuration = new ConfigurationExtractor(openAPIExtended).extract();
-        assertNotNull(configuration);
-    }
-
     private static OpenAPIExtended load(String fileName) {
         ParseOptions parseOptions = new ParseOptions();
         parseOptions.setResolveFully(true);
@@ -42,6 +34,8 @@ private static OpenAPIExtended load(String fileName) {
 
     @Test
     void checkExtractedProjectInfoFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertEquals(configuration.getName(), "test");
         assertEquals(configuration.getDescription(), "test");
         assertEquals("the.test", configuration.getGroup());
@@ -51,6 +45,8 @@ void checkExtractedProjectInfoFromYAML() {
 
     @Test
     void checkExtractedEntitiesFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getEntities());
 
         List<Entity> entities = configuration.getEntities();
@@ -105,6 +101,8 @@ void checkExtractedEntitiesFromYAML() {
 
     @Test
     void checkExtractedValidationsFromYAMLModels() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getEntities());
 
         List<Validation> validations = configuration.getEntities().get(0).getAttributes().get(0).getValidations();
@@ -160,12 +158,16 @@ void checkExtractedValidationsFromYAMLModels() {
 
     @Test
     void checkExtractedValidationsFromYAMLResources() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         List<Validation> validations = configuration.getControllers().get(0).getEndpoints().get(0).getRequest().getAttributes().get(0).getValidations();
         assertEquals(ValidationType.NOT_NULL, validations.get(0).getType(), "Check NotNull Validation");
     }
 
     @Test
     void checkExtractedControllersFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getControllers());
 
         List<Controller> controllers = configuration.getControllers();
@@ -199,6 +201,8 @@ void checkExtractedControllersFromYAML() {
 
     @Test
     void checkExtractedEndpointsParametersFromYAML() {
+        OpenAPIExtended openAPIExtended = load("testApi.yaml");
+        Configuration configuration = new ConfigurationExtractor(openAPIExtended).extract();
         assertNotNull(configuration.getControllers());
         Controller controller = configuration.getControllers().get(0);
 
@@ -273,4 +277,12 @@ private void checkBooleanParameter(Parameter parameter) {
         assertEquals("boolean", parameter.getType(), "Check Endpoint BooleanParameter type");
     }
 
+    @Test
+    void allOfWithProperties() {
+        OpenAPIExtended openAPIExtended = load("0001_allOffProps.yaml");
+        Schema<?> schema = openAPIExtended.getSchemas().get("standard_response_res_one");
+        Map<String, Schema> props = schema.getProperties();
+        assertTrue(props.containsKey("data"), "'data' property expected");
+        assertTrue(props.containsKey("result"), "'result' property expected");
+    }
 }

generator-core/src/test/resources/api_fragments/0001_allOffProps.yaml

@@ -0,0 +1,96 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: 0001_allOffProps
+
+x-apigen-project:
+  name: test
+  description: test
+  version: 1.0.0
+  java-properties:
+    group-id: the.test
+    artifact-id: test
+
+paths:
+  /sample_resource:
+    x-apigen-binding:
+      model: ResOne
+    post:
+      operationId: createResOne
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/create_res_one"
+      responses:
+        '201':
+          description: Ok
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/standard_response_res_one"
+
+components:
+  schemas:
+    standard_response_result:
+      properties:
+        result:
+          type: object
+          properties:
+            status:
+              type: boolean
+            http_code:
+              type: integer
+            errors:
+              type: array
+              items:
+                $ref: '#/components/schemas/standard_error'
+            info:
+              type: string
+            trace_id:
+              type: string
+            num_elements:
+              type: integer
+          required:
+            - status
+            - http_code
+            - trace_id
+
+    standard_error:
+      type: object
+      properties:
+        code:
+          type: integer
+        message:
+          type: string
+
+    standard_response_res_one:
+      x-apigen-mapping:
+        model: ResOne
+      type: object
+      allOf:
+        - $ref: '#/components/schemas/standard_response_result'
+      properties:
+        data:
+          properties:
+            name:
+              type: string
+
+    create_res_one:
+      x-apigen-mapping:
+        model: ResOne
+      type: object
+      properties:
+        name:
+          type: string
+
+  x-apigen-models:
+    ResOne:
+      relational-persistence:
+        table: res_one
+      attributes:
+        - name: name
+          type: String
+          relational-persistence:
+            column: id
+            primary-key: true

generator-core/src/test/resources/api_fragments/standard_request.yaml

@@ -1,4 +1,4 @@
-openapi: "3.0.0"
+openapi: "3.0.3"
 info:
   version: 1.0.0
   title: standard_request
@@ -89,4 +89,4 @@ components:
           type: String
           relational-persistence:
             column: id
-            primary-key: true
+            primary-key: true