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

Don't print info messages when entry is via cordformation (#4360)

Browse Source
This commit is contained in:
Anthony Keenan
2018-12-05 10:09:08 +00:00
committed by GitHub
parent bac693a6f3
commit bdd893fb57
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
View File

@ -483,9 +483,11 @@ interface NetworkBootstrapperWithOverridableParameters {
enum class CopyCordapps { enum class CopyCordapps {
FirstRunOnly { FirstRunOnly {
override fun copy(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean) { override fun copyTo(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean, fromCordform: Boolean) {
if (networkAlreadyExists) { if (networkAlreadyExists) {
println("Not copying CorDapp JARs as --copy-cordapps is set to FirstRunOnly, and it looks like this network has already been bootstrapped.") if (!fromCordform) {
println("Not copying CorDapp JARs as --copy-cordapps is set to FirstRunOnly, and it looks like this network has already been bootstrapped.")
}
return return
} }
cordappJars.copy(nodeDirs) cordappJars.copy(nodeDirs)
@ -493,14 +495,18 @@ enum class CopyCordapps {
}, },
Yes { Yes {
override fun copy(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean) = cordappJars.copy(nodeDirs) override fun copyTo(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean, fromCordform: Boolean) = cordappJars.copy(nodeDirs)
}, },
No { No {
override fun copy(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean) = println("Not copying CorDapp JARs as --copy-cordapps is set to No.") override fun copyTo(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean, fromCordform: Boolean) {
if (!fromCordform) {
println("Not copying CorDapp JARs as --copy-cordapps is set to No.")
}
}
}; };
protected abstract fun copy(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean) protected abstract fun copyTo(cordappJars: List<Path>, nodeDirs: List<Path>, networkAlreadyExists: Boolean, fromCordform: Boolean)
protected fun List<Path>.copy(nodeDirs: List<Path>) { protected fun List<Path>.copy(nodeDirs: List<Path>) {
if (this.isNotEmpty()) { if (this.isNotEmpty()) {
@ -522,6 +528,6 @@ enum class CopyCordapps {
if (!fromCordform) { if (!fromCordform) {
println("Found the following CorDapps: ${cordappJars.map { it.fileName }}") println("Found the following CorDapps: ${cordappJars.map { it.fileName }}")
} }
this.copy(cordappJars, nodeDirs, networkAlreadyExists) this.copyTo(cordappJars, nodeDirs, networkAlreadyExists, fromCordform)
} }
} }