From 21a7b561610b1049b08a4d65f27ce5d86b431274 Mon Sep 17 00:00:00 2001 From: "rick.parker" Date: Fri, 13 Jul 2018 14:33:13 +0100 Subject: [PATCH] Fix up compilation errors. --- .../main/kotlin/net/corda/core/internal/InternalUtils.kt | 6 ++++++ .../main/kotlin/net/corda/core/schemas/PersistentTypes.kt | 2 +- .../kotlin/net/corda/nodeapi}/internal/MigrationHelpers.kt | 3 ++- .../corda/nodeapi/internal/persistence/SchemaMigration.kt | 2 +- .../corda/node/services/persistence/MigrationExporter.kt | 2 +- .../net/corda/behave/service/proxy/CordaRPCProxyClient.kt | 4 ++++ .../src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt | 2 +- 7 files changed, 16 insertions(+), 5 deletions(-) rename {core/src/main/kotlin/net/corda/core => node-api/src/main/kotlin/net/corda/nodeapi}/internal/MigrationHelpers.kt (95%) diff --git a/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt b/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt index 6098b12cb0..39a14c4d94 100644 --- a/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt +++ b/core/src/main/kotlin/net/corda/core/internal/InternalUtils.kt @@ -20,6 +20,7 @@ import net.corda.core.cordapp.CordappContext import net.corda.core.crypto.* import net.corda.core.flows.FlowLogic import net.corda.core.node.ServicesForResolution +import net.corda.core.schemas.MappedSchema import net.corda.core.serialization.* import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.SignedTransaction @@ -542,3 +543,8 @@ fun SerializedBytes.checkPayloadIs(type: Class): Untrustworthy return type.castIfPossible(payloadData)?.let { UntrustworthyData(it) } ?: throw IllegalArgumentException("We were expecting a ${type.name} but we instead got a ${payloadData.javaClass.name} ($payloadData)") } + +/** + * Extension method to make this method visible to nodeapi module. + */ +fun MappedSchema.getMigrationResource(): String? = this.internalGetMigrationResource() \ No newline at end of file diff --git a/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt b/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt index 55bf763716..a21b5c645c 100644 --- a/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt +++ b/core/src/main/kotlin/net/corda/core/schemas/PersistentTypes.kt @@ -61,7 +61,7 @@ open class MappedSchema(schemaFamily: Class<*>, */ protected open val migrationResource: String? = null - internal fun getMigrationResource(): String? = migrationResource + internal fun internalGetMigrationResource(): String? = migrationResource override fun toString(): String = "${this.javaClass.simpleName}(name=$name, version=$version)" diff --git a/core/src/main/kotlin/net/corda/core/internal/MigrationHelpers.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt similarity index 95% rename from core/src/main/kotlin/net/corda/core/internal/MigrationHelpers.kt rename to node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt index b24a4124da..974f07ce83 100644 --- a/core/src/main/kotlin/net/corda/core/internal/MigrationHelpers.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/MigrationHelpers.kt @@ -8,9 +8,10 @@ * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited. */ -package net.corda.core.internal +package net.corda.nodeapi.internal import com.google.common.base.CaseFormat +import net.corda.core.internal.getMigrationResource import net.corda.core.schemas.MappedSchema object MigrationHelpers { diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt index 1a6f04a6df..6a837de4d4 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt @@ -20,7 +20,7 @@ import liquibase.database.core.MSSQLDatabase import liquibase.database.jvm.JdbcConnection import liquibase.lockservice.LockServiceFactory import liquibase.resource.ClassLoaderResourceAccessor -import net.corda.core.internal.MigrationHelpers.getMigrationResource +import net.corda.nodeapi.internal.MigrationHelpers.getMigrationResource import net.corda.core.schemas.MappedSchema import net.corda.core.utilities.contextLogger import java.io.ByteArrayInputStream diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/MigrationExporter.kt b/node/src/main/kotlin/net/corda/node/services/persistence/MigrationExporter.kt index 8d70b19a77..ff78d35356 100644 --- a/node/src/main/kotlin/net/corda/node/services/persistence/MigrationExporter.kt +++ b/node/src/main/kotlin/net/corda/node/services/persistence/MigrationExporter.kt @@ -11,7 +11,7 @@ package net.corda.node.services.persistence import net.corda.core.identity.AbstractParty -import net.corda.core.internal.MigrationHelpers.migrationResourceNameForSchema +import net.corda.nodeapi.internal.MigrationHelpers.migrationResourceNameForSchema import net.corda.core.internal.objectOrNewInstance import net.corda.core.schemas.MappedSchema import net.corda.nodeapi.internal.persistence.CordaPersistence diff --git a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt index 564eb2cb7f..b73e0817d0 100644 --- a/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt +++ b/testing/qa/behave/tools/rpc-proxy/src/main/kotlin/net/corda/behave/service/proxy/CordaRPCProxyClient.kt @@ -230,6 +230,10 @@ class CordaRPCProxyClient(private val targetHostAndPort: NetworkHostAndPort) : C TODO("not implemented") } + override fun refreshNetworkMapCache() { + TODO("not implemented") + } + private inline fun doPost(hostAndPort: NetworkHostAndPort, path: String, payload: ByteArray) : T { val url = URL("http://$hostAndPort/rpc/$path") val connection = url.openHttpConnection().apply { diff --git a/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt b/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt index 4812e6d9d3..3054d6970c 100644 --- a/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt +++ b/tools/dbmigration/src/main/kotlin/com/r3/corda/dbmigration/Launcher.kt @@ -18,7 +18,7 @@ import joptsimple.OptionException import joptsimple.OptionParser import joptsimple.OptionSet import joptsimple.util.EnumConverter -import net.corda.core.internal.MigrationHelpers +import net.corda.nodeapi.internal.MigrationHelpers import net.corda.core.internal.div import net.corda.core.internal.exists import net.corda.core.schemas.MappedSchema