Version update to 2.0.0-rc4 including PR amendments.

Author: MrMatthewLayton

build.gradle

@@ -42,7 +42,7 @@ buildscript {
 }
 
 group 'io.onixlabs'
-version '2.0.0-rc3'
+version '2.0.0-rc4'
 
 subprojects {
     repositories {

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/services/QueryDsl.kt

@@ -16,6 +16,7 @@
 
 package io.onixlabs.corda.core.services
 
+import io.onixlabs.corda.core.toTypedClass
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.UniqueIdentifier
@@ -28,6 +29,7 @@ import net.corda.core.node.services.vault.Sort
 import net.corda.core.node.services.vault.SortAttribute
 import net.corda.core.schemas.StatePersistable
 import kotlin.reflect.KProperty1
+import kotlin.reflect.jvm.javaType
 import kotlin.reflect.jvm.jvmErasure
 
 /**
@@ -299,10 +301,11 @@ class QueryDsl<T : ContractState> internal constructor(
      * @param direction The sort direction of the sorted data.
      */
     @QueryDslContext
-    @Suppress("UNCHECKED_CAST")
     fun sortBy(property: KProperty1<out StatePersistable, *>, direction: Sort.Direction) {
-        val receiver = property.parameters.first().type.jvmErasure.java as Class<out StatePersistable>
-        sort(Sort(setOf(Sort.SortColumn(SortAttribute.Custom(receiver, property.name), direction))))
+        val receiver = property.parameters.first().type.javaType.toTypedClass<StatePersistable>()
+        val attribute = SortAttribute.Custom(receiver, property.name)
+        val column = Sort.SortColumn(attribute, direction)
+        sort(Sort(setOf(column)))
     }
 
     /**

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/services/QueryDslContext.kt

@@ -20,4 +20,4 @@ package io.onixlabs.corda.core.services
  * Specifies that a function is contextually party of the query DSL.
  */
 @DslMarker
-annotation class QueryDslContext
+annotation class QueryDslContext

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/services/VaultSequence.kt

@@ -38,13 +38,19 @@ class VaultSequence<T : ContractState> internal constructor(
     private val sorting: Sort = DEFAULT_SORTING
 ) : Sequence<StateAndRef<T>> {
 
-    internal constructor(service: VaultService<T>, queryDsl: QueryDsl<T>)
-            : this(service, queryDsl.criteria, queryDsl.paging, queryDsl.sorting)
+    internal constructor(service: VaultService<T>, queryDsl: QueryDsl<T>) : this(
+        service = service,
+        criteria = queryDsl.criteria,
+        paging = queryDsl.paging,
+        sorting = queryDsl.sorting
+    )
 
     /**
      * Gets the iterator which will evaluate the vault query.
      *
      * @return Returns an iterator for the [StateAndRef] instances returned by the vault query.
      */
-    override fun iterator(): Iterator<StateAndRef<T>> = service.queryBy(criteria, paging, sorting).states.iterator()
+    override fun iterator(): Iterator<StateAndRef<T>> {
+        return service.queryBy(criteria, paging, sorting).states.iterator()
+    }
 }

onixlabs-corda-core-workflow/src/main/kotlin/io/onixlabs/corda/core/services/VaultService.kt

@@ -21,8 +21,10 @@ import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.DataFeed
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.Vault
-import net.corda.core.node.services.vault.*
+import net.corda.core.node.services.vault.PageSpecification
+import net.corda.core.node.services.vault.QueryCriteria
 import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria
+import net.corda.core.node.services.vault.Sort
 
 /**
  * Represents a service for managing vault querying and tracking.
@@ -107,7 +109,9 @@ class VaultService<T : ContractState> private constructor(
         criteria: QueryCriteria = defaultQueryCriteria,
         paging: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
         sorting: Sort = DEFAULT_SORTING
-    ): Vault.Page<T> = adapter.queryBy(criteria, paging, sorting)
+    ): Vault.Page<T> {
+        return adapter.queryBy(criteria, paging, sorting)
+    }
 
     /**
      * Tracks changes in the vault given the specified criteria, paging and sorting.
@@ -121,5 +125,7 @@ class VaultService<T : ContractState> private constructor(
         criteria: QueryCriteria = defaultTrackingCriteria,
         paging: PageSpecification = DEFAULT_PAGE_SPECIFICATION,
         sorting: Sort = DEFAULT_SORTING
-    ): DataFeed<Vault.Page<T>, Vault.Update<T>> = adapter.trackBy(criteria, paging, sorting)
+    ): DataFeed<Vault.Page<T>, Vault.Update<T>> {
+        return adapter.trackBy(criteria, paging, sorting)
+    }
 }

onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/CustomerEntity.kt

@@ -49,7 +49,7 @@ class CustomerEntity(
 
     /**
      * Since chain state previous state references should start at null,
-     * including this in the schema allows queries for all new/unevolved states.
+     * including this in the schema allows queries for all new/un-evolved states.
      */
     @Column(name = "previous_state_ref")
     val previousStateRef: String? = null,
@@ -63,4 +63,4 @@ class CustomerEntity(
             override val migrationResource = "customer-schema.changelog-master"
         }
     }
-}
+}

onixlabs-corda-test-contract/src/main/kotlin/io/onixlabs/corda/test/contract/Reward.kt

@@ -59,7 +59,8 @@ data class Reward(
 
     private class CustomerResolver(private val reward: Reward) : AbstractSingularResolvable<Customer>() {
 
-        override val criteria: QueryCriteria = vaultQuery<Customer>(relevancyStatus = Vault.RelevancyStatus.ALL) {
+        override val criteria: QueryCriteria = vaultQuery<Customer> {
+            relevancyStatus(Vault.RelevancyStatus.ALL)
             linearIds(reward.customerLinearId)
         }
 

onixlabs-corda-test-contract/src/main/resources/migration/customer-schema.changelog-master.xml

@@ -3,4 +3,4 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <include file="migration/customer-schema.changelog-v1.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>

onixlabs-corda-test-contract/src/main/resources/migration/customer-schema.changelog-v1.xml

@@ -35,4 +35,4 @@
                        constraintName="PK_onixlabs_customer_states"
                        tableName="onixlabs_customer_states"/>
     </changeSet>
-</databaseChangeLog>
+</databaseChangeLog>

onixlabs-corda-test-contract/src/main/resources/migration/reward-schema.changelog-master.xml

@@ -3,4 +3,4 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <include file="migration/reward-schema.changelog-v1.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>