upgrade Basic samples

peterli-r3 · peterli-r3 · commit 2e2409e11c77 · 2020-10-05T16:31:59.000-04:00
diff --git a/Basic/constants.properties b/Basic/constants.properties
@@ -1,12 +1,12 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.5
-cordaCoreVersion=4.5
-gradlePluginsVersion=5.0.10
+cordaVersion=4.6
+cordaCoreVersion=4.6
+gradlePluginsVersion=5.0.12
 kotlinVersion=1.2.71
 junitVersion=4.12
 quasarVersion=0.7.10
 log4jVersion =2.11.2
-platformVersion=5
+platformVersion=8
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
diff --git a/Basic/cordapp-example/.idea/workspace.xml b/Basic/cordapp-example/.idea/workspace.xml
diff --git a/Basic/cordapp-example/contracts-java/src/main/java/com/example/schema/IOUSchemaV1.java b/Basic/cordapp-example/contracts-java/src/main/java/com/example/schema/IOUSchemaV1.java
@@ -8,6 +8,9 @@
 import javax.persistence.Table;
 import java.util.Arrays;
 import java.util.UUID;
+//4.6 changes
+import org.hibernate.annotations.Type;
+import javax.annotation.Nullable;
 
 /**
  * An IOUState schema.
@@ -17,13 +20,19 @@ public IOUSchemaV1() {
         super(IOUSchema.class, 1, Arrays.asList(PersistentIOU.class));
     }
 
+    @Nullable
+    @Override
+    public String getMigrationResource() {
+        return "iou.changelog-master";
+    }
+
     @Entity
     @Table(name = "iou_states")
     public static class PersistentIOU extends PersistentState {
         @Column(name = "lender") private final String lender;
         @Column(name = "borrower") private final String borrower;
         @Column(name = "value") private final int value;
-        @Column(name = "linear_id") private final UUID linearId;
+        @Column(name = "linear_id") @Type (type = "uuid-char") private final UUID linearId;
 
 
         public PersistentIOU(String lender, String borrower, int value, UUID linearId) {
diff --git a/Basic/cordapp-example/contracts-kotlin/src/main/kotlin/com/example/schema/IOUSchema.kt b/Basic/cordapp-example/contracts-kotlin/src/main/kotlin/com/example/schema/IOUSchema.kt
@@ -6,7 +6,8 @@ import java.util.*
 import javax.persistence.Column
 import javax.persistence.Entity
 import javax.persistence.Table
-
+//4.6 changes
+import org.hibernate.annotations.Type
 /**
  * The family of schemas for IOUState.
  */
@@ -19,6 +20,10 @@ object IOUSchemaV1 : MappedSchema(
         schemaFamily = IOUSchema.javaClass,
         version = 1,
         mappedTypes = listOf(PersistentIOU::class.java)) {
+
+    override val migrationResource: String?
+        get() = "iou.changelog-master";
+
     @Entity
     @Table(name = "iou_states")
     class PersistentIOU(
@@ -32,6 +37,7 @@ object IOUSchemaV1 : MappedSchema(
             var value: Int,
 
             @Column(name = "linear_id")
+            @Type(type = "uuid-char")
             var linearId: UUID
     ) : PersistentState() {
         // Default constructor required by hibernate.
diff --git a/Basic/cordapp-example/workflows-java/build.gradle b/Basic/cordapp-example/workflows-java/build.gradle
@@ -70,6 +70,7 @@ task integrationTest(type: Test, dependsOn: []) {
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         cordapp project(":contracts-java")
+        runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Basic/cordapp-example/workflows-java/src/main/resources/migration/iou.changelog-master.xml b/Basic/cordapp-example/workflows-java/src/main/resources/migration/iou.changelog-master.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   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">
+
+    <include file="migration/iou.changelog-v1.xml"/>
+</databaseChangeLog>
diff --git a/Basic/cordapp-example/workflows-java/src/main/resources/migration/iou.changelog-v1.xml b/Basic/cordapp-example/workflows-java/src/main/resources/migration/iou.changelog-v1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   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_iou_state">
+        <createTable tableName="iou_states">
+            <column name="output_index" type="INT"/>
+            <column name="transaction_id" type="NVARCHAR(64)"/>
+            <column name="value" type="int"/>
+            <column name="lender" type="NVARCHAR(64)"/>
+            <column name="borrower" type="NVARCHAR(64)"/>
+            <column name="linear_id" type="NVARCHAR(64)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
diff --git a/Basic/cordapp-example/workflows-kotlin/build.gradle b/Basic/cordapp-example/workflows-kotlin/build.gradle
@@ -71,6 +71,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         cordapp project(":contracts-kotlin")
+        runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"
diff --git a/Basic/cordapp-example/workflows-kotlin/src/main/resources/migration/iou.changelog-master.xml b/Basic/cordapp-example/workflows-kotlin/src/main/resources/migration/iou.changelog-master.xml
@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   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">
+
+    <include file="migration/iou.changelog-v1.xml"/>
+</databaseChangeLog>
diff --git a/Basic/cordapp-example/workflows-kotlin/src/main/resources/migration/iou.changelog-v1.xml b/Basic/cordapp-example/workflows-kotlin/src/main/resources/migration/iou.changelog-v1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   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_iou_state">
+        <createTable tableName="iou_states">
+            <column name="output_index" type="INT"/>
+            <column name="transaction_id" type="NVARCHAR(64)"/>
+            <column name="value" type="int"/>
+            <column name="lender" type="NVARCHAR(64)"/>
+            <column name="borrower" type="NVARCHAR(64)"/>
+            <column name="linear_id" type="NVARCHAR(64)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
diff --git a/Basic/flow-database-access/workflows-java/build.gradle b/Basic/flow-database-access/workflows-java/build.gradle
@@ -60,5 +60,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
                 "StartFlow.com.flowdb.UpdateTokenValueFlow",
                 "StartFlow.com.flowdb.QueryTokenValueFlow"
         ]]]
+	runSchemaMigration = true
     }
-}
+}
diff --git a/Basic/flow-http-access/workflows-java/build.gradle b/Basic/flow-http-access/workflows-java/build.gradle
@@ -47,6 +47,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             adminAddress("localhost:10046")
         }
         cordapps = []
+	runSchemaMigration = true
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["StartFlow.com.flowhttp.HttpCallFlow"]]]
     }
 }
diff --git a/Basic/ping-pong/workflows-java/build.gradle b/Basic/ping-pong/workflows-java/build.gradle
@@ -17,6 +17,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             address("localhost:10006")
             adminAddress("localhost:10046")
         }
+	runSchemaMigration = true
         rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
     node {
@@ -26,6 +27,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             address("localhost:10009")
             adminAddress("localhost:10049")
         }
+	runSchemaMigration = true
         rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 }
diff --git a/Basic/rpc-nodeinfo/build.gradle b/Basic/rpc-nodeinfo/build.gradle
@@ -80,6 +80,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             adminAddress("localhost:10046")
         }
         cordapps = []
+	runSchemaMigration = true
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
-}
+}
diff --git a/Basic/spring-webserver/build.gradle b/Basic/spring-webserver/build.gradle
@@ -99,6 +99,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             address("localhost:10006")
             adminAddress("localhost:10046")
         }
+	runSchemaMigration = true
         rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
 }
diff --git a/Basic/yo-cordapp/build.gradle b/Basic/yo-cordapp/build.gradle
@@ -93,6 +93,7 @@ task deployNodesJava(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         }
         cordapp project(':contracts')
         cordapp project(':workflows')
+	runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ task integrationTest(type: Test, dependsOn: []) {`
`70`	`70`	`task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`71`	`71`	`nodeDefaults {`
`72`	`72`	`cordapp project(":contracts-java")`
	`73`	`+ runSchemaMigration = true`
`73`	`74`	`}`
`74`	`75`	`node {`
`75`	`76`	`name "O=Notary,L=London,C=GB"`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {`
`71`	`71`	`task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {`
`72`	`72`	`nodeDefaults {`
`73`	`73`	`cordapp project(":contracts-kotlin")`
	`74`	`+ runSchemaMigration = true`
`74`	`75`	`}`
`75`	`76`	`node {`
`76`	`77`	`name "O=Notary,L=London,C=GB"`