Merge pull request #2135 from ballerina-platform/fix-set-payload

Add `anydata` support for `setPayload` methods
ballerina-platform · Sep 10, 2024 · 23b5add · 23b5add
2 parents 33dff02 + 4de1320
commit 23b5add
Show file tree

Hide file tree

Showing 29 changed files with 143 additions and 69 deletions.
diff --git a/ballerina-tests/http-advanced-tests/Ballerina.toml b/ballerina-tests/http-advanced-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_advanced_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-advanced-tests/Dependencies.toml b/ballerina-tests/http-advanced-tests/Dependencies.toml
@@ -72,7 +72,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -105,7 +105,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_advanced_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "crypto"},
  {org = "ballerina", name = "file"},
@@ -125,7 +125,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-client-tests/Ballerina.toml b/ballerina-tests/http-client-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_client_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-client-tests/Dependencies.toml b/ballerina-tests/http-client-tests/Dependencies.toml
@@ -69,7 +69,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -102,7 +102,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_client_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "constraint"},
  {org = "ballerina", name = "http"},
@@ -121,7 +121,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-dispatching-tests/Ballerina.toml b/ballerina-tests/http-dispatching-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_dispatching_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-dispatching-tests/Dependencies.toml b/ballerina-tests/http-dispatching-tests/Dependencies.toml
@@ -69,7 +69,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -102,7 +102,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_dispatching_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "constraint"},
  {org = "ballerina", name = "http"},
@@ -124,7 +124,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-interceptor-tests/Ballerina.toml b/ballerina-tests/http-interceptor-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-interceptor-tests/Dependencies.toml b/ballerina-tests/http-interceptor-tests/Dependencies.toml
@@ -66,7 +66,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_interceptor_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "http"},
  {org = "ballerina", name = "http_test_common"},
@@ -115,7 +115,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-misc-tests/Ballerina.toml b/ballerina-tests/http-misc-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_misc_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-misc-tests/Dependencies.toml b/ballerina-tests/http-misc-tests/Dependencies.toml
@@ -66,7 +66,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_misc_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "http"},
  {org = "ballerina", name = "http_test_common"},
@@ -118,7 +118,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-misc-tests/tests/entity_body_with_charset_test.bal b/ballerina-tests/http-misc-tests/tests/entity_body_with_charset_test.bal
@@ -314,6 +314,12 @@ service /entityService on generalListener {
  }
  check caller->respond(response);
  }
+
+ resource function post anydataTest(AnydataRecord rec) returns http:Response {
+ http:Response response = new;
+ response.setPayload(rec);
+ return response;
+ }
 }
 
 final http:Client entityClient = check new ("http://localhost:" + generalPort.toString());
@@ -334,3 +340,31 @@ function jsonTest() {
  test:assertFail(msg = "Test Failed! " + <string>response.message());
  }
 }
+
+@test:Config {}
+function setPayloadWithAnydata() {
+ string path = "/entityService/anydataTest";
+ http:Request request = new;
+ AnydataRecord rec = {a: "ballerina", b: 1};
+ request.setPayload(rec);
+ http:Response|error response = entityClient->post(path, request);
+ if response is http:Response {
+ common:assertJsonPayload(response.getJsonPayload(), rec.toJson());
+ } else {
+ test:assertFail(msg = "Test Failed! " + response.message());
+ }
+}
+
+@test:Config {}
+function setPayloadWithAnydataDataBinding() {
+ string path = "/entityService/anydataTest";
+ http:Request request = new;
+ AnydataRecord rec = {a: "ballerina", b: 1};
+ request.setPayload(rec);
+ AnydataRecord|error response = entityClient->post(path, request);
+ if response is AnydataRecord {
+ test:assertEquals(response, rec);
+ } else {
+ test:assertFail(msg = "Test Failed! " + response.message());
+ }
+}
diff --git a/ballerina-tests/http-misc-tests/tests/http_request_setPayload_test.bal b/ballerina-tests/http-misc-tests/tests/http_request_setPayload_test.bal
@@ -145,3 +145,18 @@ function testRequestSetBinaryPayload() returns error? {
  test:assertEquals(req.getContentType(), "binary/test2", msg = "Found unexpected headerValue");
  return;
 }
+
+type AnydataRecord record {
+ string a;
+ int b;
+};
+
+@test:Config {}
+function testRequestSetAnydataPayload() returns error? {
+ http:Request req = new;
+ AnydataRecord testValue = {a: "ballerina", b: 1};
+ req.setPayload(testValue);
+ test:assertEquals(req.getContentType(), "application/json", msg = "Found unexpected headerValue");
+ json payload = check req.getJsonPayload();
+ test:assertEquals(payload, testValue.toJson(), msg = "Found unexpected payload");
+}
diff --git a/ballerina-tests/http-misc-tests/tests/http_response_setPayload_test.bal b/ballerina-tests/http-misc-tests/tests/http_response_setPayload_test.bal
@@ -186,3 +186,13 @@ function testResponseSetByteStream() returns error? {
  test:assertEquals(res.getContentType(), "stream/test2", msg = "Found unexpected headerValue");
  return;
 }
+
+@test:Config {}
+function testResponseSetAnydataPayload() returns error? {
+ http:Response res = new;
+ AnydataRecord testValue = {a: "ballerina", b: 1};
+ res.setPayload(testValue);
+ test:assertEquals(res.getContentType(), "application/json", msg = "Found unexpected headerValue");
+ json payload = check res.getJsonPayload();
+ test:assertEquals(payload, testValue.toJson(), msg = "Found unexpected payload");
+}
diff --git a/ballerina-tests/http-resiliency-tests/Ballerina.toml b/ballerina-tests/http-resiliency-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_resiliency_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"
diff --git a/ballerina-tests/http-resiliency-tests/Dependencies.toml b/ballerina-tests/http-resiliency-tests/Dependencies.toml
@@ -66,7 +66,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "auth"},
@@ -99,7 +99,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_resiliency_tests"
-version = "2.12.0"
+version = "2.12.1"
 dependencies = [
  {org = "ballerina", name = "http"},
  {org = "ballerina", name = "http_test_common"},
@@ -116,7 +116,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http_test_common"
-version = "2.12.0"
+version = "2.12.1"
 scope = "testOnly"
 dependencies = [
  {org = "ballerina", name = "http"},

diff --git a/ballerina-tests/http-security-tests/Ballerina.toml b/ballerina-tests/http-security-tests/Ballerina.toml
@@ -1,17 +1,17 @@
 [package]
 org = "ballerina"
 name = "http_security_tests"
-version = "2.12.0"
+version = "2.12.1"
 
 [[dependency]]
 org = "ballerina"
 name = "http_test_common"
 repository = "local"
-version = "2.12.0"
+version = "2.12.1"
 
 [platform.java17]
 graalvmCompatible = true
 
 [[platform.java17.dependency]]
 scope = "testOnly"
-path = "../../test-utils/build/libs/http-test-utils-2.12.0.jar"
+path = "../../test-utils/build/libs/http-test-utils-2.12.1-SNAPSHOT.jar"