diff --git a/.gitignore b/.gitignore index b281f40..20685ee 100644 --- a/.gitignore +++ b/.gitignore @@ -42,5 +42,4 @@ bin/ # Ballerina velocity.log* -*Ballerina.lock -Dependencies.toml \ No newline at end of file +*Ballerina.lock \ No newline at end of file diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index d6bde43..d48602b 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,15 +1,16 @@ [package] org = "ballerina" -name = "data" +name = "data.xml" version = "0.1.0" authors = ["Ballerina"] -keywords = ["xml", "json"] -repository = "https://github.com/hasithaa/module-ballerina-data" +keywords = ["xml"] +repository = "https://github.com/ballerina-platform/module-ballerina-data.xml" license = ["Apache-2.0"] -distribution = "2201.5.0" +distribution = "2201.8.1" +export = ["data.xml"] -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "data-native" version = "0.1.0" -path = "../native/build/libs/data-native-0.1.0-SNAPSHOT.jar" +path = "../native/build/libs/data-xml-native-0.1.0-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml new file mode 100644 index 0000000..5c4a5ea --- /dev/null +++ b/ballerina/Dependencies.toml @@ -0,0 +1,74 @@ +# AUTO-GENERATED FILE. DO NOT MODIFY. + +# This file is auto-generated by Ballerina for managing dependency versions. +# It should not be modified by hand. + +[ballerina] +dependencies-toml-version = "2" +distribution-version = "2201.8.1" + +[[package]] +org = "ballerina" +name = "data.xml" +version = "0.1.0" +dependencies = [ + {org = "ballerina", name = "io"}, + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "test"} +] +modules = [ + {org = "ballerina", packageName = "data.xml", moduleName = "data.xml"} +] + +[[package]] +org = "ballerina" +name = "io" +version = "1.5.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.value"} +] +modules = [ + {org = "ballerina", packageName = "io", moduleName = "io"} +] + +[[package]] +org = "ballerina" +name = "jballerina.java" +version = "0.0.0" +modules = [ + {org = "ballerina", packageName = "jballerina.java", moduleName = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.error" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "lang.value" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"} +] + +[[package]] +org = "ballerina" +name = "test" +version = "0.0.0" +scope = "testOnly" +dependencies = [ + {org = "ballerina", name = "jballerina.java"}, + {org = "ballerina", name = "lang.error"} +] +modules = [ + {org = "ballerina", packageName = "test", moduleName = "test"} +] + diff --git a/ballerina/build.gradle b/ballerina/build.gradle index 012d993..a2fcf0d 100644 --- a/ballerina/build.gradle +++ b/ballerina/build.gradle @@ -32,17 +32,18 @@ buildscript { } } -description = 'Ballerina - Data Ballerina Generator' +description = 'Ballerina - Data XML Module' -def packageName = "data" +def packageName = "data-xml" def packageOrg = "ballerina" + def tomlVersion = stripBallerinaExtensionVersion("${project.version}") def ballerinaTomlFilePlaceHolder = new File("${project.rootDir}/build-config/resources/Ballerina.toml") def ballerinaTomlFile = new File("$project.projectDir/Ballerina.toml") def stripBallerinaExtensionVersion(String extVersion) { if (extVersion.matches(project.ext.timestampedVersionRegex)) { - def splitVersion = extVersion.split('-') + def splitVersion = extVersion.split('-'); if (splitVersion.length > 3) { def strippedValues = splitVersion[0..-4] return strippedValues.join('-') @@ -62,6 +63,10 @@ ballerina { langVersion = ballerinaLangVersion } +configurations { + externalJars +} + task updateTomlFiles { doLast { def newConfig = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version) @@ -71,7 +76,16 @@ task updateTomlFiles { } task commitTomlFiles { - + doLast { + project.exec { + ignoreExitValue true + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine 'cmd', '/c', "git commit -m \"[Automated] Update the native jar versions\" Ballerina.toml Dependencies.toml" + } else { + commandLine 'sh', '-c', "git commit -m '[Automated] Update the native jar versions' Ballerina.toml Dependencies.toml" + } + } + } } publishing { @@ -93,9 +107,14 @@ publishing { } } -updateTomlFiles.dependsOn unpackJballerinaTools +task deleteDependencyTomlFiles { + if (project.hasProperty("deleteDependencies")) { + delete "${project.projectDir}/Dependencies.toml" + } +} build.dependsOn "generatePomFileForMavenPublication" build.dependsOn ":${packageName}-native:build" +build.dependsOn deleteDependencyTomlFiles test.dependsOn ":${packageName}-native:build" diff --git a/ballerina/tests/.keep b/ballerina/tests/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/ballerina/tests/resources/default_namespaced_invoice.xml b/ballerina/tests/resources/default_namespaced_invoice.xml new file mode 100644 index 0000000..9665c61 --- /dev/null +++ b/ballerina/tests/resources/default_namespaced_invoice.xml @@ -0,0 +1,42 @@ + + + + This is the description for + Product 1. + + 57.70 + Home and Garden + + + This is the description for + Product 2. + + 6312.36 + Books + + + + + John Doe + john@example.com + 569-5052 +
+ MZ738SI4DV St. + Newport + NY + 19140 +
+ + + Jane Doe + jane@example.com + 674-2864 +
+ ZI0TGK3BKG St. + Otherville + CA + 77855 +
+ + + \ No newline at end of file diff --git a/ballerina/tests/resources/namespaced_invoice.xml b/ballerina/tests/resources/namespaced_invoice.xml new file mode 100644 index 0000000..cbae992 --- /dev/null +++ b/ballerina/tests/resources/namespaced_invoice.xml @@ -0,0 +1,38 @@ + + + + This is the description for Product 1. + 57.70 + Home and Garden + + + This is the description for Product 2. + 6312.36 + Books + + + + + John Doe + john@example.com + 569-5052 + + MZ738SI4DV St. + Newport + NY + 19140 + + + + Jane Doe + jane@example.com + 674-2864 + + ZI0TGK3BKG St. + Otherville + CA + 77855 + + + + diff --git a/ballerina/tests/stream_default_namspace_test.bal b/ballerina/tests/stream_default_namspace_test.bal new file mode 100644 index 0000000..dde58dc --- /dev/null +++ b/ballerina/tests/stream_default_namspace_test.bal @@ -0,0 +1,153 @@ +// Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). +// +// WSO2 LLC. licenses this file to you under the Apache License, +// Version 2.0 (the "License"); you may not use this file except +// in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +import ballerina/io; +import ballerina/test; + +@Namespace { + uri: "http://www.example.com/products" +} +type ProductFull record { + @Namespace { + uri: "http://www.example.com/products" + } + string description; + @Namespace { + uri: "http://www.example.com/products" + } + PriceFull price; + @Namespace { + uri: "http://www.example.com/products" + } + string category; + @Attribute + int id; + @Attribute + string name; +}; + +@Namespace { + uri: "http://www.example.com/products" +} +type PriceFull record { + decimal \#content; + @Attribute + string currency; +}; + +@Namespace { + uri: "http://www.example.com/products" +} +type ProductsFull record { + ProductFull[] product; +}; + +@Namespace { + uri: "http://www.example.com/customer" +} +type AddressFull record { + @Namespace { + uri: "http://www.example.com/customer" + } + string street; + @Namespace { + uri: "http://www.example.com/customer" + } + string city; + @Namespace { + uri: "http://www.example.com/customer" + } + string state; + @Namespace { + uri: "http://www.example.com/customer" + } + int zip; +}; + +@Namespace { + uri: "http://www.example.com/customer" +} +type CustomerFull record { + @Namespace { + uri: "http://www.example.com/customer" + } + string name; + @Namespace { + uri: "http://www.example.com/customer" + } + string email; + @Namespace { + uri: "http://www.example.com/customer" + } + string phone; + AddressFull address; + @Attribute + string id; +}; + +@Namespace { + uri: "http://www.example.com/customer" +} +type CustomersFull record { + CustomerFull[] customer; +}; + +@Name {value: "invoice"} +type InvoiceFull record { + ProductsFull products; + CustomersFull customers; +}; + +@test:Config +function testDefaultNamespaceInvoiceFull() returns error? { + stream dataStream = check io:fileReadBlocksAsStream("tests/resources/default_namespaced_invoice.xml"); + InvoiceFull invoice = check fromXmlStringWithType(dataStream); + + test:assertEquals(invoice.products.product[0].id, 1); + test:assertEquals(invoice.products.product[0].name, "Product 1"); + test:assertEquals(invoice.products.product[0].description, string `This is the description for + Product 1. + `); + test:assertEquals(invoice.products.product[0].price.\#content, 57.70d); + test:assertEquals(invoice.products.product[0].price.currency, "USD"); + test:assertEquals(invoice.products.product[0].category, "Home and Garden"); + + test:assertEquals(invoice.products.product[1].id, 2); + test:assertEquals(invoice.products.product[1].name, "Product 2"); + test:assertEquals(invoice.products.product[1].description, string `This is the description for + Product 2. + `); + test:assertEquals(invoice.products.product[1].price.\#content, 6312.36d); + test:assertEquals(invoice.products.product[1].price.currency, "LKR"); + test:assertEquals(invoice.products.product[1].category, "Books"); + + test:assertEquals(invoice.customers.customer[0].id, "C001"); + test:assertEquals(invoice.customers.customer[0].name, "John Doe"); + test:assertEquals(invoice.customers.customer[0].email, "john@example.com"); + test:assertEquals(invoice.customers.customer[0].phone, "569-5052"); + test:assertEquals(invoice.customers.customer[0].address.street, "MZ738SI4DV St."); + test:assertEquals(invoice.customers.customer[0].address.city, "Newport"); + test:assertEquals(invoice.customers.customer[0].address.state, "NY"); + test:assertEquals(invoice.customers.customer[0].address.zip, 19140); + + test:assertEquals(invoice.customers.customer[1].id, "C002"); + test:assertEquals(invoice.customers.customer[1].name, "Jane Doe"); + test:assertEquals(invoice.customers.customer[1].email, "jane@example.com"); + test:assertEquals(invoice.customers.customer[1].phone, "674-2864"); + test:assertEquals(invoice.customers.customer[1].address.street, "ZI0TGK3BKG St."); + test:assertEquals(invoice.customers.customer[1].address.city, "Otherville"); + test:assertEquals(invoice.customers.customer[1].address.state, "CA"); + test:assertEquals(invoice.customers.customer[1].address.zip, 77855); +} diff --git a/ballerina/tests/stream_namespace_test.bal b/ballerina/tests/stream_namespace_test.bal new file mode 100644 index 0000000..c4dc298 --- /dev/null +++ b/ballerina/tests/stream_namespace_test.bal @@ -0,0 +1,170 @@ +// Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). +// +// WSO2 LLC. licenses this file to you under the Apache License, +// Version 2.0 (the "License"); you may not use this file except +// in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +import ballerina/io; +import ballerina/test; + +@Namespace { + uri: "http://www.example.com/products", + prefix: "prod" +} +type ProductFullNS record { + @Namespace { + uri: "http://www.example.com/products", + prefix: "prod" + } + string description; + @Namespace { + uri: "http://www.example.com/products", + prefix: "prod" + } + PriceFullNS price; + @Namespace { + uri: "http://www.example.com/products", + prefix: "prod" + } + string category; + @Attribute + int id; + @Attribute + string name; +}; + +@Namespace { + uri: "http://www.example.com/products", + prefix: "prod" +} +type PriceFullNS record { + decimal \#content; + @Attribute + string currency; +}; + +@Namespace { + uri: "http://www.example.com/products", + prefix: "prod" +} +type ProductsFullNS record { + ProductFullNS[] product; +}; + +@Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" +} +type AddressFullNS record { + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string street; + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string city; + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string state; + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + int zip; +}; + +@Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" +} +type CustomerFullNS record { + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string name; + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string email; + @Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" + } + string phone; + AddressFullNS address; + @Attribute + string id; +}; + +@Namespace { + uri: "http://www.example.com/customer", + prefix: "cust" +} +type CustomersFullNS record { + CustomerFull[] customer; +}; + +@Name {value: "invoice"} +type InvoiceFullNS record { + ProductsFull products; + CustomersFull customers; +}; + +@test:Config +function testNamespaceInvoiceFull() returns error? { + stream dataStream = check io:fileReadBlocksAsStream("tests/resources/default_namespaced_invoice.xml"); + InvoiceFull invoice = check fromXmlStringWithType(dataStream); + + test:assertEquals(invoice.products.product[0].id, 1); + test:assertEquals(invoice.products.product[0].name, "Product 1"); + test:assertEquals(invoice.products.product[0].description, string `This is the description for + Product 1. + `); + test:assertEquals(invoice.products.product[0].price.\#content, 57.70d); + test:assertEquals(invoice.products.product[0].price.currency, "USD"); + test:assertEquals(invoice.products.product[0].category, "Home and Garden"); + + test:assertEquals(invoice.products.product[1].id, 2); + test:assertEquals(invoice.products.product[1].name, "Product 2"); + test:assertEquals(invoice.products.product[1].description, string `This is the description for + Product 2. + `); + test:assertEquals(invoice.products.product[1].price.\#content, 6312.36d); + test:assertEquals(invoice.products.product[1].price.currency, "LKR"); + test:assertEquals(invoice.products.product[1].category, "Books"); + + test:assertEquals(invoice.customers.customer[0].id, "C001"); + test:assertEquals(invoice.customers.customer[0].name, "John Doe"); + test:assertEquals(invoice.customers.customer[0].email, "john@example.com"); + test:assertEquals(invoice.customers.customer[0].phone, "569-5052"); + test:assertEquals(invoice.customers.customer[0].address.street, "MZ738SI4DV St."); + test:assertEquals(invoice.customers.customer[0].address.city, "Newport"); + test:assertEquals(invoice.customers.customer[0].address.state, "NY"); + test:assertEquals(invoice.customers.customer[0].address.zip, 19140); + + test:assertEquals(invoice.customers.customer[1].id, "C002"); + test:assertEquals(invoice.customers.customer[1].name, "Jane Doe"); + test:assertEquals(invoice.customers.customer[1].email, "jane@example.com"); + test:assertEquals(invoice.customers.customer[1].phone, "674-2864"); + test:assertEquals(invoice.customers.customer[1].address.street, "ZI0TGK3BKG St."); + test:assertEquals(invoice.customers.customer[1].address.city, "Otherville"); + test:assertEquals(invoice.customers.customer[1].address.state, "CA"); + test:assertEquals(invoice.customers.customer[1].address.zip, 77855); +} + diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle index 1304760..8d1e657 100644 --- a/build-config/checkstyle/build.gradle +++ b/build-config/checkstyle/build.gradle @@ -1,19 +1,18 @@ -/** - * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). +/* + * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * - * WSO2 LLC. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. */ plugins { @@ -24,8 +23,8 @@ apply plugin: 'java' task downloadCheckstyleRuleFiles(type: Download) { src([ - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml', - 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml' + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml', + 'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml' ]) overwrite false onlyIfNewer true @@ -46,4 +45,4 @@ artifacts.add('default', file("$project.buildDir/checkstyle.xml")) { artifacts.add('default', file("$project.buildDir/suppressions.xml")) { builtBy('downloadCheckstyleRuleFiles') -} +} \ No newline at end of file diff --git a/build-config/resources/Ballerina.toml b/build-config/resources/Ballerina.toml index 01a9b84..3ec6c36 100644 --- a/build-config/resources/Ballerina.toml +++ b/build-config/resources/Ballerina.toml @@ -1,15 +1,16 @@ [package] org = "ballerina" -name = "data" +name = "data.xml" version = "@toml.version@" authors = ["Ballerina"] -keywords = ["xml", "json"] -repository = "https://github.com/hasithaa/module-ballerina-data" +keywords = ["xml"] +repository = "https://github.com/ballerina-platform/module-ballerina-data.xml" license = ["Apache-2.0"] -distribution = "2201.5.0" +distribution = "2201.8.1" +export = ["data.xml"] -[[platform.java11.dependency]] +[[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "data-native" version = "@toml.version@" -path = "../native/build/libs/data-native-@project.version@.jar" +path = "../native/build/libs/data-xml-native-@project.version@.jar" diff --git a/build.gradle b/build.gradle index 9e9c763..52eb523 100644 --- a/build.gradle +++ b/build.gradle @@ -76,5 +76,5 @@ release { } task build { - dependsOn('data-ballerina:build') + dependsOn('data-xml-ballerina:build') } diff --git a/gradle.properties b/gradle.properties index 7cbef8d..e064fba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ group=io.ballerina.stdlib version=0.1.0-SNAPSHOT ballerinaLangVersion=2201.8.1 -checkstyleToolVersion=7.8.2 -puppycrawlCheckstyleVersion=8.18 -testngVersion=6.14.3 -slf4jVersion=1.7.30 -githubSpotbugsVersion=4.0.5 -githubJohnrengelmanShadowVersion=5.2.0 +checkstyleToolVersion=10.12.0 +puppycrawlCheckstyleVersion=10.12.0 +testngVersion=7.6.1 +slf4jVersion=2.0.7 +githubSpotbugsVersion=5.0.14 +githubJohnrengelmanShadowVersion=8.1.1 underCouchDownloadVersion=4.0.4 researchgateReleaseVersion=2.8.0 -ballerinaGradlePluginVersion=1.1.0 +ballerinaGradlePluginVersion=2.0.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +129,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/native/build.gradle b/native/build.gradle index 68fad31..250c984 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -22,7 +22,7 @@ plugins { id 'com.github.spotbugs' } -description = 'Ballerina - Data Java Utils' +description = 'Ballerina - Data.XML Java Utils' dependencies { implementation 'junit:junit:4.13.1' diff --git a/native/src/main/java/io/ballerina/stdlib/data/xml/BallerinaByteBlockInputStream.java b/native/src/main/java/io/ballerina/stdlib/data/xml/BallerinaByteBlockInputStream.java new file mode 100644 index 0000000..f705333 --- /dev/null +++ b/native/src/main/java/io/ballerina/stdlib/data/xml/BallerinaByteBlockInputStream.java @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package io.ballerina.stdlib.data.xml; + +import io.ballerina.runtime.api.Environment; +import io.ballerina.runtime.api.async.Callback; +import io.ballerina.runtime.api.async.StrandMetadata; +import io.ballerina.runtime.api.types.MethodType; +import io.ballerina.runtime.api.types.Type; +import io.ballerina.runtime.api.values.BArray; +import io.ballerina.runtime.api.values.BError; +import io.ballerina.runtime.api.values.BMap; +import io.ballerina.runtime.api.values.BObject; +import io.ballerina.runtime.api.values.BString; +import io.ballerina.stdlib.data.utils.DataUtils; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Map; +import java.util.concurrent.Semaphore; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.function.Consumer; + +/** + * Java Input Stream based on Ballerina byte block stream. stream + * + * @since 0.1.0 + */ +public class BallerinaByteBlockInputStream extends InputStream { + + private final BObject iterator; + private final Environment env; + private final String nextMethodName; + private final Type returnType; + private final String strandName; + private final StrandMetadata metadata; + private final Map properties; + private final AtomicBoolean done = new AtomicBoolean(false); + private final MethodType closeMethod; + private final Consumer futureResultConsumer; + + private byte[] currentChunk = new byte[0]; + private int nextChunkIndex = 0; + + public BallerinaByteBlockInputStream(Environment env, BObject iterator, MethodType nextMethod, + MethodType closeMethod, Consumer futureResultConsumer) { + this.env = env; + this.iterator = iterator; + this.nextMethodName = nextMethod.getName(); + this.returnType = nextMethod.getReturnType(); + this.closeMethod = closeMethod; + this.strandName = env.getStrandName().orElse(""); + this.metadata = env.getStrandMetadata(); + this.properties = Map.of(); + this.futureResultConsumer = futureResultConsumer; + } + + @Override + public int read() { + if (done.get()) { + return -1; + } + if (hasBytesInCurrentChunk()) { + return currentChunk[nextChunkIndex++]; + } + // Need to get a new block from the stream, before reading again. + nextChunkIndex = 0; + try { + if (readNextChunk()) { + return read(); + } + } catch (InterruptedException e) { + BError error = DataUtils.getError("Cannot read the stream, interrupted error"); + futureResultConsumer.accept(error); + return -1; + } + return -1; + } + + @Override + public void close() throws IOException { + super.close(); + Semaphore semaphore = new Semaphore(0); + if (closeMethod != null) { + env.getRuntime().invokeMethodAsyncSequentially(iterator, closeMethod.getName(), strandName, metadata, + new Callback() { + @Override + public void notifyFailure(BError bError) { + semaphore.release(); + } + + @Override + public void notifySuccess(Object result) { + semaphore.release(); + } + }, properties, returnType); + } + try { + semaphore.acquire(); + } catch (InterruptedException e) { + throw new IOException("Error while closing the stream", e); + } + } + + private boolean hasBytesInCurrentChunk() { + return currentChunk.length != 0 && nextChunkIndex < currentChunk.length; + } + + private boolean readNextChunk() throws InterruptedException { + Semaphore semaphore = new Semaphore(0); + Callback callback = new Callback() { + + @Override + public void notifyFailure(BError bError) { + // Panic with an error + done.set(true); + futureResultConsumer.accept(bError); + currentChunk = new byte[0]; + semaphore.release(); + // TODO : Should we panic here? + } + + @Override + public void notifySuccess(Object result) { + if (result == null) { + done.set(true); + currentChunk = new byte[0]; + semaphore.release(); + return; + } + if (result instanceof BMap) { + BMap valueRecord = (BMap) result; + final BString value = Arrays.stream(valueRecord.getKeys()).findFirst().get(); + final BArray arrayValue = valueRecord.getArrayValue(value); + currentChunk = arrayValue.getByteArray(); + semaphore.release(); + } else { + // Case where Completes with an error + done.set(true); + semaphore.release(); + } + } + + }; + env.getRuntime().invokeMethodAsyncSequentially(iterator, nextMethodName, strandName, metadata, callback, + properties, returnType); + semaphore.acquire(); + return !done.get(); + } +} diff --git a/native/src/main/java/io/ballerina/stdlib/data/xml/Native.java b/native/src/main/java/io/ballerina/stdlib/data/xml/Native.java index df16f31..c39e6da 100644 --- a/native/src/main/java/io/ballerina/stdlib/data/xml/Native.java +++ b/native/src/main/java/io/ballerina/stdlib/data/xml/Native.java @@ -1,7 +1,13 @@ package io.ballerina.stdlib.data.xml; +import io.ballerina.runtime.api.Environment; +import io.ballerina.runtime.api.Future; +import io.ballerina.runtime.api.types.MethodType; +import io.ballerina.runtime.api.types.ObjectType; +import io.ballerina.runtime.api.utils.TypeUtils; import io.ballerina.runtime.api.values.BArray; import io.ballerina.runtime.api.values.BMap; +import io.ballerina.runtime.api.values.BObject; import io.ballerina.runtime.api.values.BStream; import io.ballerina.runtime.api.values.BString; import io.ballerina.runtime.api.values.BTypedesc; @@ -11,6 +17,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStreamReader; import java.io.StringReader; +import java.util.function.Consumer; /** * Xml conversion. @@ -19,20 +26,37 @@ */ public class Native { + private static final String METHOD_NAME_NEXT = "next"; + private static final String METHOD_NAME_CLOSE = "close"; + public static Object fromXmlWithType(BXml xml, BMap map, BTypedesc typed) { return null; } - public static Object fromXmlStringWithType(Object xml, BMap map, BTypedesc typed) { + public static Object fromXmlStringWithType(Environment env, Object xml, BMap map, + BTypedesc typed) { try { if (xml instanceof BString) { return XmlParser.parse(new StringReader(((BString) xml).getValue()), typed.getDescribingType()); } else if (xml instanceof BArray) { byte[] bytes = ((BArray) xml).getBytes(); - return XmlParser.parse( - new InputStreamReader(new ByteArrayInputStream(bytes)), typed.getDescribingType()); + return XmlParser.parse(new InputStreamReader(new ByteArrayInputStream(bytes)), + typed.getDescribingType()); } else if (xml instanceof BStream) { - return null; + final BObject iteratorObj = ((BStream) xml).getIteratorObj(); + final Future future = env.markAsync(); + ResultConsumer resultConsumer = new ResultConsumer<>(future); + try (var byteBlockSteam = new BallerinaByteBlockInputStream(env, iteratorObj, + resolveNextMethod(iteratorObj), + resolveCloseMethod(iteratorObj), + resultConsumer)) { + Object result = XmlParser.parse(new InputStreamReader(byteBlockSteam), typed.getDescribingType()); + future.complete(result); + return null; + } catch (Exception e) { + future.complete(DataUtils.getError("Error occurred while reading the stream: " + e.getMessage())); + return null; + } } else { return DataUtils.getError("invalid input type"); } @@ -40,4 +64,43 @@ public static Object fromXmlStringWithType(Object xml, BMap map return DataUtils.getError(e.getMessage()); } } + + static MethodType resolveNextMethod(BObject iterator) { + MethodType method = getMethodType(iterator, METHOD_NAME_NEXT); + if (method != null) { + return method; + } + throw new IllegalStateException("next method not found in the iterator object"); + } + + static MethodType resolveCloseMethod(BObject iterator) { + return getMethodType(iterator, METHOD_NAME_CLOSE); + } + + private static MethodType getMethodType(BObject iterator, String methodNameClose) { + ObjectType objectType = (ObjectType) TypeUtils.getReferredType(iterator.getOriginalType()); + MethodType[] methods = objectType.getMethods(); + // Assumes compile-time validation of the iterator object + for (MethodType method : methods) { + if (method.getName().equals(methodNameClose)) { + return method; + } + } + return null; + } + + /** + * This class will hold module related utility functions. + * + * @param The type of the result + * @param future The future to complete + * @since 0.1.0 + */ + private record ResultConsumer(Future future) implements Consumer { + + @Override + public void accept(T t) { + future.complete(t); + } + } } diff --git a/settings.gradle b/settings.gradle index a699e8b..85a89b1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,14 +20,14 @@ plugins { id "com.gradle.enterprise" version "3.2" } -rootProject.name = 'data' +rootProject.name = 'data.xml' include(':checkstyle') -include(':data-native') -include(':data-ballerina') +include(':data-xml-native') +include(':data-xml-ballerina') project(':checkstyle').projectDir = file("build-config${File.separator}checkstyle") -project(':data-native').projectDir = file('native') -project(':data-ballerina').projectDir = file('ballerina') +project(':data-xml-native').projectDir = file('native') +project(':data-xml-ballerina').projectDir = file('ballerina') gradleEnterprise { buildScan {