Merge pull request #25 from Nuvindu/xsd-update

Refine native XSD core APIs

Author: Nuvindu

build-config/resources/BalTool.toml

@@ -8,7 +8,7 @@ path = "../wsdl-cli/build/libs/wsdl-cli-@toml.version@.jar"
 path = "../wsdl-core/build/libs/wsdl-core-@toml.version@.jar"
 
 [[dependency]]
-path = "lib/xsd-core-1.0.2.jar"
+path = "lib/xsd-core-@xsd-version@.jar"
 
 [[dependency]]
 path = "lib/wsdl4j-@wsdl4j-version@.jar"

build-config/resources/Ballerina.toml

@@ -14,5 +14,5 @@ observabilityIncluded = false
 [[platform.java21.dependency]]
 groupId = "io.ballerina"
 artifactId = "xsd-core"
-version = "1.0.2"
-path = "lib/xsd-core-1.0.2.jar"
+version = "@xsd-version@"
+path = "lib/xsd-core-@xsd-version@.jar"

gradle.properties

@@ -13,7 +13,7 @@ ballerinaGradlePluginVersion=2.3.0
 
 wsdl4jVersion=1.6.3
 apacheXmlSchemaVersion=1.4.7
-xsdCoreVersion=1.0.2
+xsdCoreVersion=1.0.7
 picocliVersion=4.0.1
 junitVersion=4.13.1
 junitEngineVersion=5.8.2

module-ballerina-wsdl/BalTool.toml

@@ -2,13 +2,13 @@
 id = "wsdl"
 
 [[dependency]]
-path = "../wsdl-cli/build/libs/wsdl-cli-1.0.1.jar"
+path = "../wsdl-cli/build/libs/wsdl-cli-1.0.2-SNAPSHOT.jar"
 
 [[dependency]]
-path = "../wsdl-core/build/libs/wsdl-core-1.0.1.jar"
+path = "../wsdl-core/build/libs/wsdl-core-1.0.2-SNAPSHOT.jar"
 
 [[dependency]]
-path = "lib/xsd-core-1.0.2.jar"
+path = "lib/xsd-core-1.0.7.jar"
 
 [[dependency]]
 path = "lib/wsdl4j-1.6.3.jar"

module-ballerina-wsdl/Ballerina.toml

@@ -2,7 +2,7 @@
 distribution = "2201.11.0"
 org = "ballerina"
 name = "wsdltool"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Ballerina"]
 keywords = ["wsdl"]
 repository = "https://github.com/ballerina-platform/wsdl-tools"
@@ -14,5 +14,5 @@ observabilityIncluded = false
 [[platform.java21.dependency]]
 groupId = "io.ballerina"
 artifactId = "xsd-core"
-version = "1.0.2"
-path = "lib/xsd-core-1.0.2.jar"
+version = "1.0.7"
+path = "lib/xsd-core-1.0.7.jar"

module-ballerina-wsdl/Dependencies.toml

@@ -10,7 +10,7 @@ distribution-version = "2201.11.0"
 [[package]]
 org = "ballerina"
 name = "wsdltool"
-version = "1.0.1"
+version = "1.0.2"
 modules = [
 	{org = "ballerina", packageName = "wsdltool", moduleName = "wsdltool"}
 ]

module-ballerina-wsdl/build.gradle

@@ -66,7 +66,7 @@ dependencies {
         transitive = false
     }
 
-    externalJars(group: 'io.ballerina', name: 'xsd-core', version: "1.0.2") {
+    externalJars(group: 'io.ballerina', name: 'xsd-core', version: "${xsdCoreVersion}") {
         transitive = false
     }
 }
@@ -75,12 +75,14 @@ task updateTomlFiles {
     doLast {
         def newConfig = ballerinaTomlFilePlaceHolder.text.replace("@project.version@", project.version)
         newConfig = newConfig.replace("@toml.version@", tomlVersion)
+        newConfig = newConfig.replace("@xsd-version@", xsdCoreVersion)
         ballerinaTomlFile.text = newConfig
 
         def newToolConfig = balToolTomlFilePlaceHolder.text.replace("@project.version@", project.version)
         newToolConfig = newToolConfig.replace("@toml.version@", project.version)
         newToolConfig = newToolConfig.replace("@wsdl4j-version@", wsdl4jVersion)
         newToolConfig = newToolConfig.replace("@xmlschema-version@", apacheXmlSchemaVersion)
+        newToolConfig = newToolConfig.replace("@xsd-version@", xsdCoreVersion)
         balToolTomlFile.text = newToolConfig
     }
 

wsdl-cli/build.gradle

@@ -28,8 +28,8 @@ configurations.all {
 
 dependencies {
     implementation project(':wsdl-core')
-    implementation 'org.ballerinalang:ballerina-cli:2201.5.0'
-    implementation 'info.picocli:picocli:4.0.1'
+    implementation group: 'info.picocli', name: 'picocli', version: "${picocliVersion}"
+    implementation group: 'org.ballerinalang', name: 'ballerina-cli', version: "${ballerinaLangVersion}"
     testImplementation group: 'junit', name: 'junit', version: "${junitVersion}"
     testImplementation group: 'org.testng', name: 'testng', version: "${testngVersion}"
     implementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: "${junitEngineVersion}"

wsdl-core/src/main/java/io/ballerina/wsdl/core/WsdlToBallerina.java

@@ -73,11 +73,7 @@
 import static io.ballerina.xsd.core.XSDToRecord.TARGET_NAMESPACE;
 import static io.ballerina.xsd.core.XSDToRecord.XMLDATA_NAME_ANNOTATION;
 import static io.ballerina.xsd.core.XSDToRecord.generateNodes;
-import static io.ballerina.xsd.core.XSDToRecord.processEnumerations;
-import static io.ballerina.xsd.core.XSDToRecord.processExtensions;
-import static io.ballerina.xsd.core.XSDToRecord.processNameResolvers;
-import static io.ballerina.xsd.core.XSDToRecord.processNestedElements;
-import static io.ballerina.xsd.core.XSDToRecord.processRootElements;
+import static io.ballerina.xsd.core.XSDToRecord.generateResidualNodes;
 import static io.ballerina.xsd.core.visitor.VisitorUtils.UNDERSCORE;
 import static io.ballerina.xsd.core.visitor.VisitorUtils.URI;
 import static io.ballerina.xsd.core.visitor.VisitorUtils.XMLDATA_NAMESPACE;
@@ -397,11 +393,7 @@ private Map<String, ModuleMemberDeclarationNode> generateTypeNodes(Types types,
             xsdVisitor.setTargetNamespace(((Schema) extElement).getElement().getAttribute(TARGET_NS));
             generateTypeNode(xsdVisitor, (Schema) extElement, nodes);
         }
-        processRootElements(nodes, xsdVisitor.getRootElements());
-        processNestedElements(nodes, xsdVisitor.getNestedElements());
-        processNameResolvers(nodes, xsdVisitor.getNameResolvers());
-        processExtensions(nodes, xsdVisitor);
-        processEnumerations(nodes, xsdVisitor.getEnumerationElements());
+        generateResidualNodes(nodes, xsdVisitor);
         return nodes;
     }