diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index 16fe43ae8..00d4bddb6 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -15,5 +15,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21 secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 06a7e2b7f..831fdc205 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21 with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index cca072384..f752a07f4 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21 secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 6c52a5d4c..5c732546a 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -6,7 +6,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@java21 with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 418c45b44..35468da17 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21 secrets: inherit with: package-name: graphql diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 16c0689f2..08fb3c879 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,7 +10,7 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21 secrets: inherit with: additional-ubuntu-test-flags: "-Pdisable=subscriptions" diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index 44a9251e6..1c5888825 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@java21 with: repo_name: 'module-ballerina-graphql' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerina-graphql/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 12c95cc78..703674172 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21 secrets: inherit diff --git a/README.md b/README.md index 3c82426ea..4c8edca23 100644 --- a/README.md +++ b/README.md @@ -850,7 +850,7 @@ This repository only contains the source code for the module. ### Prerequisites -1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations). +1. Download and install Java SE Development Kit (JDK) version 21 (from one of the following locations). * [Oracle](https://www.oracle.com/java/technologies/downloads/) * [OpenJDK](https://adoptium.net/) diff --git a/ballerina-tests/graphql-advanced-test-suite/Ballerina.toml b/ballerina-tests/graphql-advanced-test-suite/Ballerina.toml index 28e552abc..b8c77b381 100644 --- a/ballerina-tests/graphql-advanced-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-advanced-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_advanced_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-advanced-test-suite/Dependencies.toml b/ballerina-tests/graphql-advanced-test-suite/Dependencies.toml index cc1bcb89c..4dd4b8184 100644 --- a/ballerina-tests/graphql-advanced-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-advanced-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -44,16 +44,25 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -64,7 +73,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -96,7 +105,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_advanced_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "graphql"}, @@ -114,7 +123,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -131,12 +140,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -163,7 +173,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -180,7 +190,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -281,7 +291,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -292,7 +302,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -306,7 +316,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -319,7 +329,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -327,7 +337,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -336,7 +346,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -359,7 +369,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -367,7 +377,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -375,7 +385,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -386,7 +396,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/ballerina-tests/graphql-client-test-suite/Ballerina.toml b/ballerina-tests/graphql-client-test-suite/Ballerina.toml index 6e3bc23f5..71213f0c7 100644 --- a/ballerina-tests/graphql-client-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-client-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_client_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-client-test-suite/Dependencies.toml b/ballerina-tests/graphql-client-test-suite/Dependencies.toml index 224fda848..949ffb320 100644 --- a/ballerina-tests/graphql-client-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-client-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,17 +44,27 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -66,7 +76,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -99,7 +109,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_client_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, @@ -112,7 +122,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -129,13 +139,14 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -158,7 +169,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -174,7 +185,7 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -282,7 +293,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -294,7 +305,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -306,7 +317,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -320,7 +331,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -329,7 +340,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -339,7 +350,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -363,7 +374,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -372,7 +383,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -381,7 +392,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -393,7 +404,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina-tests/graphql-dataloader-test-suite/Ballerina.toml b/ballerina-tests/graphql-dataloader-test-suite/Ballerina.toml index 18531950d..86d497e6e 100644 --- a/ballerina-tests/graphql-dataloader-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-dataloader-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_dataloader_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-dataloader-test-suite/Dependencies.toml b/ballerina-tests/graphql-dataloader-test-suite/Dependencies.toml index f8aafca24..738763427 100644 --- a/ballerina-tests/graphql-dataloader-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-dataloader-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,17 +44,27 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -66,7 +76,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -99,7 +109,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_dataloader_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, @@ -114,7 +124,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -131,13 +141,14 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -164,7 +175,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -180,7 +191,7 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -288,7 +299,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -300,7 +311,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -312,7 +323,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -326,7 +337,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -335,7 +346,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -345,7 +356,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -369,7 +380,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -378,7 +389,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -387,7 +398,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -399,7 +410,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina-tests/graphql-interceptor-test-suite/Ballerina.toml b/ballerina-tests/graphql-interceptor-test-suite/Ballerina.toml index e91477044..8a5c28d90 100644 --- a/ballerina-tests/graphql-interceptor-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-interceptor-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_interceptor_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-interceptor-test-suite/Dependencies.toml b/ballerina-tests/graphql-interceptor-test-suite/Dependencies.toml index 7ec9662dc..59f919e48 100644 --- a/ballerina-tests/graphql-interceptor-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-interceptor-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,17 +44,27 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -66,7 +76,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -99,7 +109,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_interceptor_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, @@ -114,7 +124,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -131,13 +141,14 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -164,7 +175,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -180,7 +191,7 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -288,7 +299,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -303,7 +314,7 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -315,7 +326,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -329,7 +340,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -338,7 +349,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -348,7 +359,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -372,7 +383,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -381,7 +392,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -390,7 +401,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -402,7 +413,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina-tests/graphql-security-test-suite/Ballerina.toml b/ballerina-tests/graphql-security-test-suite/Ballerina.toml index 3260a2864..4f1c2c7bd 100644 --- a/ballerina-tests/graphql-security-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-security-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_security_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-security-test-suite/Dependencies.toml b/ballerina-tests/graphql-security-test-suite/Dependencies.toml index 2d6ee893e..63d8cdb72 100644 --- a/ballerina-tests/graphql-security-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-security-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,7 +23,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, @@ -35,7 +35,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -44,17 +44,27 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -66,7 +76,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -99,7 +109,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_security_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, @@ -113,7 +123,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -130,13 +140,14 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -163,7 +174,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -179,7 +190,7 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -287,7 +298,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -299,7 +310,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -311,7 +322,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -325,7 +336,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -334,7 +345,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -344,7 +355,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -368,7 +379,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -377,7 +388,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -386,7 +397,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -398,7 +409,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina-tests/graphql-service-test-suite/Ballerina.toml b/ballerina-tests/graphql-service-test-suite/Ballerina.toml index ac241275c..e5e1519ef 100644 --- a/ballerina-tests/graphql-service-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-service-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_service_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-service-test-suite/Dependencies.toml b/ballerina-tests/graphql-service-test-suite/Dependencies.toml index 7bcdbbae4..56bb3cc73 100644 --- a/ballerina-tests/graphql-service-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-service-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,16 +41,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -61,7 +70,7 @@ dependencies = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -93,7 +102,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_service_test_suite" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, @@ -111,7 +120,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "file"}, @@ -128,12 +137,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -160,7 +170,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -174,7 +184,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -278,7 +288,7 @@ modules = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -289,7 +299,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -300,7 +310,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -313,7 +323,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -321,7 +331,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -330,7 +340,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -353,7 +363,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -361,7 +371,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -372,7 +382,7 @@ modules = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -386,7 +396,7 @@ modules = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/ballerina-tests/graphql-subgraph-test-suite/Ballerina.toml b/ballerina-tests/graphql-subgraph-test-suite/Ballerina.toml index b5b46506e..d9513b046 100644 --- a/ballerina-tests/graphql-subgraph-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-subgraph-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_subgraph_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-subgraph-test-suite/Dependencies.toml b/ballerina-tests/graphql-subgraph-test-suite/Dependencies.toml index f9d898463..35398cb14 100644 --- a/ballerina-tests/graphql-subgraph-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-subgraph-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.10.0-20241025-103700-5c9e6a27" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,18 +22,17 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "task"}, - {org = "ballerina", name = "time"} + {org = "ballerina", name = "task"} ] [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,7 +40,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -50,7 +49,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -123,7 +122,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -151,7 +150,7 @@ dependencies = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -165,7 +164,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -173,8 +172,7 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"} + {org = "ballerina", name = "log"} ] [[package]] @@ -263,7 +261,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -285,20 +283,19 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"}, {org = "ballerina", name = "url"} ] [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.3.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -306,7 +303,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -315,7 +312,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -338,7 +335,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -346,7 +343,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -354,7 +351,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -365,7 +362,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/ballerina-tests/graphql-subscription-test-suite/Ballerina.toml b/ballerina-tests/graphql-subscription-test-suite/Ballerina.toml index 9d17c555d..7bdeb29e8 100644 --- a/ballerina-tests/graphql-subscription-test-suite/Ballerina.toml +++ b/ballerina-tests/graphql-subscription-test-suite/Ballerina.toml @@ -1,10 +1,10 @@ [package] org = "ballerina" name = "graphql_subscription_test_suite" -version = "1.14.1" +version = "1.15.0" [[dependency]] org = "ballerina" name = "graphql_test_common" repository = "local" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-subscription-test-suite/Dependencies.toml b/ballerina-tests/graphql-subscription-test-suite/Dependencies.toml index 1b50a12ce..244347512 100644 --- a/ballerina-tests/graphql-subscription-test-suite/Dependencies.toml +++ b/ballerina-tests/graphql-subscription-test-suite/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.10.0-20241025-103700-5c9e6a27" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -23,19 +23,18 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, - {org = "ballerina", name = "task"}, - {org = "ballerina", name = "time"} + {org = "ballerina", name = "task"} ] [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -47,7 +46,7 @@ modules = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -57,7 +56,7 @@ dependencies = [ [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -107,7 +106,6 @@ dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "graphql"}, {org = "ballerina", name = "graphql_test_common"}, - {org = "ballerina", name = "http"}, {org = "ballerina", name = "lang.runtime"}, {org = "ballerina", name = "test"}, {org = "ballerina", name = "websocket"} @@ -142,7 +140,7 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, @@ -167,15 +165,11 @@ dependencies = [ {org = "ballerina", name = "time"}, {org = "ballerina", name = "url"} ] -modules = [ - {org = "ballerina", packageName = "http", moduleName = "http"}, - {org = "ballerina", packageName = "http", moduleName = "http.httpscerr"} -] [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -191,7 +185,7 @@ scope = "testOnly" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, @@ -200,8 +194,7 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.int"}, {org = "ballerina", name = "lang.string"}, - {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"} + {org = "ballerina", name = "log"} ] [[package]] @@ -302,7 +295,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -326,21 +319,20 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "log"}, - {org = "ballerina", name = "time"}, {org = "ballerina", name = "url"} ] [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.3.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -349,7 +341,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -359,7 +351,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"}, @@ -383,7 +375,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.5.0" +version = "2.5.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -392,7 +384,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "jballerina.java"} @@ -401,7 +393,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, @@ -413,7 +405,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "auth"}, diff --git a/ballerina-tests/graphql-test-common/Ballerina.toml b/ballerina-tests/graphql-test-common/Ballerina.toml index c72c15caf..22af14b38 100644 --- a/ballerina-tests/graphql-test-common/Ballerina.toml +++ b/ballerina-tests/graphql-test-common/Ballerina.toml @@ -1,4 +1,4 @@ [package] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" diff --git a/ballerina-tests/graphql-test-common/Dependencies.toml b/ballerina-tests/graphql-test-common/Dependencies.toml index 06e2d8d4e..bfd25e884 100644 --- a/ballerina-tests/graphql-test-common/Dependencies.toml +++ b/ballerina-tests/graphql-test-common/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -22,7 +22,7 @@ dependencies = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -33,7 +33,7 @@ dependencies = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -41,16 +41,25 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -64,7 +73,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -96,7 +105,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql_test_common" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "file"}, {org = "ballerina", name = "graphql"}, @@ -112,12 +121,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -144,7 +154,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -161,7 +171,7 @@ version = "0.0.0" [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -258,7 +268,7 @@ dependencies = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -269,7 +279,7 @@ dependencies = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -280,7 +290,7 @@ dependencies = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -293,7 +303,7 @@ dependencies = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -301,7 +311,7 @@ dependencies = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -310,7 +320,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -332,7 +342,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.1" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -340,7 +350,7 @@ dependencies = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -348,7 +358,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -359,7 +369,7 @@ dependencies = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 7908d855c..f9dc2c0e5 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,26 +1,26 @@ [package] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" authors = ["Ballerina"] export=["graphql", "graphql.subgraph", "graphql.dataloader"] keywords = ["gql", "network", "query", "service"] repository = "https://github.com/ballerina-platform/module-ballerina-graphql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.10.0" +distribution = "2201.10.0-20241025-103700-5c9e6a27" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "graphql-native" -version = "1.14.1" -path = "../native/build/libs/graphql-native-1.14.1-SNAPSHOT.jar" +version = "1.15.0" +path = "../native/build/libs/graphql-native-1.15.0-SNAPSHOT.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "graphql-commons" -version = "1.14.1" -path = "../commons/build/libs/graphql-commons-1.14.1-SNAPSHOT.jar" +version = "1.15.0" +path = "../commons/build/libs/graphql-commons-1.15.0-SNAPSHOT.jar" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index eb5d6b525..43c0cea40 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,7 +3,7 @@ id = "graphql-compiler-plugin" class = "io.ballerina.stdlib.graphql.compiler.GraphqlCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.14.1-SNAPSHOT.jar" +path = "../compiler-plugin/build/libs/graphql-compiler-plugin-1.15.0-SNAPSHOT.jar" [[dependency]] -path = "../commons/build/libs/graphql-commons-1.14.1-SNAPSHOT.jar" +path = "../commons/build/libs/graphql-commons-1.15.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index bdebcfd33..be5815443 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -5,12 +5,12 @@ [ballerina] dependencies-toml-version = "2" -distribution-version = "2201.10.0" +distribution-version = "2201.11.0-20241112-214900-6b80ab87" [[package]] org = "ballerina" name = "auth" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -25,7 +25,7 @@ modules = [ [[package]] org = "ballerina" name = "cache" -version = "3.8.0" +version = "3.8.1" dependencies = [ {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "jballerina.java"}, @@ -39,7 +39,7 @@ modules = [ [[package]] org = "ballerina" name = "constraint" -version = "1.5.0" +version = "1.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -47,7 +47,7 @@ dependencies = [ [[package]] org = "ballerina" name = "crypto" -version = "2.7.2" +version = "2.7.3" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -56,10 +56,19 @@ modules = [ {org = "ballerina", packageName = "crypto", moduleName = "crypto"} ] +[[package]] +org = "ballerina" +name = "data.jsondata" +version = "0.3.0" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.object"} +] + [[package]] org = "ballerina" name = "file" -version = "1.10.0" +version = "1.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -73,7 +82,7 @@ modules = [ [[package]] org = "ballerina" name = "graphql" -version = "1.14.1" +version = "1.15.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, @@ -106,12 +115,13 @@ modules = [ [[package]] org = "ballerina" name = "http" -version = "2.12.2" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "cache"}, {org = "ballerina", name = "constraint"}, {org = "ballerina", name = "crypto"}, + {org = "ballerina", name = "data.jsondata"}, {org = "ballerina", name = "file"}, {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -138,7 +148,7 @@ modules = [ [[package]] org = "ballerina" name = "io" -version = "1.6.1" +version = "1.6.2" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} @@ -158,7 +168,7 @@ modules = [ [[package]] org = "ballerina" name = "jwt" -version = "2.13.0" +version = "2.13.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -268,7 +278,7 @@ modules = [ [[package]] org = "ballerina" name = "log" -version = "2.10.0" +version = "2.10.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -282,7 +292,7 @@ modules = [ [[package]] org = "ballerina" name = "mime" -version = "2.10.1" +version = "2.10.2" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, @@ -296,7 +306,7 @@ modules = [ [[package]] org = "ballerina" name = "oauth2" -version = "2.12.0" +version = "2.12.1" dependencies = [ {org = "ballerina", name = "cache"}, {org = "ballerina", name = "crypto"}, @@ -312,7 +322,7 @@ modules = [ [[package]] org = "ballerina" name = "observe" -version = "1.3.0" +version = "1.4.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -324,7 +334,7 @@ modules = [ [[package]] org = "ballerina" name = "os" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"} @@ -333,7 +343,7 @@ dependencies = [ [[package]] org = "ballerina" name = "task" -version = "2.5.0" +version = "2.5.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} @@ -359,7 +369,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.1" +version = "2.6.0" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -370,7 +380,7 @@ modules = [ [[package]] org = "ballerina" name = "url" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] @@ -378,7 +388,7 @@ dependencies = [ [[package]] org = "ballerina" name = "uuid" -version = "1.8.0" +version = "1.8.1" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "jballerina.java"}, @@ -392,7 +402,7 @@ modules = [ [[package]] org = "ballerina" name = "websocket" -version = "2.12.0" +version = "2.13.0" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "constraint"}, diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 64f7d881a..a8626823d 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -8,18 +8,18 @@ keywords = ["gql", "network", "query", "service"] repository = "https://github.com/ballerina-platform/module-ballerina-graphql" icon = "icon.png" license = ["Apache-2.0"] -distribution = "2201.11.0" +distribution = "2201.10.0-20241025-103700-5c9e6a27" -[platform.java17] +[platform.java21] graalvmCompatible = true -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "graphql-native" version = "@toml.version@" path = "../native/build/libs/graphql-native-@project.version@.jar" -[[platform.java17.dependency]] +[[platform.java21.dependency]] groupId = "io.ballerina.stdlib" artifactId = "graphql-commons" version = "@toml.version@" diff --git a/commons/build.gradle b/commons/build.gradle index 8ebe0fd58..fd698f75c 100644 --- a/commons/build.gradle +++ b/commons/build.gradle @@ -47,8 +47,11 @@ checkstyle { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsMain { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/compiler-plugin-tests/build.gradle b/compiler-plugin-tests/build.gradle index 5a52f11e7..814c0f1ce 100644 --- a/compiler-plugin-tests/build.gradle +++ b/compiler-plugin-tests/build.gradle @@ -51,8 +51,11 @@ checkstyle { checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsTest { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/compiler-plugin/build.gradle b/compiler-plugin/build.gradle index 9bf805cc9..ceab6b30b 100644 --- a/compiler-plugin/build.gradle +++ b/compiler-plugin/build.gradle @@ -49,8 +49,11 @@ checkstyle { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsMain { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/examples/build.gradle b/examples/build.gradle index f27e18e32..5a2559596 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -23,7 +23,8 @@ apply plugin: 'java' description = 'Ballerina - GraphQL Compiler Plugin Tests' def ballerinaDist = "${project.rootDir}/target/ballerina-runtime" -def examples = ["snowtooth", "starwars", "news_alerts"] +//def examples = ["snowtooth", "starwars", "news_alerts"] +def examples = ["snowtooth", "news_alerts"] def graalvmFlag = "" dependencies { diff --git a/gradle.properties b/gradle.properties index dbf653715..8957ce867 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ org.gradle.caching=true group=io.ballerina.stdlib version=1.15.0-SNAPSHOT -ballerinaLangVersion=2201.11.0-20241008-112400-81975006 +ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87 checkstylePluginVersion=10.12.0 -spotbugsPluginVersion=5.0.14 +spotbugsPluginVersion=6.0.18 shadowJarPluginVersion=8.1.1 downloadPluginVersion=5.4.0 releasePluginVersion=2.8.0 @@ -15,35 +15,35 @@ jacocoVersion=0.8.10 # Ballerina Library Dependencies # Level 01 -stdlibIoVersion=1.6.1 -stdlibTimeVersion=2.4.0 -stdlibUrlVersion=2.4.0 +stdlibIoVersion=1.6.2-20241112-233100-995cf5f +stdlibTimeVersion=2.6.0-20241113-073800-201b904 +stdlibUrlVersion=2.4.1-20241113-073900-335ff51 # Level 02 -stdlibConstraintVersion=1.5.0 -stdlibCryptoVersion=2.7.2 -stdlibLogVersion=2.10.0 -stdlibOsVersion=1.8.0 -stdlibTaskVersion=2.5.0 +stdlibConstraintVersion=1.6.0-20241113-090900-d276ad5 +stdlibCryptoVersion=2.7.3-20241113-081400-d015a39 +stdlibLogVersion=2.10.1-20241113-120000-4577868 +stdlibOsVersion=1.8.1-20241113-122000-cca973b +stdlibTaskVersion=2.5.1-20241113-123500-f905281 # Level 03 -stdlibCacheVersion=3.8.0 -stdlibFileVersion=1.10.0 -stdlibMimeVersion=2.10.0 -stdlibUuidVersion=1.8.0 +stdlibCacheVersion=3.8.1-20241113-125700-b75a1bf +stdlibFileVersion=1.10.1-20241113-151700-e1a2e38 +stdlibMimeVersion=2.10.2-20241113-154200-d953747 +stdlibUuidVersion=1.8.1-20241113-154400-443c67b # Level 04 -stdlibAuthVersion=2.12.0 -stdlibDataJsonDataVersion=0.3.0-20241105-101100-661d11f -stdlibJwtVersion=2.13.0 -stdlibOAuth2Version=2.12.0 +stdlibAuthVersion=2.12.1-20241113-162300-ded40eb +stdlibDataJsonDataVersion=0.3.0-20241114-143900-285d739 +stdlibJwtVersion=2.13.1-20241113-162400-b59ccfa +stdlibOAuth2Version=2.12.1-20241113-162400-4c6ddfe # Level 05 -stdlibHttpVersion=2.13.0-20241106-120000-d375c3b +stdlibHttpVersion=2.13.0-20241114-182900-7e9f66a # Level 06 -stdlibWebsocketVersion=2.12.0 +stdlibWebsocketVersion=2.13.0-20241116-202000-ddd958d # Ballerinax Observer -observeVersion=1.3.0 -observeInternalVersion=1.3.0 +observeVersion=1.4.0-20241113-092000-b83ae74 +observeInternalVersion=1.3.1-20241113-101700-265054d diff --git a/native/build.gradle b/native/build.gradle index 011ac91a6..9b9e2641f 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -47,8 +47,11 @@ checkstyle { checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles") spotbugsMain { - effort "max" - reportLevel "low" + def classLoader = plugins["com.github.spotbugs"].class.classLoader + def SpotBugsConfidence = classLoader.findLoadedClass("com.github.spotbugs.snom.Confidence") + def SpotBugsEffort = classLoader.findLoadedClass("com.github.spotbugs.snom.Effort") + effort = SpotBugsEffort.MAX + reportLevel = SpotBugsConfidence.LOW reportsDir = file("$project.buildDir/reports/spotbugs") reports { html.enabled true diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutor.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutor.java index 69fca8323..772f4ae5d 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutor.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutor.java @@ -19,14 +19,18 @@ package io.ballerina.stdlib.graphql.runtime.client; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.PredefinedTypes; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.types.ObjectType; import io.ballerina.runtime.api.utils.TypeUtils; +import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; +import java.util.concurrent.CompletableFuture; + +import static io.ballerina.stdlib.graphql.runtime.utils.ModuleUtils.getResult; + /** * This class is used to execute a GraphQL document using the Ballerina GraphQL client. */ @@ -55,33 +59,29 @@ public static Object executeWithType(Environment env, BObject client, BString do private static Object invokeClientMethod(Environment env, BObject client, BString document, Object variables, Object operationName, Object headers, BTypedesc targetType, String methodName) { - Object[] paramFeed = new Object[10]; + Object[] paramFeed = new Object[5]; paramFeed[0] = targetType; - paramFeed[1] = true; - paramFeed[2] = document; - paramFeed[3] = true; - paramFeed[4] = variables; - paramFeed[5] = true; - paramFeed[6] = operationName; - paramFeed[7] = true; - paramFeed[8] = headers; - paramFeed[9] = true; + paramFeed[1] = document; + paramFeed[2] = variables; + paramFeed[3] = operationName; + paramFeed[4] = headers; return invokeClientMethod(env, client, methodName, paramFeed); } private static Object invokeClientMethod(Environment env, BObject client, String methodName, Object[] paramFeed) { - Future balFuture = env.markAsync(); - - ObjectType clientType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(client)); - if (clientType.isIsolated() && clientType.isIsolated(methodName)) { - env.getRuntime() - .invokeMethodAsyncConcurrently(client, methodName, null, null, new QueryExecutorCallback(balFuture), - null, PredefinedTypes.TYPE_NULL, paramFeed); - } else { - env.getRuntime() - .invokeMethodAsyncSequentially(client, methodName, null, null, new QueryExecutorCallback(balFuture), - null, PredefinedTypes.TYPE_NULL, paramFeed); - } - return null; + return env.yieldAndRun(() -> { + CompletableFuture balFuture = new CompletableFuture<>(); + ObjectType clientType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(client)); + QueryExecutorCallback executorCallback = new QueryExecutorCallback(balFuture); + try { + boolean isIsolated = clientType.isIsolated() && clientType.isIsolated(methodName); + StrandMetadata metadata = new StrandMetadata(isIsolated, null); + Object result = env.getRuntime().callMethod(client, methodName, metadata, paramFeed); + executorCallback.notifySuccess(result); + } catch (BError bError) { + executorCallback.notifyFailure(bError); + } + return getResult(balFuture); + }); } } diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutorCallback.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutorCallback.java index 694335aca..8aacaf047 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutorCallback.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/client/QueryExecutorCallback.java @@ -18,26 +18,24 @@ package io.ballerina.stdlib.graphql.runtime.client; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.async.Callback; import io.ballerina.runtime.api.values.BError; +import java.util.concurrent.CompletableFuture; + /** * This class implements async callback methods of {@link QueryExecutor}. */ -public class QueryExecutorCallback implements Callback { - private final Future balFuture; +public class QueryExecutorCallback { + private final CompletableFuture balFuture; - public QueryExecutorCallback(Future balFuture) { + public QueryExecutorCallback(CompletableFuture balFuture) { this.balFuture = balFuture; } - @Override public void notifySuccess(Object result) { balFuture.complete(result); } - @Override public void notifyFailure(BError bError) { balFuture.complete(bError); } diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ArgumentHandler.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ArgumentHandler.java index 92ffff6ba..7e110dc73 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ArgumentHandler.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ArgumentHandler.java @@ -19,9 +19,7 @@ package io.ballerina.stdlib.graphql.runtime.engine; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.types.ArrayType; @@ -30,8 +28,10 @@ import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.Parameter; +import io.ballerina.runtime.api.types.PredefinedTypes; import io.ballerina.runtime.api.types.RecordType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.JsonUtils; import io.ballerina.runtime.api.utils.StringUtils; @@ -52,8 +52,9 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.concurrent.CompletableFuture; -import static io.ballerina.runtime.api.TypeTags.INTERSECTION_TAG; +import static io.ballerina.runtime.api.types.TypeTags.INTERSECTION_TAG; import static io.ballerina.stdlib.graphql.runtime.engine.EngineUtils.ARGUMENTS_FIELD; import static io.ballerina.stdlib.graphql.runtime.engine.EngineUtils.FILE_INFO_FIELD; import static io.ballerina.stdlib.graphql.runtime.engine.EngineUtils.NAME_FIELD; @@ -72,7 +73,7 @@ /** * This class processes the arguments passed to a GraphQL document to pass into Ballerina functions. */ -public class ArgumentHandler { +public final class ArgumentHandler { private final BMap argumentsMap; private final MethodType method; private final BMap fileInfo; @@ -496,24 +497,20 @@ private Parameter getParameterForArgumentNode(BString paramName) { private Object[] getArgumentsForMethod() { Parameter[] parameters = this.method.getParameters(); - Object[] result = new Object[parameters.length * 2]; - for (int i = 0, j = 0; i < parameters.length; i += 1, j += 2) { + Object[] result = new Object[parameters.length]; + for (int i = 0; i < parameters.length; i += 1) { if (isContext(parameters[i].type)) { - result[j] = this.context; - result[j + 1] = true; + result[i] = this.context; continue; } if (isField(parameters[i].type)) { - result[j] = this.field; - result[j + 1] = true; + result[i] = this.field; continue; } if (this.argumentsMap.get(StringUtils.fromString(parameters[i].name)) == null) { - result[j] = parameters[i].type.getZeroValue(); - result[j + 1] = false; + result[i] = parameters[i].type.getZeroValue(); } else { - result[j] = this.argumentsMap.get(StringUtils.fromString(parameters[i].name)); - result[j + 1] = true; + result[i] = this.argumentsMap.get(StringUtils.fromString(parameters[i].name)); } } return result; @@ -543,13 +540,21 @@ private boolean isRepresentationArgument(Type type) { } private void addConstraintValidationErrors(Environment environment, BArray errors) { - Future future = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(future); - BObject fieldNode = this.field.getObjectValue(INTERNAL_NODE); - Object[] arguments = {errors, true, fieldNode, true}; - environment.getRuntime() - .invokeMethodAsyncConcurrently(this.responseGenerator, ADD_CONSTRAINT_ERRORS_METHOD, null, null, - executionCallback, null, PredefinedTypes.TYPE_NULL, arguments); + environment.yieldAndRun(() -> { + CompletableFuture future = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(future); + BObject fieldNode = this.field.getObjectValue(INTERNAL_NODE); + Object[] arguments = {errors, fieldNode}; + try { + Object result = environment.getRuntime() + .callMethod(this.responseGenerator, ADD_CONSTRAINT_ERRORS_METHOD, + new StrandMetadata(true, null), arguments); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return null; + }); } private static BTypedesc getTypeDescFromParameter(Parameter parameter) { diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/DataLoader.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/DataLoader.java index 16d181932..c2976c078 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/DataLoader.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/DataLoader.java @@ -19,17 +19,16 @@ package io.ballerina.stdlib.graphql.runtime.engine; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.async.Callback; -import io.ballerina.runtime.api.creators.TypeCreator; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.types.ObjectType; -import io.ballerina.runtime.api.types.Type; import io.ballerina.runtime.api.utils.TypeUtils; +import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BTypedesc; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ANYDATA; -import static io.ballerina.runtime.api.PredefinedTypes.TYPE_ERROR; +import java.util.concurrent.CompletableFuture; + +import static io.ballerina.stdlib.graphql.runtime.utils.ModuleUtils.getResult; /** * This class provides native implementations of the Ballerina DataLoader class. @@ -41,23 +40,26 @@ private DataLoader() { } public static Object get(Environment env, BObject dataLoader, Object key, BTypedesc typedesc) { - Future balFuture = env.markAsync(); - ObjectType clientType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(dataLoader)); - Object[] paramFeed = getProcessGetMethodParams(key, typedesc); - Callback executionCallback = new ExecutionCallback(balFuture); - Type returnType = TypeCreator.createUnionType(TYPE_ANYDATA, TYPE_ERROR); - if (clientType.isIsolated() && clientType.isIsolated(DATA_LOADER_PROCESSES_GET_METHOD_NAME)) { - env.getRuntime() - .invokeMethodAsyncConcurrently(dataLoader, DATA_LOADER_PROCESSES_GET_METHOD_NAME, null, null, - executionCallback, null, returnType, paramFeed); - return null; - } - env.getRuntime().invokeMethodAsyncSequentially(dataLoader, DATA_LOADER_PROCESSES_GET_METHOD_NAME, null, null, - executionCallback, null, returnType, paramFeed); - return null; + return env.yieldAndRun(() -> { + CompletableFuture balFuture = new CompletableFuture<>(); + ObjectType clientType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(dataLoader)); + Object[] paramFeed = getProcessGetMethodParams(key, typedesc); + ExecutionCallback executionCallback = new ExecutionCallback(balFuture); + try { + boolean isIsolated = clientType.isIsolated() && + clientType.isIsolated(DATA_LOADER_PROCESSES_GET_METHOD_NAME); + StrandMetadata metadata = new StrandMetadata(isIsolated, null); + Object result = env.getRuntime().callMethod(dataLoader, DATA_LOADER_PROCESSES_GET_METHOD_NAME, + metadata, paramFeed); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return getResult(balFuture); + }); } private static Object[] getProcessGetMethodParams(Object key, BTypedesc typedesc) { - return new Object[]{key, true, typedesc, true}; + return new Object[]{key, typedesc}; } } diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/Engine.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/Engine.java index e00f2a0e6..100c41261 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/Engine.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/Engine.java @@ -19,11 +19,9 @@ package io.ballerina.stdlib.graphql.runtime.engine; import io.ballerina.runtime.api.Environment; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.PredefinedTypes; -import io.ballerina.runtime.api.TypeTags; +import io.ballerina.runtime.api.Runtime; +import io.ballerina.runtime.api.concurrent.StrandMetadata; import io.ballerina.runtime.api.creators.ErrorCreator; -import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.types.IntersectionType; import io.ballerina.runtime.api.types.MethodType; import io.ballerina.runtime.api.types.ObjectType; @@ -31,6 +29,7 @@ import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -52,6 +51,7 @@ import java.util.Base64; import java.util.HashMap; import java.util.List; +import java.util.concurrent.CompletableFuture; import static io.ballerina.runtime.observability.ObservabilityConstants.KEY_OBSERVER_CONTEXT; import static io.ballerina.stdlib.graphql.runtime.engine.ArgumentHandler.getEffectiveType; @@ -65,11 +65,9 @@ import static io.ballerina.stdlib.graphql.runtime.engine.EngineUtils.SUBSCRIBE_ACCESSOR; import static io.ballerina.stdlib.graphql.runtime.engine.EngineUtils.isPathsMatching; import static io.ballerina.stdlib.graphql.runtime.utils.ModuleUtils.getModule; +import static io.ballerina.stdlib.graphql.runtime.utils.ModuleUtils.getResult; import static io.ballerina.stdlib.graphql.runtime.utils.Utils.ERROR_TYPE; -import static io.ballerina.stdlib.graphql.runtime.utils.Utils.INTERCEPTOR_EXECUTION_STRAND; import static io.ballerina.stdlib.graphql.runtime.utils.Utils.INTERNAL_NODE; -import static io.ballerina.stdlib.graphql.runtime.utils.Utils.REMOTE_EXECUTION_STRAND; -import static io.ballerina.stdlib.graphql.runtime.utils.Utils.RESOURCE_EXECUTION_STRAND; import static io.ballerina.stdlib.graphql.runtime.utils.Utils.createError; /** @@ -127,33 +125,36 @@ public static Object executeSubscriptionResource(Environment environment, BObjec } catch (ConstraintValidationException e) { return null; } - Future subscriptionFutureResult = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(subscriptionFutureResult); - Object[] args = argumentHandler.getArguments(); - ObjectType objectType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(service)); - UnionType typeUnion = - TypeCreator.createUnionType(PredefinedTypes.TYPE_STREAM, PredefinedTypes.TYPE_ERROR); - - HashMap properties = null; - if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { - properties = getPropertiesToPropagate(environment, context); - } - - if (objectType.isIsolated() && objectType.isIsolated(resourceMethod.getName())) { - environment.getRuntime() - .invokeMethodAsyncConcurrently(service, resourceMethod.getName(), null, - null, executionCallback, properties, typeUnion, args); - } else { - environment.getRuntime() - .invokeMethodAsyncSequentially(service, resourceMethod.getName(), null, - null, executionCallback, properties, typeUnion, args); - } - return null; + return environment.yieldAndRun(() -> { + CompletableFuture subscriptionFutureResult = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(subscriptionFutureResult); + Object[] args = argumentHandler.getArguments(); + HashMap properties = null; + if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { + properties = getPropertiesToPropagate(environment, context); + } + try { + Object result = callResourceMethod(environment.getRuntime(), service, resourceMethod.getName() + , properties, args); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return getResult(subscriptionFutureResult); + }); } } return null; } + private static Object callResourceMethod(Runtime runtime, BObject service, String methodName, + HashMap properties, Object[] args) { + ObjectType objectType = (ObjectType) TypeUtils.getReferredType(TypeUtils.getType(service)); + boolean isIsolated = objectType.isIsolated() && objectType.isIsolated(methodName); + StrandMetadata strandMetadata = new StrandMetadata(isIsolated, properties); + return runtime.callMethod(service, methodName, strandMetadata, args); + } + public static Object executeQueryResource(Environment environment, BObject context, BObject service, ResourceMethodType resourceMethod, BObject fieldObject, BObject responseGenerator, boolean validation) { @@ -167,27 +168,23 @@ public static Object executeQueryResource(Environment environment, BObject conte } catch (ConstraintValidationException e) { return null; } - Future future = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(future); - ServiceType serviceType = (ServiceType) TypeUtils.getType(service); - Type returnType = TypeCreator.createUnionType(PredefinedTypes.TYPE_ANY, PredefinedTypes.TYPE_NULL); - Object[] arguments = argumentHandler.getArguments(); - - HashMap properties = null; - if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { - properties = getPropertiesToPropagate(environment, context); - } - - if (serviceType.isIsolated() && serviceType.isIsolated(resourceMethod.getName())) { - environment.getRuntime().invokeMethodAsyncConcurrently(service, resourceMethod.getName(), null, - RESOURCE_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } else { - environment.getRuntime().invokeMethodAsyncSequentially(service, resourceMethod.getName(), null, - RESOURCE_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } - return null; + return environment.yieldAndRun(() -> { + CompletableFuture future = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(future); + Object[] arguments = argumentHandler.getArguments(); + HashMap properties = null; + if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { + properties = getPropertiesToPropagate(environment, context); + } + try { + Object result = callResourceMethod(environment.getRuntime(), service, resourceMethod.getName(), + properties, arguments); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return getResult(future); + }); } public static Object executeMutationMethod(Environment environment, BObject context, BObject service, @@ -203,26 +200,23 @@ public static Object executeMutationMethod(Environment environment, BObject cont } catch (ConstraintValidationException e) { return null; } - Future future = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(future); - Type returnType = TypeCreator.createUnionType(PredefinedTypes.TYPE_ANY, PredefinedTypes.TYPE_NULL); - Object[] arguments = argumentHandler.getArguments(); - - HashMap properties = null; - if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { - properties = getPropertiesToPropagate(environment, context); - } - - if (serviceType.isIsolated() && serviceType.isIsolated(remoteMethod.getName())) { - environment.getRuntime().invokeMethodAsyncConcurrently(service, remoteMethod.getName(), null, - REMOTE_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } else { - environment.getRuntime().invokeMethodAsyncSequentially(service, remoteMethod.getName(), null, - REMOTE_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } - return null; + return environment.yieldAndRun(() -> { + CompletableFuture future = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(future); + Object[] arguments = argumentHandler.getArguments(); + HashMap properties = null; + if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { + properties = getPropertiesToPropagate(environment, context); + } + try { + Object result = callResourceMethod(environment.getRuntime(), service, remoteMethod.getName(), + properties, arguments); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return getResult(future); + }); } } return null; @@ -235,26 +229,23 @@ public static Object executeInterceptor(Environment environment, BObject interce if (remoteMethod == null) { return null; } - Future future = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(future); - Type returnType = TypeCreator.createUnionType(PredefinedTypes.TYPE_ANY, PredefinedTypes.TYPE_NULL); - Object[] arguments = getInterceptorArguments(context, field); - - HashMap properties = null; - if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { - properties = getPropertiesToPropagate(environment, context); - } - - if (serviceType.isIsolated() && serviceType.isIsolated(remoteMethod.getName())) { - environment.getRuntime().invokeMethodAsyncConcurrently(interceptor, remoteMethod.getName(), null, - INTERCEPTOR_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } else { - environment.getRuntime().invokeMethodAsyncSequentially(interceptor, remoteMethod.getName(), null, - INTERCEPTOR_EXECUTION_STRAND, executionCallback, - properties, returnType, arguments); - } - return null; + return environment.yieldAndRun(() -> { + CompletableFuture future = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(future); + Object[] arguments = getInterceptorArguments(context, field); + HashMap properties = null; + if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { + properties = getPropertiesToPropagate(environment, context); + } + try { + Object result = callResourceMethod(environment.getRuntime(), interceptor, remoteMethod.getName(), + properties, arguments); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return getResult(future); + }); } public static Object getResourceMethod(BObject service, BArray path) { @@ -305,11 +296,9 @@ private static RemoteMethodType getRemoteMethod(ServiceType serviceType, String } private static Object[] getInterceptorArguments(BObject context, BObject field) { - Object[] args = new Object[4]; + Object[] args = new Object[2]; args[0] = context; - args[1] = true; - args[2] = field; - args[3] = true; + args[1] = field; return args; } @@ -344,26 +333,24 @@ public static boolean hasPrefetchMethod(BObject serviceObject, BString prefetchM public static void executePrefetchMethod(Environment environment, BObject context, BObject service, MethodType resourceMethod, BObject fieldObject) { - Future future = environment.markAsync(); - ExecutionCallback executionCallback = new ExecutionCallback(future); - ServiceType serviceType = (ServiceType) TypeUtils.getType(service); - ArgumentHandler argumentHandler = new ArgumentHandler(resourceMethod, context, fieldObject, null, false); - Object[] arguments = argumentHandler.getArguments(); - - HashMap properties = null; - if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { - properties = getPropertiesToPropagate(environment, context); - } - - if (serviceType.isIsolated() && serviceType.isIsolated(resourceMethod.getName())) { - environment.getRuntime() - .invokeMethodAsyncConcurrently(service, resourceMethod.getName(), null, RESOURCE_EXECUTION_STRAND, - executionCallback, properties, null, arguments); - } else { - environment.getRuntime() - .invokeMethodAsyncSequentially(service, resourceMethod.getName(), null, RESOURCE_EXECUTION_STRAND, - executionCallback, properties, null, arguments); - } + environment.yieldAndRun(() -> { + CompletableFuture future = new CompletableFuture<>(); + ExecutionCallback executionCallback = new ExecutionCallback(future); + ArgumentHandler argumentHandler = new ArgumentHandler(resourceMethod, context, fieldObject, null, false); + Object[] arguments = argumentHandler.getArguments(); + HashMap properties = null; + if (ObserveUtils.isObservabilityEnabled() && ObserveUtils.isTracingEnabled()) { + properties = getPropertiesToPropagate(environment, context); + } + try { + Object result = callResourceMethod(environment.getRuntime(), service, resourceMethod.getName(), + properties, arguments); + executionCallback.notifySuccess(result); + } catch (BError bError) { + executionCallback.notifyFailure(bError); + } + return null; + }); } public static boolean hasRecordReturnType(BObject serviceObject, BArray path) { diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java index c83f5cf6f..1f08f5c67 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/EngineUtils.java @@ -18,7 +18,6 @@ package io.ballerina.stdlib.graphql.runtime.engine; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.creators.TypeCreator; import io.ballerina.runtime.api.creators.ValueCreator; import io.ballerina.runtime.api.flags.SymbolFlags; @@ -29,6 +28,7 @@ import io.ballerina.runtime.api.types.ResourceMethodType; import io.ballerina.runtime.api.types.ServiceType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; @@ -46,7 +46,7 @@ import java.util.List; import java.util.Map; -import static io.ballerina.runtime.api.TypeTags.SERVICE_TAG; +import static io.ballerina.runtime.api.types.TypeTags.SERVICE_TAG; import static io.ballerina.stdlib.graphql.runtime.engine.Engine.RESOURCE_MAP; import static io.ballerina.stdlib.graphql.runtime.engine.Engine.getDecodedSchema; import static io.ballerina.stdlib.graphql.runtime.utils.Utils.ERROR_TYPE; diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ExecutionCallback.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ExecutionCallback.java index 0fa6d93ce..e71082abc 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ExecutionCallback.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ExecutionCallback.java @@ -18,25 +18,24 @@ package io.ballerina.stdlib.graphql.runtime.engine; -import io.ballerina.runtime.api.Future; -import io.ballerina.runtime.api.async.Callback; import io.ballerina.runtime.api.values.BError; +import java.util.concurrent.CompletableFuture; + /** * Callback class for executing Ballerina dependently type methods. */ -public class ExecutionCallback implements Callback { - private final Future future; +public class ExecutionCallback { + private final CompletableFuture future; - ExecutionCallback(Future future) { + ExecutionCallback(CompletableFuture future) { this.future = future; } - @Override + public void notifySuccess(Object o) { this.future.complete(o); } - @Override public void notifyFailure(BError bError) { bError.printStackTrace(); // Service level `panic` is captured in this method. diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/SchemaRecordGenerator.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/SchemaRecordGenerator.java index da62def3c..9bc8e9722 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/SchemaRecordGenerator.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/SchemaRecordGenerator.java @@ -79,7 +79,7 @@ /** * This class is used to generate a Ballerina {@code __Schema} record from the {@code Schema} object. */ -public class SchemaRecordGenerator { +public final class SchemaRecordGenerator { private final Schema schema; private final Map> typeRecords; diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/meta/ServiceAnalyzer.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/meta/ServiceAnalyzer.java index e4b345f3f..1d0da4b0f 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/meta/ServiceAnalyzer.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/meta/ServiceAnalyzer.java @@ -18,7 +18,6 @@ package io.ballerina.stdlib.graphql.runtime.engine.meta; -import io.ballerina.runtime.api.TypeTags; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Field; import io.ballerina.runtime.api.types.MapType; @@ -30,6 +29,7 @@ import io.ballerina.runtime.api.types.StreamType; import io.ballerina.runtime.api.types.TableType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.types.UnionType; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.utils.TypeUtils; diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/ModuleUtils.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/ModuleUtils.java index ce5fc9925..37491a2d8 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/ModuleUtils.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/ModuleUtils.java @@ -20,6 +20,9 @@ import io.ballerina.runtime.api.Environment; import io.ballerina.runtime.api.Module; +import io.ballerina.runtime.api.creators.ErrorCreator; + +import java.util.concurrent.CompletableFuture; /** * This class includes the utility functions related to Ballerina GraphQL module. @@ -39,4 +42,12 @@ public static void setModule(Environment environment) { public static Module getModule() { return module; } + + public static Object getResult(CompletableFuture balFuture) { + try { + return balFuture.get(); + } catch (Throwable throwable) { + throw ErrorCreator.createError(throwable); + } + } } diff --git a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/Utils.java b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/Utils.java index 01883f103..fd368186d 100644 --- a/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/Utils.java +++ b/native/src/main/java/io/ballerina/stdlib/graphql/runtime/utils/Utils.java @@ -18,11 +18,10 @@ package io.ballerina.stdlib.graphql.runtime.utils; -import io.ballerina.runtime.api.TypeTags; -import io.ballerina.runtime.api.async.StrandMetadata; import io.ballerina.runtime.api.creators.ErrorCreator; import io.ballerina.runtime.api.types.ArrayType; import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.types.TypeTags; import io.ballerina.runtime.api.utils.StringUtils; import io.ballerina.runtime.api.values.BError; import io.ballerina.runtime.api.values.BObject; @@ -52,20 +51,6 @@ private Utils() { public static final String SUBGRAPH_SUB_MODULE_NAME = "graphql.subgraph"; public static final String PACKAGE_ORG = "ballerina"; - public static final StrandMetadata RESOURCE_EXECUTION_STRAND = new StrandMetadata(getModule().getOrg(), - getModule().getName(), - getModule().getMajorVersion(), - EXECUTE_RESOURCE_FUNCTION); - public static final StrandMetadata REMOTE_EXECUTION_STRAND = new StrandMetadata(getModule().getOrg(), - getModule().getName(), - getModule().getMajorVersion(), - EXECUTE_RESOURCE_FUNCTION); - - public static final StrandMetadata INTERCEPTOR_EXECUTION_STRAND = new StrandMetadata(getModule().getOrg(), - getModule().getName(), - getModule().getMajorVersion(), - EXECUTE_INTERCEPTOR_FUNCTION); - public static BError createError(String message, String errorTypeName) { return ErrorCreator.createError(getModule(), errorTypeName, StringUtils.fromString(message), null, null); } diff --git a/native/src/main/java/module-info.java b/native/src/main/java/module-info.java index 9c28f274b..9273966bf 100644 --- a/native/src/main/java/module-info.java +++ b/native/src/main/java/module-info.java @@ -21,4 +21,5 @@ requires io.ballerina.stdlib.constraint; requires io.ballerina.stdlib.graphql.commons; requires io.ballerina.lang; + requires jdk.jshell; }