From c3ea2c14708105576acc321a63a6b7c316c83f35 Mon Sep 17 00:00:00 2001 From: "john.buckle@r3.com" Date: Wed, 13 May 2020 09:51:35 +0800 Subject: [PATCH 1/2] Ignore warning for CORDA environment variables in all caps --- .../net/corda/node/services/config/ConfigUtilities.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index b2dc5dd773..3f4eab0295 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -36,6 +36,7 @@ object ConfigHelper { private const val UPPERCASE_PROPERTY_PREFIX = "CORDA." private val log = LoggerFactory.getLogger(javaClass) + @Suppress("LongParameterList") fun loadConfig(baseDirectory: Path, configFile: Path = baseDirectory / "node.conf", allowMissingConfig: Boolean = false, @@ -88,7 +89,13 @@ object ConfigHelper { return ConfigFactory.parseMap( toProperties() .mapKeys { - var newKey = (it.key as String) + val original = it.key as String + + if (original == original.toUpperCase()){ + return@mapKeys original + } + + var newKey = original .replace('_', '.') .replace(UPPERCASE_PROPERTY_PREFIX, CORDA_PROPERTY_PREFIX) @@ -175,4 +182,4 @@ fun MutualSslConfiguration.configureDevKeyAndTrustStores(myLegalName: CordaX500N else -> throw IllegalArgumentException("CryptoService not supported.") } } -} \ No newline at end of file +} From febb5a44b7c689c290d65cdc32b7ab4b118336b4 Mon Sep 17 00:00:00 2001 From: "john.buckle@r3.com" Date: Wed, 13 May 2020 21:55:04 +0800 Subject: [PATCH 2/2] Added comment --- .../kotlin/net/corda/node/services/config/ConfigUtilities.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index 3f4eab0295..8a5eec792f 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -91,6 +91,8 @@ object ConfigHelper { .mapKeys { val original = it.key as String + // Reject environment variable that are in all caps + // since these cannot be properties. if (original == original.toUpperCase()){ return@mapKeys original }