Use openapi transformation agreeable to api-lint

folio-org · Oct 4, 2024 · ba265a3 · ba265a3
1 parent f389b60
commit ba265a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -302,7 +302,7 @@
       <plugin>
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-maven-plugin</artifactId>
-        <version>${openapi-generator.version}</version>
+        <version>7.8.0</version>
         <executions>
           <execution>
             <id>mod-fqm-manager-openapi</id>
@@ -324,10 +324,14 @@
               <supportingFilesToGenerate>ApiUtil.java</supportingFilesToGenerate>
               <generateModelDocumentation>true</generateModelDocumentation>
               <skipIfSpecIsUnchanged>true</skipIfSpecIsUnchanged>
-              <schemaMappings>
-                <schemaMapping>FqmMigrateRequest=org.folio.querytool.domain.dto.FqmMigrateRequest</schemaMapping>
-                <schemaMapping>FqmMigrateResponse=org.folio.querytool.domain.dto.FqmMigrateResponse</schemaMapping>
-              </schemaMappings>
+              <typeMappings>
+                <typeMapping>object+FqmMigrateRequest=FqmMigrateRequest</typeMapping>
+                <typeMapping>object+FqmMigrateResponse=FqmMigrateResponse</typeMapping>
+              </typeMappings>
+              <importMappings>
+                <importMapping>FqmMigrateRequest=org.folio.querytool.domain.dto.FqmMigrateRequest</importMapping>
+                <importMapping>FqmMigrateResponse=org.folio.querytool.domain.dto.FqmMigrateResponse</importMapping>
+              </importMappings>
               <configOptions>
                 <java8>true</java8>
                 <dateLibrary>java</dateLibrary>

diff --git a/src/main/java/org/folio/fqm/resource/MigrationController.java b/src/main/java/org/folio/fqm/resource/MigrationController.java
@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 
-import org.apache.commons.lang3.StringUtils;
 import org.folio.fqm.migration.MigratableQueryInformation;
 import org.folio.fqm.service.MigrationService;
 import org.folio.querytool.domain.dto.FqmMigrateRequest;
@@ -13,7 +12,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
-
 @RestController
 @RequiredArgsConstructor
 public class MigrationController implements FqmVersionApi {

diff --git a/src/main/resources/swagger.api/mod-fqm-manager.yaml b/src/main/resources/swagger.api/mod-fqm-manager.yaml
@@ -91,16 +91,18 @@ paths:
         content:
           application/json:
             schema:
-              description: Mapped to schemas in folio-query-tool-metadata
-              type: FqmMigrateRequest
+              description: Mapped to schema in folio-query-tool-metadata
+              type: object
+              format: FqmMigrateRequest
       responses:
         '200':
           description: 'FQM version updated successfully'
           content:
             application/json:
               schema:
                 description: Mapped to schemas in folio-query-tool-metadata
-                type: FqmMigrateResponse
+                type: object
+                format: FqmMigrateResponse
         '400':
           $ref: '#/components/responses/badRequestResponse'
         '500':