From 87daa9890fd7c4a51c1eb159fe00018b779f4195 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sat, 31 Mar 2018 17:53:41 +0200 Subject: [PATCH] Fixed the env var / sys prop setting --- .../stubrunner/StubRunnerPropertyUtils.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerPropertyUtils.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerPropertyUtils.java index 64aaa95fc8..4c8c0b70f0 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerPropertyUtils.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunnerPropertyUtils.java @@ -53,8 +53,8 @@ class StubRunnerPropertyUtils { static String getProperty(Map options, String propName) { if (options != null && options.containsKey(propName)) { String value = options.get(propName); - if (log.isDebugEnabled()) { - log.debug("Options map contains the prop [" + propName + "] with value [" + value + "]"); + if (log.isTraceEnabled()) { + log.trace("Options map contains the prop [" + propName + "] with value [" + value + "]"); } return value; } @@ -62,22 +62,29 @@ class StubRunnerPropertyUtils { if (StringUtils.hasText(directTry)) { return directTry; } - return doGetProp(STUBRUNNER_PROPERTIES + "." + propName); + return doGetProp(appendPrefixIfNecessary(propName)); + } + + private static String appendPrefixIfNecessary(String prop) { + if (prop.toLowerCase().startsWith("stubrunner")) { + return prop; + } + return STUBRUNNER_PROPERTIES + "." + prop; } private static String doGetProp(String stubRunnerProp) { String systemProp = FETCHER.systemProp(stubRunnerProp); if (StringUtils.hasText(systemProp)) { - if (log.isDebugEnabled()) { - log.debug("System property [" + stubRunnerProp + "] has value [" + systemProp + "]"); + if (log.isTraceEnabled()) { + log.trace("System property [" + stubRunnerProp + "] has value [" + systemProp + "]"); } return systemProp; } String convertedEnvProp = stubRunnerProp.replaceAll("\\.", "_") .replaceAll("-", "_").toUpperCase(); String envVar = FETCHER.envVar(convertedEnvProp); - if (log.isDebugEnabled()) { - log.debug("Environment variable [" + convertedEnvProp + "] has value [" + envVar + "]"); + if (log.isTraceEnabled()) { + log.trace("Environment variable [" + convertedEnvProp + "] has value [" + envVar + "]"); } return envVar; }