Skip to content
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

Change bal add generated code to adhere to best practices #42136

Merged
merged 7 commits into from
Feb 16, 2024
Merged

Change bal add generated code to adhere to best practices #42136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9b7f2c
Fix emit diagnostics to print lifecycle plugin diagnostics
ShammiL Feb 8, 2024
b893dc9
Revert "Fix emit diagnostics to print lifecycle plugin diagnostics"
ShammiL Feb 8, 2024
3f68dac
Merge branch 'master' of https://github.com/ballerina-platform/baller…
ShammiL Feb 9, 2024
9132697
Improve code generated for bal add command
ShammiL Feb 9, 2024
1e7b5bc
Apply improvement to service template
ShammiL Feb 12, 2024
1dfeddb
Use string templates in templates
ShammiL Feb 12, 2024
b9d2460
Address comments
ShammiL Feb 15, 2024
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
8 changes: 4 additions & 4 deletions cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/lib.bal
View file
Open in desktop
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!";
}
3 changes: 1 addition & 2 deletions cli/ballerina-cli/src/main/resources/create_cmd_templates/lib/tests/lib_test.bal
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions cli/ballerina-cli/src/main/resources/create_cmd_templates/service/service.bal
View file
Open in desktop
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}`;
}
}
2 changes: 1 addition & 1 deletion cli/ballerina-cli/src/main/resources/create_cmd_templates/service/tests/service_test.bal
View file
Open in desktop
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
Loading