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

add old config annotation to doorman config (#731)

Browse Source
This commit is contained in:
Patrick Kuo 2018-04-17 10:35:28 +01:00 committed by GitHub
parent 84ca67a5e3
commit 0e663250ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
network-management/src/main/kotlin/com/r3/corda/networkmanage/doorman/DoormanParameters.kt
View File

@ -13,6 +13,7 @@ package com.r3.corda.networkmanage.doorman
import com.google.common.primitives.Booleans import com.google.common.primitives.Booleans
import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.nodeapi.internal.config.OldConfig
import net.corda.nodeapi.internal.persistence.DatabaseConfig import net.corda.nodeapi.internal.persistence.DatabaseConfig
import java.net.URL import java.net.URL
import java.nio.file.Path import java.nio.file.Path
@ -21,9 +22,12 @@ import java.util.*
data class NetworkManagementServerConfig( // TODO: Move local signing to signing server. data class NetworkManagementServerConfig( // TODO: Move local signing to signing server.
val address: NetworkHostAndPort, val address: NetworkHostAndPort,
val dataSourceProperties: Properties, val dataSourceProperties: Properties,
@OldConfig("databaseConfig")
val database: DatabaseConfig = DatabaseConfig(), val database: DatabaseConfig = DatabaseConfig(),
@OldConfig("doormanConfig")
val doorman: DoormanConfig?, val doorman: DoormanConfig?,
@OldConfig("networkMapConfig")
val networkMap: NetworkMapConfig?, val networkMap: NetworkMapConfig?,
val revocation: CertificateRevocationConfig?, val revocation: CertificateRevocationConfig?,
@ -47,6 +51,7 @@ data class NetworkManagementServerConfig( // TODO: Move local signing to signing
} }
data class DoormanConfig(val approveAll: Boolean = false, data class DoormanConfig(val approveAll: Boolean = false,
@OldConfig("jiraConfig")
val jira: JiraConfig? = null, val jira: JiraConfig? = null,
val approveInterval: Long = NetworkManagementServerConfig.DEFAULT_APPROVE_INTERVAL.toMillis()) { val approveInterval: Long = NetworkManagementServerConfig.DEFAULT_APPROVE_INTERVAL.toMillis()) {
init { init {