Merge pull request #1807 from ballerina-platform/1.8.x-test

[1.8.x] Update swagger dependency versions
ballerina-platform · Dec 20, 2024 · ae57648 · ae57648
2 parents 0d5d459 + cd04b60
commit ae57648
Show file tree

Hide file tree

Showing 285 changed files with 5,517 additions and 5,503 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,11 +7,12 @@ ballerinaLangVersion=2201.8.6
 testngVersion=7.6.1
 slf4jVersion=1.7.30
 org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8
-commonsLang3Version=3.9
-commonsIoVersion=2.14.0
+commonsLang3Version=3.14.0
+commonsIoVersion=2.15.1
 netLingalaZip4jVersion=2.8.0
 jacocoVersion=0.8.10
-swaggerParserVersion=2.1.16
+swaggerCoreVersion=2.2.22
+swaggerParserVersion=2.1.22
 puppycrawlCheckstyleVersion = 10.12.1
 
 # Stdlib Level 01

diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
@@ -47,10 +47,11 @@ dependencies {
         implementation "com.fasterxml.jackson.core:jackson-databind:2.15.3"
         implementation "com.github.jknack:handlebars:4.2.0"
         implementation "com.google.code.findbugs:jsr305:3.0.2"
-        implementation "info.picocli:picocli:4.0.1"
-        implementation "io.swagger.core.v3:swagger-core:2.2.9"
-        implementation "io.swagger.core.v3:swagger-models:2.2.9"
+        implementation "info.picocli:picocli:4.7.5"
+        implementation "io.swagger.core.v3:swagger-core:${swaggerCoreVersion}"
+        implementation "io.swagger.core.v3:swagger-models:${swaggerCoreVersion}"
         implementation "io.swagger.parser.v3:swagger-parser:${swaggerParserVersion}"
+        implementation "io.swagger.parser.v3:swagger-parser-safe-url-resolver:${swaggerParserVersion}"
         implementation "javax.ws.rs:javax.ws.rs-api:2.1.1"
         implementation "org.ballerinalang:ballerina-lang:${ballerinaLangVersion}"
         implementation "org.ballerinalang:ballerina-parser:${ballerinaLangVersion}"

diff --git a/openapi-bal-service/build.gradle b/openapi-bal-service/build.gradle
@@ -38,6 +38,7 @@ dependencies {
         exclude group: "javax.validation", module: "validation-api"
     }
     implementation "io.swagger.core.v3:swagger-models"
+    implementation "io.swagger.parser.v3:swagger-parser-safe-url-resolver:${swaggerParserVersion}"
     implementation "javax.ws.rs:javax.ws.rs-api"
     implementation "com.github.jknack:handlebars"
     implementation "info.picocli:picocli"
@@ -116,6 +117,7 @@ shadowJar {
         include(dependency('com.github.jknack:handlebars'))
         include(dependency('org.antlr:antlr4:4.5'))
         include(dependency('io.swagger.parser.v3:swagger-parser'))
+        include(dependency('io.swagger.parser.v3:swagger-parser-safe-url-resolver'))
         include(dependency('com.atlassian.commonmark:commonmark'))
         include(dependency('com.atlassian.commonmark:commonmark-ext-gfm-tables'))
         exclude('META-INF/*.SF')

diff --git a/openapi-build-extension/build.gradle b/openapi-build-extension/build.gradle
@@ -32,6 +32,7 @@ configurations {
 
 dependencies {
     implementation "io.swagger.core.v3:swagger-models"
+    implementation "io.swagger.parser.v3:swagger-parser-safe-url-resolver:${swaggerParserVersion}"
     implementation ("io.swagger.parser.v3:swagger-parser:${swaggerParserVersion}") {
         exclude group: "io.swagger", module: "swagger-compat-spec-parser"
         exclude group: "org.slf4j", module: "slf4j-ext"

diff --git a/openapi-cli/build.gradle b/openapi-cli/build.gradle
@@ -38,6 +38,7 @@ dependencies {
         exclude group: "javax.validation", module: "validation-api"
     }
     implementation "io.swagger.core.v3:swagger-models"
+    implementation "io.swagger.parser.v3:swagger-parser-safe-url-resolver:${swaggerParserVersion}"
     implementation "javax.ws.rs:javax.ws.rs-api"
     implementation "com.github.jknack:handlebars"
     implementation "info.picocli:picocli"
@@ -116,6 +117,7 @@ shadowJar {
         include(dependency('com.github.jknack:handlebars'))
         include(dependency('org.antlr:antlr4:4.5'))
         include(dependency('io.swagger.parser.v3:swagger-parser'))
+        include(dependency('io.swagger.parser.v3:swagger-parser-safe-url-resolver'))
         include(dependency('com.atlassian.commonmark:commonmark'))
         include(dependency('com.atlassian.commonmark:commonmark-ext-gfm-tables'))
         exclude('META-INF/*.SF')

diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/record.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/record.yaml
@@ -19,7 +19,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Reservation'
+              $ref: "#/components/schemas/Reservation"
       responses:
         "202":
           description: Accepted
@@ -52,7 +52,7 @@ components:
           type: array
           description: Rooms to be reserved
           items:
-            $ref: '#/components/schemas/ReserveRoom'
+            $ref: "#/components/schemas/ReserveRoom"
         startDate:
           type: string
           description: Start date in yyyy-mm-dd

diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/reference.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/reference.yaml
@@ -22,7 +22,7 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/Location'
+                  $ref: "#/components/schemas/Location"
   /locations/{id}/rooms:
     get:
       summary: Reperesents Snowpeak room collection resource
@@ -52,7 +52,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Rooms'
+                $ref: "#/components/schemas/Rooms"
   /reservation:
     put:
       summary: Represents Snowpeak reservation resource
@@ -62,14 +62,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Reservation'
+              $ref: "#/components/schemas/Reservation"
       responses:
         "200":
           description: Ok
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ReservationReceipt'
+                $ref: "#/components/schemas/ReservationReceipt"
         "409":
           description: Conflict
           content:
@@ -84,14 +84,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Reservation'
+              $ref: "#/components/schemas/Reservation"
       responses:
         "201":
           description: Created
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ReservationReceipt'
+                $ref: "#/components/schemas/ReservationReceipt"
         "409":
           description: Conflict
           content:
@@ -114,14 +114,14 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Payment'
+              $ref: "#/components/schemas/Payment"
       responses:
         "201":
           description: Created
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/PaymentReceipt'
+                $ref: "#/components/schemas/PaymentReceipt"
         "409":
           description: Conflict
           content:
@@ -162,10 +162,10 @@ components:
         links:
           type: array
           items:
-            $ref: '#/components/schemas/Link'
+            $ref: "#/components/schemas/Link"
     Location:
       allOf:
-        - $ref: '#/components/schemas/Links'
+        - $ref: "#/components/schemas/Links"
         - required:
             - address
             - id
@@ -231,7 +231,7 @@ components:
       description: Represents resort room
     Rooms:
       allOf:
-        - $ref: '#/components/schemas/Links'
+        - $ref: "#/components/schemas/Links"
         - required:
             - rooms
           type: object
@@ -240,7 +240,7 @@ components:
               type: array
               description: Array of rooms
               items:
-                $ref: '#/components/schemas/Room'
+                $ref: "#/components/schemas/Room"
     ReserveRoom:
       required:
         - count
@@ -266,7 +266,7 @@ components:
           type: array
           description: Rooms to be reserved
           items:
-            $ref: '#/components/schemas/ReserveRoom'
+            $ref: "#/components/schemas/ReserveRoom"
         startDate:
           type: string
           description: Start date in yyyy-mm-dd
@@ -276,7 +276,7 @@ components:
       description: Represents a reservation of rooms
     ReservationReceipt:
       allOf:
-        - $ref: '#/components/schemas/Links'
+        - $ref: "#/components/schemas/Links"
         - required:
             - expiryDate
             - id
@@ -294,7 +294,7 @@ components:
               type: string
               description: Last updated time stamp
             reservation:
-              $ref: '#/components/schemas/Reservation'
+              $ref: "#/components/schemas/Reservation"
     Payment:
       required:
         - cardNumber
@@ -339,5 +339,5 @@ components:
           type: array
           description: Booked rooms
           items:
-            $ref: '#/components/schemas/Room'
+            $ref: "#/components/schemas/Room"
       description: Reperesents receipt for the payment
diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/requestBody.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/requestBody.yaml
@@ -19,7 +19,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Reservation'
+              $ref: "#/components/schemas/Reservation"
       responses:
         "202":
           description: Accepted
@@ -52,7 +52,7 @@ components:
           type: array
           description: Rooms to be reserved
           items:
-            $ref: '#/components/schemas/ReserveRoom'
+            $ref: "#/components/schemas/ReserveRoom"
         startDate:
           type: string
           description: Start date in yyyy-mm-dd

diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/typeInclusion.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/apidoc/typeInclusion.yaml
@@ -17,7 +17,7 @@ paths:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/ReservationReceipt'
+              $ref: "#/components/schemas/ReservationReceipt"
       responses:
         "202":
           description: Accepted
@@ -52,13 +52,13 @@ components:
         links:
           type: array
           items:
-            $ref: '#/components/schemas/Link'
+            $ref: "#/components/schemas/Link"
         linkid:
           type: integer
           format: int64
     ReservationReceipt:
       allOf:
-        - $ref: '#/components/schemas/Links'
+        - $ref: "#/components/schemas/Links"
         - required:
             - id
           type: object

diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/arrayTypeResponse.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/arrayTypeResponse.yaml
@@ -22,7 +22,7 @@ paths:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/Product'
+                  $ref: "#/components/schemas/Product"
 components:
   schemas:
     Price:
@@ -55,5 +55,5 @@ components:
         description:
           type: string
         price:
-          $ref: '#/components/schemas/Price'
+          $ref: "#/components/schemas/Price"
       description: Represents a product
diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/catch_all_path_service.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/catch_all_path_service.yaml
@@ -26,13 +26,13 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Pet'
+                $ref: "#/components/schemas/Pet"
         "500":
           description: Internal server error
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ErrorPayload'
+                $ref: "#/components/schemas/ErrorPayload"
 components:
   schemas:
     ErrorPayload:
@@ -85,14 +85,14 @@ components:
         name:
           type: string
         category:
-          $ref: '#/components/schemas/Category'
+          $ref: "#/components/schemas/Category"
         photoUrls:
           type: array
           items:
             type: string
         tags:
           type: array
           items:
-            $ref: '#/components/schemas/Tag'
+            $ref: "#/components/schemas/Tag"
         status:
           type: string
diff --git a/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/compiler_warning.yaml b/openapi-cli/src/test/resources/ballerina-to-openapi/expected_gen/compiler_warning.yaml
@@ -25,7 +25,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/ErrorPayload'
+                $ref: "#/components/schemas/ErrorPayload"
 components:
   schemas:
     ErrorPayload:

diff --git a/...t/resources/ballerina-to-openapi/expected_gen/data_type/built_in_sub_types_in_record.yaml b/...t/resources/ballerina-to-openapi/expected_gen/data_type/built_in_sub_types_in_record.yaml
@@ -19,7 +19,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/BalSubTypes'
+                $ref: "#/components/schemas/BalSubTypes"
   /path2:
     get:
       operationId: getPath2
@@ -30,17 +30,17 @@ paths:
             application/json:
               schema:
                 oneOf:
-                  - $ref: '#/components/schemas/Unsigned8'
-                  - $ref: '#/components/schemas/Unsigned16'
-                  - $ref: '#/components/schemas/Unsigned32'
-                  - $ref: '#/components/schemas/Signed8'
-                  - $ref: '#/components/schemas/Signed16'
-                  - $ref: '#/components/schemas/Signed32'
-                  - $ref: '#/components/schemas/XmlElement'
-                  - $ref: '#/components/schemas/XmlComment'
-                  - $ref: '#/components/schemas/XmlText'
-                  - $ref: '#/components/schemas/XmlProcessingInstruction'
-                  - $ref: '#/components/schemas/Char'
+                  - $ref: "#/components/schemas/Unsigned8"
+                  - $ref: "#/components/schemas/Unsigned16"
+                  - $ref: "#/components/schemas/Unsigned32"
+                  - $ref: "#/components/schemas/Signed8"
+                  - $ref: "#/components/schemas/Signed16"
+                  - $ref: "#/components/schemas/Signed32"
+                  - $ref: "#/components/schemas/XmlElement"
+                  - $ref: "#/components/schemas/XmlComment"
+                  - $ref: "#/components/schemas/XmlText"
+                  - $ref: "#/components/schemas/XmlProcessingInstruction"
+                  - $ref: "#/components/schemas/Char"
 components:
   schemas:
     BalInts:
@@ -50,9 +50,9 @@ components:
       type: object
       properties:
         signed:
-          $ref: '#/components/schemas/BalSignedInts'
+          $ref: "#/components/schemas/BalSignedInts"
         unsigned:
-          $ref: '#/components/schemas/BalUnsignedInts'
+          $ref: "#/components/schemas/BalUnsignedInts"
     Signed32:
       type: integer
       format: int32
@@ -68,9 +68,9 @@ components:
         char:
           type: string
         ints:
-          $ref: '#/components/schemas/BalInts'
+          $ref: "#/components/schemas/BalInts"
         xmls:
-          $ref: '#/components/schemas/BalXmls'
+          $ref: "#/components/schemas/BalXmls"
     Unsigned8:
       type: integer
     Signed16: