hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

revert convert Object->String, causes NPE problems

Browse Source
This commit is contained in:
Michael Hoennig 2024-11-14 16:38:14 +01:00
parent 880b2aa99a
commit e934726c4b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/java/net/hostsharing/hsadminng/hs/office/scenarios/TemplateResolver.java
View File

@ -22,25 +22,25 @@ public class TemplateResolver {
enum PlaceholderPrefix { enum PlaceholderPrefix {
RAW('%') { RAW('%') {
@Override @Override
String convert(final String value, final Resolver resolver) { String convert(final Object value, final Resolver resolver) {
return value != null ? value.toString() : ""; return value != null ? value.toString() : "";
} }
}, },
JSON_QUOTED('$'){ JSON_QUOTED('$'){
@Override @Override
String convert(final String value, final Resolver resolver) { String convert(final Object value, final Resolver resolver) {
return jsonQuoted(value); return jsonQuoted(value);
} }
}, },
URI_ENCODED('&'){ URI_ENCODED('&'){
@Override @Override
String convert(final String value, final Resolver resolver) { String convert(final Object value, final Resolver resolver) {
return value != null ? URLEncoder.encode(value.toString(), StandardCharsets.UTF_8) : ""; return value != null ? URLEncoder.encode(value.toString(), StandardCharsets.UTF_8) : "";
} }
}, },
COMMENT('#'){ COMMENT('#'){
@Override @Override
String convert(final String value, final Resolver resolver) { String convert(final Object value, final Resolver resolver) {
return resolver == DROP_COMMENTS ? "" : value.toString(); return resolver == DROP_COMMENTS ? "" : value.toString();
} }
}; };
@ -59,7 +59,7 @@ public class TemplateResolver {
return Arrays.stream(values()).filter(p -> p.prefixChar == givenChar).findFirst().orElseThrow(); return Arrays.stream(values()).filter(p -> p.prefixChar == givenChar).findFirst().orElseThrow();
} }
abstract String convert(final String value, final Resolver resolver); // FIXME: why Object and not String? abstract String convert(final Object value, final Resolver resolver);
} }
private final static Pattern pattern = Pattern.compile(",(\\s*})", Pattern.MULTILINE); private final static Pattern pattern = Pattern.compile(",(\\s*})", Pattern.MULTILINE);
@ -136,7 +136,7 @@ public class TemplateResolver {
} }
} }
final var content = new TemplateResolver(placeholder.toString(), properties).resolve(resolver); final var content = new TemplateResolver(placeholder.toString(), properties).resolve(resolver);
final var value = intro != '#' ? propVal(content).toString() : content; final var value = intro != '#' ? propVal(content) : content;
resolved.append( resolved.append(
PlaceholderPrefix.ofPrefixChar(intro).convert(value, resolver) PlaceholderPrefix.ofPrefixChar(intro).convert(value, resolver)
); );
@ -150,12 +150,12 @@ public class TemplateResolver {
} else if (nameExpression.contains(IF_NOT_FOUND_SYMBOL)) { } else if (nameExpression.contains(IF_NOT_FOUND_SYMBOL)) {
final var parts = StringUtils.split(nameExpression, IF_NOT_FOUND_SYMBOL); final var parts = StringUtils.split(nameExpression, IF_NOT_FOUND_SYMBOL);
return Arrays.stream(parts).filter(Objects::nonNull).findFirst().orElseGet(() -> { return Arrays.stream(parts).filter(Objects::nonNull).findFirst().orElseGet(() -> {
if ( parts[parts.length-1].isEmpty() ) { if ( parts[parts.length-1].isEmpty() ) {
// => whole expression ends with IF_NOT_FOUND_SYMBOL, thus last null element was optional // => whole expression ends with IF_NOT_FOUND_SYMBOL, thus last null element was optional
return null; return null;
} }
// => last alternative element in expression was null and not optional // => last alternative element in expression was null and not optional
throw new IllegalStateException("Missing required value in property-chain: " + nameExpression); throw new IllegalStateException("Missing required value in property-chain: " + nameExpression);
}); });
} else { } else {
final var val = properties.get(nameExpression); final var val = properties.get(nameExpression);