From 91326970dee1c562d2d8b107f3951fc739840f99 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Fri, 9 Feb 2024 13:52:53 +0530 Subject: [PATCH 1/4] Improve code generated for bal add command --- .../src/main/resources/create_cmd_templates/lib/lib.bal | 6 +++--- .../resources/create_cmd_templates/lib/tests/lib_test.bal | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal index 7a0681e5344c..a5b1af96448c 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal @@ -1,9 +1,9 @@ # Returns the string `Hello` with the input string name. # -# + name - name as a string +# + name - name as a string or nil # + return - "Hello, " with the input string name -public function hello(string name) returns string { - if !(name is "") { +public function hello(string? name) returns string { + if name !is () { return "Hello, " + name; } return "Hello, World!"; diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/tests/lib_test.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/tests/lib_test.bal index 31ce10dfbb64..4b725d91de93 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/tests/lib_test.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/tests/lib_test.bal @@ -21,8 +21,7 @@ function testFunction() { @test:Config {} function negativeTestFunction() { - string name = ""; - string welcomeMsg = hello(name); + string welcomeMsg = hello(()); test:assertEquals("Hello, World!", welcomeMsg); } From 1e7b5bcf681640d83034f58a23fc98315e800a5d Mon Sep 17 00:00:00 2001 From: ShammiL Date: Mon, 12 Feb 2024 10:41:51 +0530 Subject: [PATCH 2/4] Apply improvement to service template --- .../resources/create_cmd_templates/service/service.bal | 8 ++++---- .../create_cmd_templates/service/tests/service_test.bal | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal index 90f6a0cc7979..293489862114 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal @@ -7,11 +7,11 @@ service / on new http:Listener(9090) { # A resource for generating greetings # + name - the input string name # + return - string name with hello message or error - resource function get greeting(string name) returns string|error { + resource function get greeting(string? name) returns string|error { // Send a response back to the caller. - if name is "" { + if name is () { return error("name should not be empty!"); } - return "Hello, " + name; - } + return string `Hello, ${name}`; + } } diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/tests/service_test.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/tests/service_test.bal index 1e2c013c0280..0d85eb25166e 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/tests/service_test.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/tests/service_test.bal @@ -23,7 +23,7 @@ function testServiceWithProperName() { @test:Config {} function testServiceWithEmptyName() returns error? { - http:Response response = check testClient->get("/greeting/?name="); + http:Response response = check testClient->get("/greeting/"); test:assertEquals(response.statusCode, 500); json errorPayload = check response.getJsonPayload(); test:assertEquals(errorPayload.message, "name should not be empty!"); From 1dfeddb98cecd2323f5e97e55bf55da24d672175 Mon Sep 17 00:00:00 2001 From: ShammiL Date: Mon, 12 Feb 2024 10:42:12 +0530 Subject: [PATCH 3/4] Use string templates in templates --- .../src/main/resources/create_cmd_templates/lib/lib.bal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal index a5b1af96448c..ae6ddb6448cb 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal @@ -4,7 +4,7 @@ # + return - "Hello, " with the input string name public function hello(string? name) returns string { if name !is () { - return "Hello, " + name; + return string `Hello, ${name}`; } return "Hello, World!"; } From b9d24606cf56ac361328f0cfb9e36a0e65925ccb Mon Sep 17 00:00:00 2001 From: ShammiL Date: Thu, 15 Feb 2024 11:12:50 +0530 Subject: [PATCH 4/4] Address comments --- .../main/resources/create_cmd_templates/service/service.bal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal index 293489862114..597a58d2d1fa 100644 --- a/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal +++ b/cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal @@ -5,7 +5,7 @@ import ballerina/http; service / on new http:Listener(9090) { # A resource for generating greetings - # + name - the input string name + # + name - name as a string or nil # + return - string name with hello message or error resource function get greeting(string? name) returns string|error { // Send a response back to the caller. @@ -13,5 +13,5 @@ service / on new http:Listener(9090) { return error("name should not be empty!"); } return string `Hello, ${name}`; - } + } }