Kotlin fix on insurance app

Author: peterli-r3

Features/queryableState-carinsurance/contracts/src/main/kotlin/net/corda/samples/carinsurance/schema/InsuranceSchemaV1.kt

@@ -1,6 +1,7 @@
 package net.corda.samples.carinsurance.schema
 
 //4.6 changes
+import jdk.nashorn.internal.objects.annotations.Constructor
 import net.corda.core.schemas.MappedSchema
 import net.corda.core.schemas.PersistentState
 import org.hibernate.annotations.Type
@@ -41,6 +42,9 @@ object InsuranceSchemaV1 : MappedSchema(
             var claimAmount: Int
     ) {
         // Default constructor required by hibernate.
+        constructor(claimNumber: String,claimDescription: String,claimAmount: Int) : this(
+                UUID.randomUUID(), claimNumber,claimDescription,claimAmount)
+
         constructor() : this(UUID.randomUUID(), "", "", 0)
     }
 
@@ -98,6 +102,6 @@ object InsuranceSchemaV1 : MappedSchema(
             @JoinColumns(JoinColumn(name = "output_index", referencedColumnName = "output_index"), JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"))
             val claims: List<PersistentClaim>
     ) : PersistentState(), Serializable {
-        constructor() : this("", 0, 0, 0, PersistentVehicle(), listOf())
+        constructor() : this("", 0, 0, 0, PersistentVehicle(), listOf(PersistentClaim()))
     }
 }

Features/queryableState-carinsurance/contracts/src/main/kotlin/net/corda/samples/carinsurance/states/Claim.kt

@@ -3,4 +3,6 @@ package net.corda.samples.carinsurance.states
 import net.corda.core.serialization.CordaSerializable
 
 @CordaSerializable
-data class Claim(val claimNumber: String, val claimDescription: String, val claimAmount: Int)
+data class Claim(val claimNumber: String,
+                 val claimDescription: String,
+                 val claimAmount: Int)

Features/queryableState-carinsurance/contracts/src/main/kotlin/net/corda/samples/carinsurance/states/InsuranceState.kt

@@ -27,16 +27,17 @@ data class InsuranceState(val policyNumber: String,
                           override val participants: List<AbstractParty> = listOf(insuree, insurer)) : QueryableState {
     override fun generateMappedObject(schema: MappedSchema): PersistentState {
         if (schema is InsuranceSchemaV1) {
-            var persistentClaims = ArrayList<InsuranceSchemaV1.PersistentClaim>()
+//            var persistentClaims = listOf<InsuranceSchemaV1.PersistentClaim>()
+            val persistentClaims : MutableList<InsuranceSchemaV1.PersistentClaim> = mutableListOf()
             if (claims.isNotEmpty()) {
                 for (item in claims) {
-                    persistentClaims.add(InsuranceSchemaV1.PersistentClaim(
-                            UUID.randomUUID(),
+                    persistentClaims += (InsuranceSchemaV1.PersistentClaim(
                             item.claimNumber,
                             item.claimDescription,
                             item.claimAmount))
                 }
             }
+
             var vDetail = InsuranceSchemaV1.PersistentVehicle(vehicleDetail.registrationNumber,
                     vehicleDetail.chasisNumber,
                     vehicleDetail.make,

Features/queryableState-carinsurance/workflows/src/main/resources/migration/claim-detail.changelog-v1.xml

@@ -5,17 +5,12 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <changeSet author="R3.Corda" id="create_claim_detail_state">
         <createTable tableName="claim_detail">
-            <column name="output_index" type="INT">
-                <constraints nullable="false"/>
-            </column>
-            <column name="transaction_id" type="NVARCHAR(64)">
-                <constraints nullable="false"/>
-            </column>
+            <column name="output_index" type="INT"/>
+            <column name="transaction_id" type="NVARCHAR(64)"/>
             <column name="claimAmount" type="int"/>
             <column name="claimNumber" type="NVARCHAR(64)"/>
             <column name="claimDescription" type="NVARCHAR(64)"/>
             <column name="id" type="NVARCHAR(64)"/>
-
         </createTable>
     </changeSet>
 </databaseChangeLog>

Features/queryableState-carinsurance/workflows/src/main/resources/migration/insurance-detail.changelog-v1.xml

@@ -17,7 +17,6 @@
             <column name="insuredvalue" type="BIGINT"/>
             <column name="id" type="NVARCHAR(64)"/>
             <column name="registrationnumber" type="NVARCHAR(64)"/>
-
         </createTable>
     </changeSet>
 </databaseChangeLog>

Features/queryableState-carinsurance/workflows/src/main/resources/migration/vehicle-detail.changelog-v1.xml

@@ -5,7 +5,6 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
     <changeSet author="R3.Corda" id="create_vehicle_detail_state">
         <createTable tableName="vehicle_detail">
-
             <column name="id" type="NVARCHAR(64)"/>
             <column name="registrationNumber" type="NVARCHAR(64)"/>
             <column name="chasisNumber" type="NVARCHAR(64)"/>
@@ -14,7 +13,6 @@
             <column name="variant" type="NVARCHAR(64)"/>
             <column name="color" type="NVARCHAR(64)"/>
             <column name="fuelType" type="NVARCHAR(64)"/>
-
         </createTable>
     </changeSet>
 </databaseChangeLog>