ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-3128: Tidy up DemoBench's "built-in CorDapp" management. (#4814)

Browse Source
This commit is contained in:
Chris Rankin 2019-02-25 18:11:21 +00:00 committed by josecoll
parent 111acc5d6e
commit 04ba77732b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/demobench/src/main/kotlin/net/corda/demobench/plugin/CordappController.kt
View File

@ -8,10 +8,10 @@ import net.corda.demobench.model.NodeConfigWrapper
import tornadofx.* import tornadofx.*
import java.io.IOException import java.io.IOException
import java.nio.file.Path import java.nio.file.Path
import java.nio.file.StandardCopyOption import java.nio.file.StandardCopyOption.*
import kotlin.streams.toList import kotlin.streams.toList
// TODO This class needs to be revisted. It seems to operate on outdated concepts. // TODO This class needs to be revisited. It seems to operate on outdated concepts.
class CordappController : Controller() { class CordappController : Controller() {
companion object { companion object {
const val FINANCE_CONTRACTS_CORDAPP_FILENAME = "corda-finance-contracts" const val FINANCE_CONTRACTS_CORDAPP_FILENAME = "corda-finance-contracts"
@ -20,10 +20,8 @@ class CordappController : Controller() {
private val jvm by inject<JVMConfig>() private val jvm by inject<JVMConfig>()
private val cordappDir: Path = jvm.applicationDir / NodeConfig.CORDAPP_DIR_NAME private val cordappDir: Path = jvm.applicationDir / NodeConfig.CORDAPP_DIR_NAME
private val cordappJars = setOf( private val cordappJars = setOf(FINANCE_CONTRACTS_CORDAPP_FILENAME, FINANCE_WORKFLOWS_CORDAPP_FILENAME)
cordappDir / "$FINANCE_CONTRACTS_CORDAPP_FILENAME.jar", .map { cordappDir / "$it.jar" }
cordappDir / "$FINANCE_WORKFLOWS_CORDAPP_FILENAME.jar"
)
/** /**
* Install any built-in cordapps that this node requires. * Install any built-in cordapps that this node requires.
@ -33,10 +31,10 @@ class CordappController : Controller() {
if (!config.cordappsDir.exists()) { if (!config.cordappsDir.exists()) {
config.cordappsDir.createDirectories() config.cordappsDir.createDirectories()
} }
cordappJars.forEach { financeCordappJar -> cordappJars.forEach { cordappJar ->
if (financeCordappJar.exists()) { if (cordappJar.exists()) {
financeCordappJar.copyToDirectory(config.cordappsDir, StandardCopyOption.REPLACE_EXISTING) cordappJar.copyToDirectory(config.cordappsDir, REPLACE_EXISTING)
log.info("Installed 'Finance' cordapp: $financeCordappJar") log.info("Installed cordapp: $cordappJar")
} }
} }
} }
@ -55,5 +53,5 @@ class CordappController : Controller() {
} }
} }
val Path.isCordapp: Boolean get() = this.isReadable && this.fileName.toString().endsWith(".jar") val Path.isCordapp: Boolean get() = isReadable && fileName.toString().endsWith(".jar")
val Path.inCordappsDir: Boolean get() = (this.parent != null) && this.parent.endsWith("cordapps/") val Path.inCordappsDir: Boolean get() = (parent != null) && parent.endsWith("cordapps/")