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

CORE-16382 Facade Service Takes FacadeId as Parameter not String #1294

Merged
merged 4 commits into from
Oct 23, 2023
Merged

CORE-16382 Facade Service Takes FacadeId as Parameter not String #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6297e4
Bump API version
ac101m Oct 11, 2023
b619b2e
Change facadeId parameter of getProxy from String to FacadeId
ac101m Oct 11, 2023
a5aa8c7
Make facade ID non nullable
ac101m Oct 11, 2023
0438669
Merge branch 'release/interop/syntax' into alex/CORE-16382
ac101m Oct 23, 2023
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
4 changes: 3 additions & 1 deletion application/src/main/java/net/corda/v5/application/interop/FacadeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package net.corda.v5.application.interop;

import net.corda.v5.application.interop.facade.Facade;
import net.corda.v5.application.interop.facade.FacadeId;
import net.corda.v5.application.interop.facade.FacadeRequest;
import net.corda.v5.application.interop.facade.FacadeResponse;
import net.corda.v5.base.annotations.Suspendable;
import org.jetbrains.annotations.NotNull;

/**
* Service to perform Corda to Corda interoperability calls using Facades.
Expand All @@ -21,7 +23,7 @@ public interface FacadeService {
* instance invokes a Facade method on a peer Identity denoted by an <code>alias</code> from an <code>interopGroup</code>.
*/
@Suspendable
<T> T getProxy(String facadeId, Class<T> expectedType, InterOpIdentityInfo interopIdentity);
<T> T getProxy(@NotNull FacadeId facadeId, Class<T> expectedType, InterOpIdentityInfo interopIdentity);

/**
* Interprets a Facade request and invokes a matching method on the target class.
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cordaProductVersion = 5.1.0-INTEROP
## IMPORTANT:
## The interop feature branches track api revisions separately to the mainline branch.
## API version of last merge from corda mainline: 32
cordaApiRevision = 22
cordaApiRevision = 23

# Main
kotlinVersion = 1.8.21
Expand Down