TD-45: Fix OpenAPI by npm validation. Fix workflow to swag version (#10)

.github/workflows/build.yml

@@ -7,4 +7,4 @@ on:
 
 jobs:
   build:
-    uses: valitydev/base-workflow/.github/workflows/maven-library-build.yml@v1
+    uses: valitydev/base-workflow/.github/workflows/maven-swag-build.yml@v1

.github/workflows/deploy.yml

@@ -8,9 +8,10 @@ on:
 
 jobs:
   deploy:
-    uses: valitydev/base-workflow/.github/workflows/maven-library-deploy.yml@v1
+    uses: valitydev/base-workflow/.github/workflows/maven-swag-deploy.yml@v1
     secrets:
       server-username: ${{ secrets.OSSRH_USERNAME }}
       server-password: ${{ secrets.OSSRH_TOKEN }}
       deploy-secret-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-      deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      deploy-secret-key-password: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+      github-token: ${{ secrets.GITHUB_TOKEN }}

openapi/openapi.yaml

@@ -12,8 +12,7 @@ info:
   license:
     name: Apache 2.0
     url: https://www.apache.org/licenses/LICENSE-2.0.html
-security:
-  - bearer: []
+security: []
 tags:
   - name: audit
     x-displayName: Audit
@@ -59,7 +58,7 @@ paths:
   # Notifications channels
   /notifications/channels:
     $ref: ./paths/notifications/channels.yaml
-  /notifications/channels/{name}:
+  /notifications/channels/channel/{name}:
     $ref: ./paths/notifications/channel.yaml
   /notifications/channels/types:
     $ref: ./paths/notifications/channelTypes.yaml
@@ -76,11 +75,12 @@ paths:
   /payments-groups:
     $ref: ./paths/payments/groups/insertGroup.yaml
   /payments-groups/{groupId}:
-    $ref: ./paths/payments/groups/removeGroup.yaml
+    delete:
+      $ref: ./paths/payments/groups/removeGroup.yaml
+    get:
+      $ref: ./paths/payments/groups/getGroup.yaml
   /payments-groups/filter:
     $ref: ./paths/payments/groups/filterGroups.yaml
-  /payments-groups/{id}:
-    $ref: ./paths/payments/groups/getGroup.yaml
 
   # Groups reference
   /payments-groups/{id}/references:
@@ -151,14 +151,15 @@ paths:
   # Data sets
   /payments-data-set/data-sets:
     $ref: ./paths/payments/data-sets/insertDataSet.yaml
-  /payments-data-set/data-sets/{id}:
-    $ref: ./paths/payments/data-sets/removeDataSet.yaml
+  /payments-data-set/data-sets/{setId}:
+    delete:
+      $ref: ./paths/payments/data-sets/removeDataSet.yaml
+    get:
+      $ref: ./paths/payments/data-sets/getDataSet.yaml
   /payments-data-set/data-sets/filter:
     $ref: ./paths/payments/data-sets/filterDataSets.yaml
   /payments-data-set/data-sets/applyRuleOnHistoricalDataSet:
     $ref: ./paths/payments/data-sets/applyRuleOnHistoricalDataSet.yaml
-  /payments-data-set/data-sets/{setId}:
-    $ref: ./paths/payments/data-sets/getDataSet.yaml
 
   # Checked data sets
   /payments-data-set/checked-data-sets/{id}:

openapi/paths/payments/data-sets/getDataSet.yaml

@@ -1,27 +1,24 @@
-get:
-  summary: Получить конкретный набор данных
-  operationId: getDataSet
-  tags:
-    - data-sets
-  parameters:
-    - name: setId
-      required: true
-      in: path
-      schema:
-        type: string
-
-  responses:
-    '201':
-      description: Data set
-      content:
-        application/json:
-          schema:
-            $ref: '../../../components/schemas/DataSet.yaml'
-    '401':
-      description: Unauthorized
-    '403':
-      description: Forbidden
-    '404':
-      description: Not Found
-
+summary: Получить конкретный набор данных
+operationId: getDataSet
+tags:
+  - data-sets
+parameters:
+  - name: setId
+    required: true
+    in: path
+    schema:
+      type: string
 
+responses:
+  '201':
+    description: Data set
+    content:
+      application/json:
+        schema:
+          $ref: '../../../components/schemas/DataSet.yaml'
+  '401':
+    description: Unauthorized
+  '403':
+    description: Forbidden
+  '404':
+    description: Not Found

openapi/paths/payments/data-sets/removeDataSet.yaml

@@ -1,27 +1,24 @@
-delete:
-  summary: Удаление тестового набора данных
-  operationId: removeDataSet
-  tags:
-    - data-sets
-  parameters:
-    - name: id
-      required: true
-      in: path
-      schema:
-        type: string
-
-  responses:
-    '201':
-      description: Removed data set
-      content:
-        application/json:
-          schema:
-            type: string
-    '401':
-      description: Unauthorized
-    '403':
-      description: Forbidden
-    '404':
-      description: Not Found
-
+summary: Удаление тестового набора данных
+operationId: removeDataSet
+tags:
+  - data-sets
+parameters:
+  - name: setId
+    required: true
+    in: path
+    schema:
+      type: string
 
+responses:
+  '201':
+    description: Removed data set
+    content:
+      application/json:
+        schema:
+          type: string
+  '401':
+    description: Unauthorized
+  '403':
+    description: Forbidden
+  '404':
+    description: Not Found

openapi/paths/payments/groups/getGroup.yaml

@@ -1,27 +1,26 @@
-get:
-  summary: Поиск группы
-  operationId: getGroup
-  tags:
-    - group
-  parameters:
-    - name: id
-      required: true
-      in: path
-      schema:
-        type: string
+summary: Поиск группы
+operationId: getGroup
+tags:
+  - group
+parameters:
+  - name: groupId
+    required: true
+    in: path
+    schema:
+      type: string
 
-  responses:
-    '201':
-      description: Group model
-      content:
-        application/json:
-          schema:
-            $ref: '../../../components/schemas/Group.yaml'
-    '401':
-      description: Unauthorized
-    '403':
-      description: Forbidden
-    '404':
-      description: Not Found
+responses:
+  '201':
+    description: Group model
+    content:
+      application/json:
+        schema:
+          $ref: '../../../components/schemas/Group.yaml'
+  '401':
+    description: Unauthorized
+  '403':
+    description: Forbidden
+  '404':
+    description: Not Found
 
 

openapi/paths/payments/groups/removeGroup.yaml

@@ -1,27 +1,26 @@
-delete:
-  summary: Удаление группы
-  operationId: removeGroup
-  tags:
-    - group
-  parameters:
-    - name: groupId
-      required: true
-      in: path
-      schema:
-        type: string
+summary: Удаление группы
+operationId: removeGroup
+tags:
+  - group
+parameters:
+  - name: groupId
+    required: true
+    in: path
+    schema:
+      type: string
 
-  responses:
-    '201':
-      description: Removed group id
-      content:
-        application/json:
-          schema:
-            type: string
-    '401':
-      description: Unauthorized
-    '403':
-      description: Forbidden
-    '404':
-      description: Not Found
+responses:
+  '201':
+    description: Removed group id
+    content:
+      application/json:
+        schema:
+          type: string
+  '401':
+    description: Unauthorized
+  '403':
+    description: Forbidden
+  '404':
+    description: Not Found
 
 

pom.xml

@@ -146,7 +146,7 @@
                     <plugin>
                         <groupId>org.openapitools</groupId>
                         <artifactId>openapi-generator-maven-plugin</artifactId>
-                        <version>5.0.0-SNAPSHOT</version>
+                        <version>5.3.1</version>
                         <executions>
                             <execution>
                                 <id>spring-server</id>
@@ -181,7 +181,7 @@
                     <plugin>
                         <groupId>org.openapitools</groupId>
                         <artifactId>openapi-generator-maven-plugin</artifactId>
-                        <version>5.0.0-SNAPSHOT</version>
+                        <version>5.3.1</version>
                         <executions>
                             <execution>
                                 <id>remote</id>