Amending flows to remove generics + testing type argument implementation.

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 {

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

@@ -84,6 +84,7 @@ class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
     ): StateAndRef<T>? {
         return rpc.startFlowDynamic(
             FindAttestationFlow::class.java,
+            T::class.java,
             linearId,
             externalId,
             attestor,
@@ -141,6 +142,7 @@ class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
     ): List<StateAndRef<T>> {
         return rpc.startFlowDynamic(
             FindAttestationsFlow::class.java,
+            T::class.java,
             linearId,
             externalId,
             attestor,
@@ -155,6 +157,6 @@ class AttestationQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
             stateStatus,
             relevancyStatus,
             pageSpecification
-        ).returnValue.getOrThrow(flowTimeout).map { it.cast<T>() }
+        ).returnValue.getOrThrow(flowTimeout).cast()
     }
 }

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

@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.identityframework.integration
 
+import io.onixlabs.corda.core.contract.cast
 import io.onixlabs.corda.core.integration.RPCService
 import io.onixlabs.corda.core.workflow.DEFAULT_PAGE_SPECIFICATION
 import io.onixlabs.corda.identityframework.contract.CordaClaim
@@ -53,8 +54,7 @@ class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
      * @param flowTimeout The amount of time that the flow will be allowed to execute before failing.
      * @return Returns a claim that matches the query, or null if no claim was found.
      */
-    fun findClaim(
-        claimClass: Class<out CordaClaim<*>> = CordaClaim::class.java,
+    inline fun <reified T : CordaClaim<*>> findClaim(
         valueClass: Class<*>? = null,
         linearId: UniqueIdentifier? = null,
         externalId: String? = null,
@@ -72,7 +72,7 @@ class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
     ): StateAndRef<CordaClaim<*>>? {
         return rpc.startFlowDynamic(
             FindClaimFlow::class.java,
-            claimClass,
+            T::class.java,
             valueClass,
             linearId,
             externalId,
@@ -86,7 +86,7 @@ class ClaimQueryService(rpc: CordaRPCOps) : RPCService(rpc) {
             stateStatus,
             relevancyStatus,
             pageSpecification
-        ).returnValue.getOrThrow(flowTimeout)
+        ).returnValue.getOrThrow(flowTimeout)?.cast()
     }
 
     /**

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/FindAttestationFlow.kt

@@ -39,6 +39,7 @@ import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria
 /**
  * Represents the flow for finding an attestation in the vault.
  *
+ * @param attestationClass The class of the underlying attestation.
  * @param linearId The linear ID to include in the query.
  * @param externalId The external ID to include in the query.
  * @param attestor The attestor to include in the query.
@@ -56,7 +57,8 @@ import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria
  */
 @StartableByRPC
 @StartableByService
-class FindAttestationFlow<T : Attestation<*>>(
+class FindAttestationFlow(
+    attestationClass: Class<out Attestation<*>> = Attestation::class.java,
     linearId: UniqueIdentifier? = null,
     externalId: String? = null,
     attestor: AbstractParty? = null,
@@ -71,9 +73,9 @@ class FindAttestationFlow<T : Attestation<*>>(
     stateStatus: Vault.StateStatus = Vault.StateStatus.UNCONSUMED,
     relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
     override val pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION
-) : FindStateFlow<T>() {
+) : FindStateFlow<Attestation<*>>() {
     override val criteria: QueryCriteria = VaultQueryCriteria(
-        contractStateTypes = setOf(contractStateType),
+        contractStateTypes = setOf(attestationClass),
         relevancyStatus = relevancyStatus,
         status = stateStatus
     ).andWithExpressions(

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/FindAttestationsFlow.kt

@@ -41,6 +41,7 @@ import net.corda.core.node.services.vault.Sort
 /**
  * Represents the flow for finding attestations in the vault.
  *
+ * @param attestationClass The class of the underlying attestation.
  * @param linearId The linear ID to include in the query.
  * @param externalId The external ID to include in the query.
  * @param attestor The attestor to include in the query.
@@ -58,7 +59,8 @@ import net.corda.core.node.services.vault.Sort
  */
 @StartableByRPC
 @StartableByService
-class FindAttestationsFlow<T : Attestation<*>>(
+class FindAttestationsFlow(
+    attestationClass: Class<out Attestation<*>> = Attestation::class.java,
     linearId: UniqueIdentifier? = null,
     externalId: String? = null,
     attestor: AbstractParty? = null,
@@ -74,9 +76,9 @@ class FindAttestationsFlow<T : Attestation<*>>(
     relevancyStatus: Vault.RelevancyStatus = Vault.RelevancyStatus.ALL,
     override val pageSpecification: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
     override val sorting: Sort = DEFAULT_SORTING
-) : FindStatesFlow<T>() {
+) : FindStatesFlow<Attestation<*>>() {
     override val criteria: QueryCriteria = VaultQueryCriteria(
-        contractStateTypes = setOf(contractStateType),
+        contractStateTypes = setOf(attestationClass),
         relevancyStatus = relevancyStatus,
         status = stateStatus
     ).andWithExpressions(

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/FindClaimFlow.kt

@@ -37,6 +37,8 @@ import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria
 /**
  * Represents the flow for finding a claim in the vault.
  *
+ * @param claimClass The class of the underlying corda claim.
+ * @param valueClass The class of the underlying corda claim value.
  * @param linearId The linear ID to include in the query.
  * @param externalId The external ID to include in the query.
  * @param issuer The issuer to include in the query.

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/FindClaimsFlow.kt

@@ -38,6 +38,8 @@ import net.corda.core.node.services.vault.Sort
 /**
  * Represents the flow for finding claims in the vault.
  *
+ * @param claimClass The class of the underlying corda claim.
+ * @param valueClass The class of the underlying corda claim value.
  * @param linearId The linear ID to include in the query.
  * @param externalId The external ID to include in the query.
  * @param issuer The issuer to include in the query.

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/FlowLogicExtensions.kt

@@ -72,7 +72,7 @@ fun FlowLogic<*>.checkClaimExists(claim: CordaClaim<*>) {
  * @throws FlowException if the claim already exists.
  */
 fun FlowLogic<*>.checkAttestationExists(attestation: Attestation<*>) {
-    if (subFlow(FindAttestationsFlow<Attestation<*>>(hash = attestation.hash)).isNotEmpty()) {
+    if (subFlow(FindAttestationsFlow(hash = attestation.hash)).isNotEmpty()) {
         throw FlowException("An attestation with the specified hash already exists: ${attestation.hash}.")
     }
 }

onixlabs-corda-identity-framework-workflow/src/main/kotlin/io/onixlabs/corda/identityframework/workflow/TypeReference.kt

@@ -0,0 +1,33 @@
+package io.onixlabs.corda.identityframework.workflow
+
+import java.lang.reflect.ParameterizedType
+import java.lang.reflect.Type
+
+internal abstract class TypeReference<T> : Comparable<T> {
+
+    val type: Type = getGenericType()
+    val typeName: String = type.typeName
+    val arguments: List<Type> = getGenericTypeArguments()
+
+    fun toClass(): Class<T> {
+        return Class.forName(typeName) as Class<T>
+    }
+
+    private fun getGenericType(): Type {
+        val superClass = javaClass.genericSuperclass
+
+        if (superClass is Class<*>) {
+            throw IllegalArgumentException("TypeReference constructed without actual type information.")
+        }
+
+        return (superClass as ParameterizedType).actualTypeArguments[0]
+    }
+
+    private fun getGenericTypeArguments(): List<Type> {
+        return if (type is ParameterizedType) {
+            type.actualTypeArguments.toList()
+        } else emptyList()
+    }
+
+    override fun compareTo(other: T): Int = 0
+}

onixlabs-corda-identity-framework-workflow/src/test/kotlin/io/onixlabs/corda/identityframework/workflow/TypeReferenceTests.kt

@@ -0,0 +1,29 @@
+package io.onixlabs.corda.identityframework.workflow
+
+import io.onixlabs.corda.identityframework.contract.CordaClaim
+import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+
+class TypeReferenceTests {
+
+    @Test
+    fun `TypeReference should resolve type of Integer`() {
+        val actual = object : TypeReference<Int>() {}.type.typeName
+        val expected = "java.lang.Integer"
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `TypeReference should resolve type of CordaClaim`() {
+        val actual = object : TypeReference<CordaClaim<*>>() {}.type.typeName
+        val expected = "io.onixlabs.corda.identityframework.contract.CordaClaim"
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `TypeReference should resolve type arguments of CordaClaim`() {
+        val actual = object : TypeReference<CordaClaim<String>>() {}.arguments[0].typeName
+        val expected = "java.lang.String"
+        assertEquals(expected, actual)
+    }
+}