Multiple changes to support ongoing V3 implementation.

- Moved claims and attestations into sub-packages for easier management.
- Added AbstractClaim extensions.
- Added tests for AttestationTypeInfo and ClaimTypeInfo.

Author: MrMatthewLayton

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.AbstractClaim.kt

@@ -16,6 +16,10 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.core.toTypedClass
+import io.onixlabs.corda.identityframework.contract.claims.AbstractClaim
+import io.onixlabs.corda.identityframework.contract.claims.ClaimTypeInfo
+
 private typealias Claims = Iterable<AbstractClaim<*>>
 
 /**
@@ -114,7 +118,7 @@ fun <T, U : AbstractClaim<in T>> Claims.filterByType(claimType: Class<U>, valueT
  */
 inline fun <reified T : AbstractClaim<*>> Claims.filterByType(): List<T> {
     val claimTypeInfo = object : ClaimTypeInfo<T>() {}
-    return filterByType(claimTypeInfo.claimType, claimTypeInfo.claimValueType)
+    return filterByType(claimTypeInfo.claimType.toTypedClass(), claimTypeInfo.claimValueType)
 }
 
 /**

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.Attestation.kt

@@ -16,6 +16,9 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.identityframework.contract.attestations.Attestation
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationPointer
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationStatus
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.LinearState
 import net.corda.core.contracts.StateAndRef

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.CordaClaim.kt

@@ -16,6 +16,9 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.identityframework.contract.claims.CordaClaim
+import io.onixlabs.corda.identityframework.contract.claims.LinearClaimPointer
+import io.onixlabs.corda.identityframework.contract.claims.StaticClaimPointer
 import net.corda.core.contracts.StateAndRef
 
 /**

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Extensions.StateAndRef.kt

@@ -16,6 +16,10 @@
 
 package io.onixlabs.corda.identityframework.contract
 
+import io.onixlabs.corda.identityframework.contract.attestations.Attestation
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationStatus
+import io.onixlabs.corda.identityframework.contract.attestations.LinearAttestationPointer
+import io.onixlabs.corda.identityframework.contract.attestations.StaticAttestationPointer
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.LinearState
 import net.corda.core.contracts.StateAndRef

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/Attestation.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/Attestation.kt

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.identityframework.contract
+package io.onixlabs.corda.identityframework.contract.attestations
 
 import io.onixlabs.corda.core.contract.ChainState
 import io.onixlabs.corda.core.contract.Hashable
-import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationEntity
-import io.onixlabs.corda.identityframework.contract.AttestationSchema.AttestationSchemaV1
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationSchema.AttestationEntity
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationSchema.AttestationSchemaV1
+import io.onixlabs.corda.identityframework.contract.toDataClassString
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.AbstractParty

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationContract.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationContract.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.identityframework.contract
+package io.onixlabs.corda.identityframework.contract.attestations
 
 import io.onixlabs.corda.core.contract.ContractID
 import io.onixlabs.corda.core.contract.isPointingTo

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationPointer.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationPointer.kt

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.identityframework.contract
+package io.onixlabs.corda.identityframework.contract.attestations
 
 import io.onixlabs.corda.core.contract.Hashable
 import io.onixlabs.corda.core.contract.SingularResolvable
 import io.onixlabs.corda.core.contract.TransactionResolution
 import io.onixlabs.corda.core.services.vaultQuery
+import io.onixlabs.corda.identityframework.contract.toDataClassString
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.messaging.CordaRPCOps

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationSchema.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationSchema.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.identityframework.contract
+package io.onixlabs.corda.identityframework.contract.attestations
 
 import net.corda.core.crypto.NullKeys.NULL_PARTY
 import net.corda.core.identity.AbstractParty

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationStatus.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationStatus.kt

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.onixlabs.corda.identityframework.contract
+package io.onixlabs.corda.identityframework.contract.attestations
 
-import io.onixlabs.corda.identityframework.contract.AttestationStatus.ACCEPTED
-import io.onixlabs.corda.identityframework.contract.AttestationStatus.REJECTED
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationStatus.ACCEPTED
+import io.onixlabs.corda.identityframework.contract.attestations.AttestationStatus.REJECTED
 import net.corda.core.serialization.CordaSerializable
 
 /**

onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/AttestationTypeInfo.kt renamed to onixlabs-corda-identity-framework-contract/src/main/kotlin/io/onixlabs/corda/identityframework/contract/attestations/AttestationTypeInfo.kt

@@ -1,4 +1,20 @@
-package io.onixlabs.corda.identityframework.contract
+/*
+ * Copyright 2020-2021 ONIXLabs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.onixlabs.corda.identityframework.contract.attestations
 
 import io.onixlabs.corda.core.toClass
 import io.onixlabs.corda.core.toTypedClass
@@ -16,7 +32,7 @@ import java.lang.reflect.WildcardType
  */
 abstract class AttestationTypeInfo<T : Attestation<*>> {
 
-    val attestationType: Class<T>
+    val attestationType: Class<out Attestation<*>>
         get() = getAttestationTypeInternal().toTypedClass()
 
     val attestationStateType: Class<*>?