-
Notifications
You must be signed in to change notification settings - Fork 758
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33842 from rdhananjaya/fix-service-type-inference
Fix service type inference
- Loading branch information
Showing
10 changed files
with
348 additions
and
5 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
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
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
109 changes: 109 additions & 0 deletions
109
...ina-unit-test/src/test/resources/test-src/services/service_decl_distinct_listener_arg.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,109 @@ | ||
| // 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. | ||
|
|
||
| import ballerina/jballerina.java; | ||
|
|
||
| public type ServiceType distinct service object { | ||
| }; | ||
|
|
||
| public class Listener { | ||
| public isolated function 'start() returns error? { | ||
| return externStart(self); | ||
| } | ||
| public isolated function gracefulStop() returns error? { | ||
| } | ||
| public isolated function immediateStop() returns error? { | ||
| } | ||
| public isolated function detach(ServiceType s) returns error? { | ||
| } | ||
| public isolated function attach(ServiceType s, string[]|string? name = ()) returns error? { | ||
| return self.register(s, name); | ||
| } | ||
| isolated function register(service object {} s, string[]|string? name) returns error? { | ||
| return externAttach(s, name); | ||
| } | ||
|
|
||
| public function init() returns error? { | ||
| check externLInit(self); | ||
| } | ||
| } | ||
|
|
||
| isolated function externAttach(service object {} s, string[]|string? name) returns error? = @java:Method { | ||
| 'class: "org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name: "attach" | ||
| } external; | ||
|
|
||
| isolated function externStart(object {} o) returns error? = @java:Method { | ||
| 'class: "org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name: "start" | ||
| } external; | ||
|
|
||
| isolated function externLInit(object {} o) returns error? = @java:Method { | ||
| 'class: "org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name: "listenerInit" | ||
| } external; | ||
|
|
||
| function getService() returns object {} = @java:Method { | ||
| 'class: "org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name: "getService" | ||
| } external; | ||
|
|
||
| function reset() = @java:Method { | ||
| 'class: "org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name: "reset" | ||
| } external; | ||
|
|
||
| public function callMethod(service object {} s, string name) returns future<any|error> = @java:Method { | ||
| 'class:"org/ballerinalang/nativeimpl/jvm/servicetests/ServiceValue", | ||
| name:"callMethod" | ||
| } external; | ||
|
|
||
| listener lsn = new Listener(); | ||
|
|
||
| service / on lsn { | ||
|
|
||
| function init() returns error? { | ||
| } | ||
|
|
||
| resource function get processRequest() returns json { | ||
| return { output: "Hello" }; | ||
| } | ||
|
|
||
| function createError() returns @tainted error? { | ||
| return (); | ||
| } | ||
| } | ||
|
|
||
| function testServiceDecl() { | ||
| any|error v = wait callMethod(<service object {}> getService(), "$get$processRequest"); | ||
| reset(); | ||
| assertEquality(v, <json> { output: "Hello" }); | ||
| } | ||
|
|
||
| function assertEquality(any|error actual, any|error expected) { | ||
| if expected is anydata && actual is anydata && expected == actual { | ||
| return; | ||
| } | ||
|
|
||
| if expected === actual { | ||
| return; | ||
| } | ||
|
|
||
| string expectedValAsString = expected is error ? expected.toString() : expected.toString(); | ||
| string actualValAsString = actual is error ? actual.toString() : actual.toString(); | ||
| panic error("AssertionError", | ||
| message = "expected '" + expectedValAsString + "', found '" + actualValAsString + "'"); | ||
| } |
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
Oops, something went wrong.