ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 22:58:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-1517: Move MigrationHelpers object into internal package. (#457)

Browse Source
This commit is contained in:
Chris Rankin
2018-02-12 23:20:46 +00:00
committed by GitHub
parent ef45900fda
commit c3f08ecf5f
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node-api/src/main/kotlin/net/corda/node/services/persistence/MigrationExporter.kt
View File

@ -1,7 +1,7 @@
package net.corda.node.services.persistence
import MigrationHelpers.migrationResourceNameForSchema
import net.corda.core.identity.AbstractParty
import net.corda.core.internal.MigrationHelpers.migrationResourceNameForSchema
import net.corda.core.internal.objectOrNewInstance
import net.corda.core.schemas.MappedSchema
import net.corda.nodeapi.internal.persistence.CordaPersistence
@ -53,7 +53,7 @@ class MigrationExporter(val parent: Path, val datasourceProperties: Properties,
createNewFile()
appendText(LIQUIBASE_HEADER)
appendText("\n\n")
appendText("--changeset ${CORDA_USER}:initial_schema_for_${mappedSchema::class.simpleName!!}")
appendText("--changeset $CORDA_USER:initial_schema_for_${mappedSchema::class.simpleName!!}")
appendText("\n")
}

6
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/SchemaMigration.kt
View File

@ -1,6 +1,5 @@
package net.corda.nodeapi.internal.persistence
import MigrationHelpers.getMigrationResource
import com.fasterxml.jackson.databind.ObjectMapper
import liquibase.Contexts
import liquibase.LabelExpression
@ -11,6 +10,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.core.schemas.MappedSchema
import net.corda.core.utilities.contextLogger
import java.io.*
@ -31,7 +31,7 @@ class SchemaMigration(
* Main entry point to the schema migration.
* Called during node startup.
*/
fun nodeStartup(): Unit {
fun nodeStartup() {
when {
databaseConfig.runMigration -> runMigration()
failOnMigrationMissing -> checkState()
@ -56,7 +56,7 @@ class SchemaMigration(
/**
* can be used from an external tool to release the lock in case something went terribly wrong
*/
fun forceReleaseMigrationLock(): Unit {
fun forceReleaseMigrationLock() {
dataSource.connection.use { connection ->
LockServiceFactory.getInstance().getLockService(getLiquibaseDatabase(JdbcConnection(connection))).forceReleaseLock()
}