ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-28 23:24:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Replace companion object with a BiPredicate lambda.

Browse Source
This commit is contained in:
Chris Rankin 2017-02-24 09:07:13 +00:00
parent ec9ecc88cc
commit c8ee88a2fb
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/demobench/src/main/kotlin/net/corda/demobench/profile/ProfileController.kt
View File

@ -7,20 +7,17 @@ import java.io.File
import java.net.URI import java.net.URI
import java.nio.charset.StandardCharsets.UTF_8 import java.nio.charset.StandardCharsets.UTF_8
import java.nio.file.* import java.nio.file.*
import java.nio.file.attribute.BasicFileAttributes
import java.util.* import java.util.*
import java.util.function.BiPredicate import java.util.function.BiPredicate
import java.util.stream.StreamSupport
import javafx.stage.FileChooser import javafx.stage.FileChooser
import javafx.stage.FileChooser.ExtensionFilter import javafx.stage.FileChooser.ExtensionFilter
import kotlinx.support.jdk8.collections.spliterator
import net.corda.demobench.model.* import net.corda.demobench.model.*
import tornadofx.Controller import tornadofx.Controller
class ProfileController : Controller() { class ProfileController : Controller() {
private companion object ConfigAcceptor : BiPredicate<Path, BasicFileAttributes> {
override fun test(p: Path?, attr: BasicFileAttributes?) = "node.conf" == p?.fileName.toString()
}
private val jvm by inject<JVMConfig>() private val jvm by inject<JVMConfig>()
private val baseDir = jvm.userHome.resolve("demobench") private val baseDir = jvm.userHome.resolve("demobench")
private val nodeController by inject<NodeController>() private val nodeController by inject<NodeController>()
@ -65,8 +62,9 @@ class ProfileController : Controller() {
val configs = LinkedList<NodeConfig>() val configs = LinkedList<NodeConfig>()
FileSystems.newFileSystem(chosen.toPath(), null).use { fs -> FileSystems.newFileSystem(chosen.toPath(), null).use { fs ->
fs.rootDirectories.forEach { root -> StreamSupport.stream(fs.rootDirectories.spliterator(), false)
Files.find(root, 2, ConfigAcceptor).forEach { file -> .flatMap { Files.find(it, 2, BiPredicate { p, attr -> "node.conf" == p?.fileName.toString() }) }
.forEach { file ->
try { try {
// Java seems to "walk" through the ZIP file backwards. // Java seems to "walk" through the ZIP file backwards.
// So add new config to the front of the list, so that // So add new config to the front of the list, so that
@ -78,7 +76,6 @@ class ProfileController : Controller() {
throw e throw e
} }
} }
}
} }
return configs return configs
@ -125,7 +122,7 @@ class ProfileController : Controller() {
private fun Config.parseExtraServices(path: String): List<String> { private fun Config.parseExtraServices(path: String): List<String> {
val services = serviceController.services.toSortedSet() val services = serviceController.services.toSortedSet()
return this.getString(path).split(",") return this.getString(path).split(",")
.filter { svc -> !svc.isNullOrEmpty() } .filter { it -> !it.isNullOrEmpty() }
.map { svc -> .map { svc ->
require(svc in services, { "Unknown service '$svc'." } ) require(svc in services, { "Unknown service '$svc'." } )
svc svc