From 946ec3c04e85a6957fc03cdfe7551a39df06e20e Mon Sep 17 00:00:00 2001 From: ags Date: Tue, 20 Mar 2018 16:26:34 +0000 Subject: [PATCH 1/3] ignored flaky test: --- .../kotlin/net/corda/tools/shell/SSHServerTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt index 7689bb89d9..919acd78cf 100644 --- a/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt +++ b/tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt @@ -20,6 +20,7 @@ import net.corda.testing.node.User import net.corda.testing.driver.driver import org.assertj.core.api.Assertions.assertThat import org.bouncycastle.util.io.Streams +import org.junit.Ignore import org.junit.Test import java.net.ConnectException import kotlin.test.assertTrue @@ -119,6 +120,7 @@ class SSHServerTest { } } + @Ignore @Test fun `ssh runs flows`() { val user = User("u", "p", setOf(startFlow())) @@ -176,4 +178,4 @@ class SSHServerTest { override val progressTracker: ProgressTracker? = ProgressTracker() } -} \ No newline at end of file +} From d7147b7399e6b00a871e7c7a6ec5b4312abf6ea3 Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Tue, 20 Mar 2018 18:42:38 +0000 Subject: [PATCH 2/3] Adds JavaDocs for SoftLockingCondition. --- .../net/corda/core/node/services/vault/QueryCriteria.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt b/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt index e1987112cd..12577bacbf 100644 --- a/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt +++ b/core/src/main/kotlin/net/corda/core/node/services/vault/QueryCriteria.kt @@ -51,6 +51,13 @@ sealed class QueryCriteria : GenericQueryCriteria) + /** + * Select states based on their locks. + * + * @param [type] Whether to select all locked states, all unlocked states, + * specific locked states, or all unlocked states plus specific locked states. + * @param [lockIds] The specific locked states to select (if applicable). + */ // DOCSTART VaultQuerySoftLockingCriteria @CordaSerializable data class SoftLockingCondition(val type: SoftLockingType, val lockIds: List = emptyList()) From f1ac3c39e94934aa255fa20bdaef8ef241f9db2a Mon Sep 17 00:00:00 2001 From: szymonsztuka Date: Wed, 21 Mar 2018 09:41:50 +0000 Subject: [PATCH 3/3] ENT-1634 Fix Primary Key generation for node_notary_request_log table (#2855) Don't assign a value as it's auto generated, remove redundant default value for GeneratedValue strategy. --- .../services/transactions/PersistentUniquenessProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt index 22cb863aed..f35fe71c10 100644 --- a/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt +++ b/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt @@ -41,8 +41,8 @@ class PersistentUniquenessProvider(val clock: Clock) : UniquenessProvider, Singl @CordaSerializable class Request( @Id - @GeneratedValue(strategy = GenerationType.AUTO) - val id: Int = 0, + @GeneratedValue + val id: Int? = null, @Column(name = "consuming_transaction_id") val consumingTxHash: String,