CHE-450 do not fail if impossible to resolve variable in environment props #1132
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mshaposhnik
changed the title
| @@ -239,11 +243,16 @@ protected void bindProperties(String prefix, Map<String, String> properties) { | |||
| if (actual == null) { | |||
| actual = System.getenv(name); | |||
| } | |||
| if (actual == null) { | |||
| if (!skipUnresolved && actual == null) { | |||
There was a problem hiding this comment.
We can rewrite it to avoid double check actual value
if (actual != null) {
buf.append(actual);
} else if (skipUnresolved) {
buf.append(pValue.substring(i, j));
LOG.warn("Environment variable " + name + " cannot be resolved, leaving as is.");
} else {
throw new ConfigurationException(...);
}
WDYT?
|
ok @garagatyi ? |
| @@ -239,11 +243,16 @@ protected void bindProperties(String prefix, Map<String, String> properties) { | |||
| if (actual == null) { | |||
| actual = System.getenv(name); | |||
| } | |||
| if (actual == null) { | |||
| if (actual != null) { | |||
There was a problem hiding this comment.
you can use else instead of if (actual != null)
There was a problem hiding this comment.
I think I will have +1 level nesting in your case. Can you provide full example?
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Max Shaposhnik mshaposhnik@codenvy.com