-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add CallerInfo annotation type validation
- Loading branch information
Showing
8 changed files
with
259 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
...mpiler-plugin-tests/src/test/resources/ballerina_sources/sample_package_10/Ballerina.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| [package] | ||
| org = "http_test" | ||
| name = "sample_10" | ||
| version = "0.1.0" |
98 changes: 98 additions & 0 deletions
98
...-compiler-plugin-tests/src/test/resources/ballerina_sources/sample_package_10/service.bal
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import ballerina/http; | ||
|
|
||
| type Person record {| | ||
| int id; | ||
| string name; | ||
| |}; | ||
|
|
||
| type AA record {| | ||
| string a; | ||
| |}; | ||
|
|
||
| service http:Service on new http:Listener(9090) { | ||
| resource function get callerInfo1(int xyz, @http:CallerInfo {respondType: string} http:Caller abc) { | ||
| checkpanic abc->respond("done"); | ||
| } | ||
|
|
||
| resource function get callerInfo2(@http:CallerInfo {respondType: int} http:Caller abc) { | ||
| error? err = abc->respond(56); | ||
| } | ||
|
|
||
| resource function get callerInfo3(@http:CallerInfo {respondType: int} http:Caller abc) { | ||
| var err = abc->respond({a:"abc"}); | ||
| if (err is error) { | ||
| } | ||
| } | ||
|
|
||
| resource function get callerInfo4(@http:CallerInfo {respondType: decimal} http:Caller abc) returns error? { | ||
| return abc->respond(5.6); | ||
| } | ||
|
|
||
| resource function get callerInfo5(@http:CallerInfo {respondType: string} http:Caller abc) returns error? { | ||
| var a = check abc->respond("done"); | ||
| } | ||
|
|
||
| resource function get callerInfo6(@http:CallerInfo {respondType: decimal} http:Caller abc) returns error? { | ||
| return abc->respond(5565.6d); | ||
| } | ||
|
|
||
| resource function get callerInfo7(@http:CallerInfo {} http:Caller abc) returns error? { | ||
| return abc->respond(54341.6); // no validation | ||
| } | ||
|
|
||
| resource function get callerInfo8(@http:CallerInfo http:Caller abc) returns error? { | ||
| var a = abc->respond("ufww"); // no validation | ||
| if (a is error) { | ||
| } | ||
| } | ||
|
|
||
| resource function get callerInfo9(@http:CallerInfo {respondType: Person}http:Caller abc) returns error? { | ||
| error? a = abc->respond({id:123, name:"elle"}); | ||
| } | ||
|
|
||
| resource function get callerInfo10(@http:CallerInfo {} http:Caller abc) returns error? { | ||
| checkpanic abc->respond(); // empty annotation value exp | ||
| } | ||
|
|
||
| resource function get callerInfo11(@http:CallerInfo {respondType: Person}http:Caller abc) returns error? { | ||
| return abc->'continue(); // different remote method call | ||
| } | ||
|
|
||
| resource function get callerInfo12(int xyz, @http:CallerInfo {respondType: string} http:Caller abc) { | ||
| int a = 5; | ||
| if (a > 0) { | ||
| checkpanic abc->respond("Go"); | ||
| } else { | ||
| error? ab = abc->respond({a:"hello"}); //error | ||
| } | ||
| } | ||
|
|
||
| resource function get callerInfo13(@http:CallerInfo {respondType: string} http:Caller abc, http:Caller xyz) { | ||
| checkpanic xyz->respond("done"); // error:multiple callers | ||
| } | ||
|
|
||
| resource function get callerInfo14(@untainted @http:CallerInfo {respondType: string} http:Caller abc) { | ||
| checkpanic abc->respond("done"); // multiple annotations | ||
| } | ||
|
|
||
| resource function get callerInfo15(@http:CallerInfo {respondType: string} http:Caller abc) returns error? { | ||
| http:Client c = check new("path"); | ||
| var a = c->get("done"); // different remote method call | ||
| if (a is error) { | ||
| } | ||
| } | ||
|
|
||
| resource function get callerInfo16(@http:CallerInfo {respondType: Person}http:Caller abc) returns error? { | ||
| Person p = {id:123, name:"elle"}; | ||
| error? a = abc->respond(p); | ||
| } | ||
|
|
||
| resource function get callerInfo17(@http:CallerInfo {respondType: Person}http:Caller abc) returns error? { | ||
| error? a = abc->respond({school:1.23}); // This getting passed as map | ||
| } | ||
|
|
||
| resource function get callerInfo18(@http:CallerInfo {respondType: Person}http:Caller abc) returns error? { | ||
| AA val = { a: "hello" }; | ||
| error? a = abc->respond(val); // error | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
...iler-plugin/src/main/java/io/ballerina/stdlib/http/compiler/RespondExpressionVisitor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. | ||
| * | ||
| * WSO2 Inc. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.ballerina.stdlib.http.compiler; | ||
|
|
||
| import io.ballerina.compiler.api.ModuleID; | ||
| import io.ballerina.compiler.api.symbols.TypeSymbol; | ||
| import io.ballerina.compiler.syntax.tree.NodeVisitor; | ||
| import io.ballerina.compiler.syntax.tree.PositionalArgumentNode; | ||
| import io.ballerina.compiler.syntax.tree.RemoteMethodCallActionNode; | ||
| import io.ballerina.compiler.syntax.tree.SimpleNameReferenceNode; | ||
| import io.ballerina.projects.plugins.SyntaxNodeAnalysisContext; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A class for visiting respond expression. | ||
| */ | ||
| public class RespondExpressionVisitor extends NodeVisitor { | ||
| private final SyntaxNodeAnalysisContext ctx; | ||
| private final String callerToken; | ||
| private List<PositionalArgumentNode> respondStatementNodes = new ArrayList<>(); | ||
|
|
||
| public RespondExpressionVisitor(SyntaxNodeAnalysisContext ctx, String callerToken) { | ||
| this.ctx = ctx; | ||
| this.callerToken = callerToken; | ||
| } | ||
|
|
||
| @Override | ||
| public void visit(RemoteMethodCallActionNode node) { | ||
| TypeSymbol typeSymbol = ctx.semanticModel().type(node.expression()).get(); | ||
| ModuleID moduleID = typeSymbol.getModule().get().id(); | ||
| if (!Constants.BALLERINA.equals(moduleID.orgName())) { | ||
| return; | ||
| } | ||
| if (!Constants.HTTP.equals(moduleID.moduleName())) { | ||
| return; | ||
| } | ||
| if (!Constants.CALLER_OBJ_NAME.equals(typeSymbol.getName().get())) { | ||
| return; | ||
| } | ||
| if (!callerToken.equals(node.expression().toString())) { | ||
| return; | ||
| } | ||
| SimpleNameReferenceNode simpleNameReferenceNode = node.methodName(); | ||
| if (simpleNameReferenceNode.name().text().equals(Constants.RESPOND_METHOD_NAME)) { | ||
| if (node.arguments().size() > 0) { | ||
| respondStatementNodes.add((PositionalArgumentNode) node.arguments().get(0)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| List<PositionalArgumentNode> getRespondStatementNodes() { | ||
| return respondStatementNodes; | ||
| } | ||
| } |