rzo1 commented on a change in pull request #763:
URL: https://github.com/apache/tomee/pull/763#discussion_r585731086
##########
File path:
container/openejb-core/src/main/java/org/apache/openejb/util/PropertyPlaceHolderHelper.java
##########
@@ -53,33 +55,34 @@ public static void reset() {
}
public static String simpleValue(final String raw) {
- if (raw == null) {
- return null;
- }
- if (!raw.contains(PREFIX) || !raw.contains(SUFFIX)) {
- return String.class.cast(decryptIfNeeded(raw.replace(PREFIX,
"").replace(SUFFIX, ""), false));
- }
-
- String value = SUBSTITUTOR.replace(raw);
- if (!value.equals(raw) && value.startsWith("java:")) {
- value = value.substring(5);
- }
- return String.class.cast(decryptIfNeeded(value.replace(PREFIX,
"").replace(SUFFIX, ""), false));
+ return String.class.cast(simpleValueAsStringOrCharArray(raw, false));
}
public static Object simpleValueAsStringOrCharArray(final String raw) {
+ return simpleValueAsStringOrCharArray(raw, true);
+ }
+
+ private static Object simpleValueAsStringOrCharArray(final String raw,
boolean acceptCharArray) {
if (raw == null) {
return null;
}
if (!raw.contains(PREFIX) || !raw.contains(SUFFIX)) {
- return decryptIfNeeded(raw.replace(PREFIX, "").replace(SUFFIX,
""), true);
+ return decryptIfNeeded(raw, acceptCharArray);
}
String value = SUBSTITUTOR.replace(raw);
+
if (!value.equals(raw) && value.startsWith("java:")) {
value = value.substring(5);
}
- return decryptIfNeeded(value.replace(PREFIX, "").replace(SUFFIX, ""),
true);
+
+ // no key defined and no escape sequence found -> substitute to key
instead
+ if (!(raw.contains(ESCAPE_SEQUENCE) || value.contains(ESCAPE_SEQUENCE))
Review comment:
@rmannibucau
Wouldn't returning the `key` instead of `null` in `PropertiesLookup#lookup`
breaking the `:-` syntax?
From my understanding, `:-` is used for some sort of inlined "if else", i.e.
"if foo is not defined, use bar instead" - is this assumption correct? Or maybe
I didn't understood the substition process for `:-` correctly? :)
For example:
- "${foo:-bar}" -> `bar` (in the original implementation (returning `null`);
`foo` is undefined)
- "${foo:-bar}" -> `foo` (if we return the `key` instead of `null`, the
second part via `:-` is not evaluated as we have a match for the given key
(which is the key itself))
edit:
Might be necessary to chain two substitutors to handle `:-` cases properly,
sth like 1st lookup via substitutor returning `null` (via
`PropertiesLookup#lookup`), 2nd lookup via substitutor returning `key` (via an
extended `PropertiesLookup#lookup`, which returns `key` instead of `null`).
Chained lookup might be skipped, if no `:-` is contained in the original `raw`
input. Would bring the fallback replacement into the substitutor and the
special case for `:-` is still supported. wdyt?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
