From 44b95618fc5db0c0380e0aa6fd949d7db285ae4a Mon Sep 17 00:00:00 2001
From: Alexander Cramb <alex.cramb@r3.com>
Date: Tue, 24 Oct 2023 11:27:27 +0100
Subject: [PATCH] CORE-16626 Replace string UUIDs with UUID objects (#1290)

# Changes
- Change type of groupId field in `IntropIdentityInfo` from string to UUID object.
- Change type of groupId parameter of `callFacade()` in `FlowMessaging` from string to UUID object.
- Bump API version to 24.
---
 .../net/corda/v5/application/interop/InterOpIdentityInfo.java  | 3 ++-
 .../java/net/corda/v5/application/messaging/FlowMessaging.java | 3 ++-
 gradle.properties                                              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/net/corda/v5/application/interop/InterOpIdentityInfo.java b/application/src/main/java/net/corda/v5/application/interop/InterOpIdentityInfo.java
index 4671ce224a..521a539cfe 100644
--- a/application/src/main/java/net/corda/v5/application/interop/InterOpIdentityInfo.java
+++ b/application/src/main/java/net/corda/v5/application/interop/InterOpIdentityInfo.java
@@ -4,6 +4,7 @@
 import net.corda.v5.base.annotations.CordaSerializable;
 import org.jetbrains.annotations.NotNull;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * This interface represents the InterOp Identity Info that have been registered with the User.
@@ -27,7 +28,7 @@ public interface InterOpIdentityInfo {
     List<FacadeId> getFacadeIds();
 
     @NotNull
-    String getGroupId();
+    UUID getGroupId();
 
     @NotNull
     String getX500Name();
diff --git a/application/src/main/java/net/corda/v5/application/messaging/FlowMessaging.java b/application/src/main/java/net/corda/v5/application/messaging/FlowMessaging.java
index 71ff01e1de..226d7fccfc 100644
--- a/application/src/main/java/net/corda/v5/application/messaging/FlowMessaging.java
+++ b/application/src/main/java/net/corda/v5/application/messaging/FlowMessaging.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * {@link FlowMessaging} allows a flow to initiate and communicate with one or more 3rd party flows.
@@ -162,7 +163,7 @@ public interface FlowMessaging {
     @NotNull
     String callFacade(
             @NotNull MemberX500Name memberName,
-            @NotNull String interopGroupId,
+            @NotNull UUID interopGroupId,
             @NotNull String facadeName,
             @NotNull String methodName,
             @NotNull String payload);
diff --git a/gradle.properties b/gradle.properties
index 314a40f30f..b9a08da1fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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 = 23
+cordaApiRevision = 24
 
 # Main
 kotlinVersion = 1.8.21