Merge remote-tracking branch 'origin/release/os/4.6' into christians/update-fb-2020-06-12

constants.properties

@@ -30,7 +30,7 @@ snakeYamlVersion=1.19
 caffeineVersion=2.7.0
 metricsVersion=4.1.0
 metricsNewRelicVersion=1.1.1
-djvmVersion=1.1-RC04
+djvmVersion=1.1
 deterministicRtVersion=1.0-RC02
 openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4
 openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4

node/src/main/kotlin/net/corda/node/services/persistence/DBCheckpointStorage.kt

@@ -88,7 +88,7 @@ class DBCheckpointStorage(
 
     @Entity
     @javax.persistence.Table(name = "${NODE_DATABASE_PREFIX}checkpoints")
-    class DBFlowCheckpoint(
+    data class DBFlowCheckpoint(
         @Id
         @Column(name = "flow_id", length = 64, nullable = false)
         var flowId: String,
@@ -127,7 +127,7 @@ class DBCheckpointStorage(
 
     @Entity
     @javax.persistence.Table(name = "${NODE_DATABASE_PREFIX}checkpoint_blobs")
-    class DBFlowCheckpointBlob(
+    data class DBFlowCheckpointBlob(
         @Id
         @Column(name = "flow_id", length = 64, nullable = false)
         var flowId: String,
@@ -146,11 +146,39 @@ class DBCheckpointStorage(
 
         @Column(name = "timestamp")
         var persistedInstant: Instant
-    )
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as DBFlowCheckpointBlob
+
+            if (flowId != other.flowId) return false
+            if (!checkpoint.contentEquals(other.checkpoint)) return false
+
+            if (!(flowStack ?: EMPTY_BYTE_ARRAY)!!.contentEquals(other.flowStack ?: EMPTY_BYTE_ARRAY)) {
+                return false
+            }
+
+            if (!hmac.contentEquals(other.hmac)) return false
+            if (persistedInstant != other.persistedInstant) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = flowId.hashCode()
+            result = 31 * result + checkpoint.contentHashCode()
+            result = 31 * result + (flowStack?.contentHashCode() ?: 0)
+            result = 31 * result + hmac.contentHashCode()
+            result = 31 * result + persistedInstant.hashCode()
+            return result
+        }
+    }
 
     @Entity
     @javax.persistence.Table(name = "${NODE_DATABASE_PREFIX}flow_results")
-    class DBFlowResult(
+    data class DBFlowResult(
         @Id
         @Column(name = "flow_id", length = 64, nullable = false)
         var flow_id: String,
@@ -161,11 +189,31 @@ class DBCheckpointStorage(
 
         @Column(name = "timestamp")
         val persistedInstant: Instant
-    )
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as DBFlowResult
+
+            if (flow_id != other.flow_id) return false
+            if (!value.contentEquals(other.value)) return false
+            if (persistedInstant != other.persistedInstant) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = flow_id.hashCode()
+            result = 31 * result + value.contentHashCode()
+            result = 31 * result + persistedInstant.hashCode()
+            return result
+        }
+    }
 
     @Entity
     @javax.persistence.Table(name = "${NODE_DATABASE_PREFIX}flow_exceptions")
-    class DBFlowException(
+    data class DBFlowException(
         @Id
         @Column(name = "flow_id", length = 64, nullable = false)
         var flow_id: String,
@@ -185,11 +233,39 @@ class DBCheckpointStorage(
 
         @Column(name = "timestamp")
         val persistedInstant: Instant
-    )
+    ) {
+        override fun equals(other: Any?): Boolean {
+            if (this === other) return true
+            if (javaClass != other?.javaClass) return false
+
+            other as DBFlowException
+
+            if (flow_id != other.flow_id) return false
+            if (type != other.type) return false
+            if (message != other.message) return false
+            if (stackTrace != other.stackTrace) return false
+            if (!(value ?: EMPTY_BYTE_ARRAY)!!.contentEquals(other.value ?: EMPTY_BYTE_ARRAY)) {
+                return false
+            }
+            if (persistedInstant != other.persistedInstant) return false
+
+            return true
+        }
+
+        override fun hashCode(): Int {
+            var result = flow_id.hashCode()
+            result = 31 * result + type.hashCode()
+            result = 31 * result + (message?.hashCode() ?: 0)
+            result = 31 * result + stackTrace.hashCode()
+            result = 31 * result + (value?.contentHashCode() ?: 0)
+            result = 31 * result + persistedInstant.hashCode()
+            return result
+        }
+    }
 
     @Entity
     @javax.persistence.Table(name = "${NODE_DATABASE_PREFIX}flow_metadata")
-    class DBFlowMetadata(
+    data class DBFlowMetadata(
         @Id
         @Column(name = "flow_id", length = 64, nullable = false)
         var flowId: String,

node/src/test/kotlin/net/corda/node/internal/NodeStartupCliTest.kt

@@ -6,6 +6,7 @@ import net.corda.core.internal.exists
 import net.corda.nodeapi.internal.config.UnknownConfigKeysPolicy
 import org.assertj.core.api.Assertions
 import org.junit.BeforeClass
+import org.junit.Ignore
 import org.junit.Test
 import org.slf4j.LoggerFactory
 import org.slf4j.event.Level
@@ -56,6 +57,7 @@ class NodeStartupCliTest {
     }
 
     @Test(timeout=3_000)
+    @Ignore
     fun `test logs are written to correct location correctly if verbose flag set`() {
         val node = NodeStartupCli()
         val dir = Files.createTempDirectory("verboseLoggingTest")