Merge pull request #1422 from ballerina-platform/1.7.x

Sync master with 1.7.x branch

gradle.properties

@@ -3,7 +3,7 @@ group=io.ballerina
 version=1.7.0-SNAPSHOT
 
 #dependency
-ballerinaLangVersion=2201.6.0
+ballerinaLangVersion=2201.7.0-20230619-175900-bb4e4544
 testngVersion=7.4.0
 slf4jVersion=1.7.30
 org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8
@@ -15,41 +15,41 @@ swaggerParserVersion=2.1.13
 puppycrawlCheckstyleVersion = 8.18
 
 # Stdlib Level 01
-stdlibIoVersion=1.4.0
+stdlibIoVersion=1.5.0-20230620-192100-29cf327
 stdlibRegexVersion=1.4.3
-stdlibTimeVersion=2.2.4
-stdlibUrlVersion=2.2.3
-stdlibXmldataVersion=2.5.0
+stdlibTimeVersion=2.3.0-20230620-192500-12d3432
+stdlibUrlVersion=2.3.0-20230620-193100-90b6489
+stdlibXmldataVersion=2.6.0-20230620-192500-909c3b3
 
 # Stdlib Level 02
-stdlibConstraintVersion=1.2.0
-stdlibCryptoVersion=2.3.1
-stdlibLogVersion=2.7.1
-stdlibOsVersion=1.6.0
-stdlibTaskVersion=2.3.2
+stdlibConstraintVersion=1.3.0-20230620-195700-ca941bc
+stdlibCryptoVersion=2.4.0-20230620-202300-53ac3fb
+stdlibLogVersion=2.8.0-20230620-203000-74034d2
+stdlibOsVersion=1.7.0-20230620-202800-f75dd63
+stdlibTaskVersion=2.4.0-20230620-204200-bd8329a
 
 # Stdlib Level 03
-stdlibCacheVersion=3.5.0
-stdlibFileVersion=1.7.1
-stdlibMimeVersion=2.7.1
-stdlibUuidVersion=1.5.1
+stdlibCacheVersion=3.6.0-20230620-211300-8e2e2da
+stdlibFileVersion=1.8.0-20230620-210800-e8f8123
+stdlibMimeVersion=2.8.0-20230620-205000-a1e0453
+stdlibUuidVersion=1.6.0-20230620-211300-6fdbff8
 
 # Stdlib Level 04
-stdlibAuthVersion=2.8.0
-stdlibJwtVersion=2.8.0
-stdlibOAuth2Version=2.8.0
+stdlibAuthVersion=2.9.0-20230620-221100-6b88179
+stdlibJwtVersion=2.9.0-20230620-221100-adcdde4
+stdlibOAuth2Version=2.9.0-20230620-214300-9df2b5a
 
 # Stdlib Level 05
-stdlibHttpVersion=2.8.0
+stdlibHttpVersion=2.9.0-20230621-211000-3a0a7fa
 
 # Stdlib Level 06
-stdlibGrpcVersion=1.8.0
-stdlibWebsocketVersion=2.8.0
-stdlibWebsubVersion=2.8.0
+stdlibGrpcVersion=1.9.0-20230622-103300-e35bf3c
+stdlibWebsocketVersion=2.9.0-20230622-090900-c881396
+stdlibWebsubVersion=2.9.0-20230622-084100-c86e0c6
 
 # Stdlib Level 07
-stdlibGraphqlVersion=1.8.0
+stdlibGraphqlVersion=1.9.0-20230622-112800-0ade7bc
 
 # Ballerinax Observer
-observeVersion=1.0.7
-observeInternalVersion=1.0.6
+observeVersion=1.1.0-20230620-193900-57e0c73
+observeInternalVersion=1.1.0-20230620-201800-18bbd1b

openapi-cli/src/test/java/io/ballerina/openapi/generators/service/QueryParameterTests.java

@@ -277,7 +277,7 @@ public void optionalQueryParameter() throws IOException, BallerinaOpenApiExcepti
     @Test(description = "16. Query parameter(s) having a referenced schema")
     public void generateParamsWithRefSchema() throws IOException, BallerinaOpenApiException {
         Path definitionPath = RES_DIR.resolve("swagger/parameters_with_ref_schema.yaml");
-        OpenAPI openAPI = GeneratorUtils.getOpenAPIFromOpenAPIV3Parser(definitionPath);
+        OpenAPI openAPI = GeneratorUtils.normalizeOpenAPI(definitionPath, false);
         OASServiceMetadata oasServiceMetadata = new OASServiceMetadata.Builder()
                 .withOpenAPI(openAPI)
                 .withFilters(filter)

openapi-cli/src/test/resources/generators/service/ballerina/parameters_with_object_ref_schema.bal

@@ -10,9 +10,10 @@ service /api/v3 on ep0 {
     # + types - Meeting Types
     # + audience - Meeting audience
     # + remarks - Meeting remarks
+    # + invoices - Booking Invoice
     # + return - returns can be any of following types
     # MeetingList (HTTP Status Code:200. List of meetings returned.)
     # http:NotFound (HTTP Status Code:404 User ID not found. Error Code:1001, User not exist or not belong to this account.)
-    resource function get users/meetings(Organizer organizer, MeetingTypes[] types, Audience? audience, map<json> remarks, RoomNo location = "R5") returns MeetingList|http:NotFound {
+    resource function get users/meetings(Organizer organizer, MeetingTypes[] types, Audience? audience, map<json> remarks, Booking_invoice[] invoices, RoomNo location = "R5") returns MeetingList|http:NotFound {
     }
 }

openapi-cli/src/test/resources/generators/service/swagger/parameters_with_ref_schema.yaml

@@ -75,6 +75,14 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Remarks'
+        - description: "Booking Invoice"
+          in: query
+          required: true
+          name: invoices
+          schema:
+            type: array
+            items:
+              $ref: '#/components/schemas/booking_invoice'
 #        - description: "Meeting timezone"
 #          in: query
 #          name: timezone
@@ -151,3 +159,5 @@ components:
           description: "Meeting Type: 1 - Instant meeting. 2 - Scheduled meeting. 3 - Recurring meeting with no fixed time. 8 - Recurring meeting with fixed time."
           type: integer
       type: object
+    booking_invoice:
+      type: integer

openapi-core/src/main/java/io/ballerina/openapi/core/generators/service/ParametersGenerator.java

@@ -550,7 +550,7 @@ private ArrayTypeDescriptorNode getArrayTypeDescriptorNode(Schema<?> items) thro
         if (items.get$ref() != null) {
             String referenceType = extractReferenceType(items.get$ref());
             String type = getValidName(referenceType, true);
-            Schema<?> refSchema = openAPI.getComponents().getSchemas().get(referenceType);
+            Schema<?> refSchema = openAPI.getComponents().getSchemas().get(type);
             if (queryParamSupportedTypes.contains(refSchema.getType())) {
                 arrayName = type;
             } else {