ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1711 - Remove dependency on PathUtilsKt in net.corda.core.internal (#3493)

Browse Source
This commit is contained in:
Tommy Lillehagen 2018-07-02 18:32:38 +01:00 committed by GitHub
parent 70374e9724
commit d683df5753
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
finance/src/main/kotlin/net/corda/finance/flows/CashConfigDataFlow.kt
View File

@ -5,8 +5,6 @@ import com.typesafe.config.ConfigFactory
import net.corda.core.flows.FlowLogic import net.corda.core.flows.FlowLogic
import net.corda.core.flows.StartableByRPC import net.corda.core.flows.StartableByRPC
import net.corda.core.internal.declaredField import net.corda.core.internal.declaredField
import net.corda.core.internal.div
import net.corda.core.internal.read
import net.corda.core.node.AppServiceHub import net.corda.core.node.AppServiceHub
import net.corda.core.node.services.CordaService import net.corda.core.node.services.CordaService
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
@ -17,6 +15,11 @@ import net.corda.finance.GBP
import net.corda.finance.USD import net.corda.finance.USD
import net.corda.finance.flows.ConfigHolder.Companion.supportedCurrencies import net.corda.finance.flows.ConfigHolder.Companion.supportedCurrencies
import java.io.IOException import java.io.IOException
import java.io.InputStream
import java.nio.file.Files
import java.nio.file.OpenOption
import java.nio.file.Path
import java.nio.file.Paths
import java.util.* import java.util.*
// TODO Until apps have access to their own config, we'll hack things by first getting the baseDirectory, read the node.conf // TODO Until apps have access to their own config, we'll hack things by first getting the baseDirectory, read the node.conf
@ -25,6 +28,12 @@ import java.util.*
class ConfigHolder(services: AppServiceHub) : SingletonSerializeAsToken() { class ConfigHolder(services: AppServiceHub) : SingletonSerializeAsToken() {
companion object { companion object {
val supportedCurrencies = listOf(USD, GBP, CHF, EUR) val supportedCurrencies = listOf(USD, GBP, CHF, EUR)
// TODO: In future releases, the Finance app should be fully decoupled from internal APIs in Core.
private operator fun Path.div(other: String): Path = resolve(other)
private operator fun String.div(other: String): Path = Paths.get(this) / other
private fun Path.inputStream(vararg options: OpenOption): InputStream = Files.newInputStream(this, *options)
private inline fun <R> Path.read(vararg options: OpenOption, block: (InputStream) -> R): R = inputStream(*options).use(block)
} }
val issuableCurrencies: List<Currency> val issuableCurrencies: List<Currency>