Adding new claim commands.

Author: MrMatthewLayton

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         junit_version = '5.3.1'
 
         onixlabs_group = 'io.onixlabs'
-        onixlabs_corda_core_release_version = '1.0.0'
+        onixlabs_corda_core_release_version = '1.1.0'
 
         cordapp_platform_version = 8
         cordapp_contract_name = 'ONIXLabs Corda Identity Framework Contract'
@@ -45,7 +45,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '1.0.0'
+version '2.0.0'
 
 subprojects {
     repositories {
@@ -65,6 +65,7 @@ subprojects {
         }
     }
 
+    apply plugin: 'java'
     apply plugin: 'kotlin'
     apply plugin: 'maven-publish'
     apply plugin: 'net.corda.plugins.cordapp'

onixlabs-corda-identity-framework-integration/src/main/kotlin/io/onixlabs/corda/identityframework/integration/ClaimCommandService.kt

@@ -39,6 +39,21 @@ import net.corda.core.transactions.SignedTransaction
  */
 class ClaimCommandService(rpc: CordaRPCOps) : RPCService(rpc) {
 
+    /**
+     * Issues a claim.
+     *
+     * @param claim The claim to issue.
+     * @param notary The notary to use for the transaction.
+     * @param observers Additional observers of the transaction.
+     */
+    fun <T : Any> issueClaim(
+        claim: CordaClaim<T>,
+        notary: Party? = null,
+        observers: Set<Party> = emptySet()
+    ): FlowProgressHandle<SignedTransaction> {
+        return rpc.startTrackedFlow(IssueClaimFlow::Initiator, claim, notary, observers)
+    }
+
     /**
      * Issues a claim.
      *
@@ -60,12 +75,24 @@ class ClaimCommandService(rpc: CordaRPCOps) : RPCService(rpc) {
         notary: Party? = null,
         observers: Set<Party> = emptySet()
     ): FlowProgressHandle<SignedTransaction> {
-        return rpc.startTrackedFlow(
-            IssueClaimFlow::Initiator,
-            CordaClaim(issuer, holder, property, value, linearId),
-            notary,
-            observers
-        )
+        val claim = CordaClaim(issuer, holder, property, value, linearId)
+        return issueClaim(claim, notary, observers)
+    }
+
+    /**
+     * Amends a claim.
+     *
+     * @param T The underlying claim value type.
+     * @param oldClaim The claim to be consumed.
+     * @param newClaim The claim to be created.
+     * @param observers Additional observers of the transaction.
+     */
+    fun <T : Any> amendClaim(
+        oldClaim: StateAndRef<CordaClaim<T>>,
+        newClaim: CordaClaim<T>,
+        observers: Set<Party> = emptySet()
+    ): FlowProgressHandle<SignedTransaction> {
+        return rpc.startTrackedFlow(AmendClaimFlow::Initiator, oldClaim, newClaim, observers)
     }
 
     /**
@@ -81,12 +108,7 @@ class ClaimCommandService(rpc: CordaRPCOps) : RPCService(rpc) {
         value: T,
         observers: Set<Party> = emptySet()
     ): FlowProgressHandle<SignedTransaction> {
-        return rpc.startTrackedFlow(
-            AmendClaimFlow::Initiator,
-            claim,
-            claim.amend(value),
-            observers
-        )
+        return amendClaim(claim, claim.amend(value), observers)
     }
 
     /**