Skip to content

Commit

Permalink
Merge pull request #42136 from ShammiL/add-code
Browse files Browse the repository at this point in the history
Change `bal add` generated code to adhere to best practices
  • Loading branch information
ShammiL authored Feb 16, 2024
2 parents a917416 + b9d2460 commit c0c8613
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# 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 "") {
return "Hello, " + name;
public function hello(string? name) returns string {
if name !is () {
return string `Hello, ${name}`;
}
return "Hello, World!";
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ function testFunction() {

@test:Config {}
function negativeTestFunction() {
string name = "";
string welcomeMsg = hello(name);
string welcomeMsg = hello(());
test:assertEquals("Hello, World!", welcomeMsg);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ 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 {
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}`;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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!");
Expand Down

0 comments on commit c0c8613

Please sign in to comment.