CORE-16983 / CORE-16967 Atomic Swap with Facade - API

application/src/main/java/net/corda/v5/application/interop/parameters/ParameterTypeLabel.java

@@ -1,5 +1,6 @@
 package net.corda.v5.application.interop.parameters;
 
+import net.corda.v5.application.crypto.DigitalSignatureAndMetadata;
 import org.jetbrains.annotations.NotNull;
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -16,7 +17,8 @@ public enum ParameterTypeLabel {
     UUID(java.util.UUID.class),
     TIMESTAMP(ZonedDateTime.class),
     BYTES(ByteBuffer.class),
-    JSON(String.class);
+    JSON(String.class),
+    SIGNED_TX(DigitalSignatureAndMetadata.class);
 
     @NotNull
     private final Class<?> expectedClass;

application/src/main/java/net/corda/v5/application/marshalling/InteropJsonMarshallingService.java

@@ -0,0 +1,16 @@
+package net.corda.v5.application.marshalling;
+
+import net.corda.v5.application.flows.ClientStartableFlow;
+import net.corda.v5.base.annotations.DoNotImplement;
+
+/**
+ * {@link InteropJsonMarshallingService} marshalls to and from JSON using the registered JSON mapper.
+ * <p>
+ * The platform will provide an instance of {@link InteropJsonMarshallingService} to flows via property injection.
+ * <p>
+ * Example usage:
+ * @see ClientStartableFlow
+ */
+@DoNotImplement
+public interface InteropJsonMarshallingService extends MarshallingService {
+}

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 = 24
+cordaApiRevision = 25
 
 # Main
 kotlinVersion = 1.8.21