Skip to content

Add namespaces for header and body fields #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nuvindu merged 5 commits into from
Aug 6, 2025
Merged

Add namespaces for header and body fields #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a39457
Add namespaces for header and body fields
Nuvindu Aug 6, 2025
377def4
Add namespaces to header and body fields in test resource files
Nuvindu Aug 6, 2025
efce378
Merge branch 'main' of https://github.com/ballerina-platform/wsdl-too…
Nuvindu Aug 6, 2025
bc5f387
[Automated] Update the native jar versions
Nuvindu Aug 6, 2025
167a527
Bump the version to 1.2.0
Nuvindu Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.caching=true
group=io.ballerina
version=1.1.2-SNAPSHOT
version=1.2.0-SNAPSHOT

# Dependencies
ballerinaLangVersion=2201.11.0
Expand Down
4 changes: 2 additions & 2 deletions module-ballerina-wsdl/BalTool.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
id = "wsdl"

[[dependency]]
path = "../wsdl-cli/build/libs/wsdl-cli-1.1.1.jar"
path = "../wsdl-cli/build/libs/wsdl-cli-1.2.0-SNAPSHOT.jar"

[[dependency]]
path = "../wsdl-core/build/libs/wsdl-core-1.1.1.jar"
path = "../wsdl-core/build/libs/wsdl-core-1.2.0-SNAPSHOT.jar"

[[dependency]]
path = "lib/xsd-core-1.1.1.jar"
Expand Down
2 changes: 1 addition & 1 deletion module-ballerina-wsdl/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
distribution = "2201.11.0"
org = "ballerina"
name = "wsdltool"
version = "1.1.1"
version = "1.2.0"
authors = ["Ballerina"]
keywords = ["wsdl"]
repository = "https://github.com/ballerina-platform/wsdl-tools"
Expand Down
2 changes: 1 addition & 1 deletion module-ballerina-wsdl/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ distribution-version = "2201.11.0"
[[package]]
org = "ballerina"
name = "wsdltool"
version = "1.1.1"
version = "1.2.0"
modules = [
{org = "ballerina", packageName = "wsdltool", moduleName = "wsdltool"}
]
Expand Down
6 changes: 4 additions & 2 deletions wsdl-core/src/main/java/io/ballerina/wsdl/core/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ public static String formatModuleParts(ModulePartNode modulePartNode) throws For
public static void generateTypeDefinitions(String namespace, Map<String, ModuleMemberDeclarationNode> nodes,
String requestType, String requestFieldName, String responseType,
String responseFieldName, OperationContext operation) {
String requestBody = operation.requestBodyName() + WHITESPACE + BODY_FIELD;
String requestHeader = operation.requestHeaderName() + WHITESPACE + HEADER + QUESTION_MARK + SEMICOLON;
String requestBody = String.format(XMLDATA_NAMESPACE, SOAP, namespace) + LINE_BREAK +
operation.requestBodyName() + WHITESPACE + BODY_FIELD;
String requestHeader = String.format(XMLDATA_NAMESPACE, SOAP, namespace) + LINE_BREAK +
operation.requestHeaderName() + WHITESPACE + HEADER + QUESTION_MARK + SEMICOLON;
generateTypeDefinition(namespace, nodes, operation.requestName(),
requestHeader + requestBody, true);
generateTypeDefinition(namespace, nodes, operation.requestBodyName(), requestType +
Expand Down
2 changes: 2 additions & 0 deletions wsdl-core/src/test/resources/expected/calculator.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public type MultiplyCalculatorSoap12RequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
public type MultiplyCalculatorSoap12SoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
MultiplyCalculatorSoap12Header Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
MultiplyCalculatorSoap12RequestBody Body;
};
4 changes: 4 additions & 0 deletions wsdl-core/src/test/resources/expected/calculator_with_multiple_operations.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ public type AddCalculatorSoap12RequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
public type AddCalculatorSoap12SoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
AddCalculatorSoap12Header Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
AddCalculatorSoap12RequestBody Body;
};

Expand All @@ -66,6 +68,8 @@ public type MultiplyCalculatorSoap12RequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
public type MultiplyCalculatorSoap12SoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
MultiplyCalculatorSoap12Header Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://www.w3.org/2003/05/soap-envelope"}
MultiplyCalculatorSoap12RequestBody Body;
};
2 changes: 2 additions & 0 deletions wsdl-core/src/test/resources/expected/ecommerce_service.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public type GetProductRequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
public type GetProductSoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
GetProductHeader Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
GetProductRequestBody Body;
};
2 changes: 2 additions & 0 deletions wsdl-core/src/test/resources/expected/global_weather.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public type GetWeatherGlobalWeatherSoapRequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
public type GetWeatherGlobalWeatherSoapSoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
GetWeatherGlobalWeatherSoapHeader Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
GetWeatherGlobalWeatherSoapRequestBody Body;
};
2 changes: 2 additions & 0 deletions wsdl-core/src/test/resources/expected/phone_verify.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public type CheckPhoneNumberPhoneVerifySoapRequestBody record {
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
public type CheckPhoneNumberPhoneVerifySoapSoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
CheckPhoneNumberPhoneVerifySoapHeader Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
CheckPhoneNumberPhoneVerifySoapRequestBody Body;
};
2 changes: 2 additions & 0 deletions wsdl-core/src/test/resources/expected/reservation_service.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public type CancelReservationBasicHttpBindingOTA2010AReservationService1RequestB
@xmldata:Name {value: "Envelope"}
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
public type CancelReservationBasicHttpBindingOTA2010AReservationService1SoapRequest record {
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
CancelReservationBasicHttpBindingOTA2010AReservationService1Header Header?;
@xmldata:Namespace {prefix: "soap", uri: "http://schemas.xmlsoap.org/soap/envelope/"}
CancelReservationBasicHttpBindingOTA2010AReservationService1RequestBody Body;
};
Loading