nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed possible NPE in SqlReplacer

This commit is contained in:
Mustapha Zorgati 2023-03-14 14:39:06 +01:00
parent 6ded54484b
commit 45df9e7500
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java
View File

@ -11,6 +11,7 @@ import java.util.Optional;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import pro.taskana.common.api.exceptions.SystemException;
import pro.taskana.common.internal.configuration.DB; import pro.taskana.common.internal.configuration.DB;
/** This class replaces boolean values with int values if the database is db2. */ /** This class replaces boolean values with int values if the database is db2. */
@ -43,7 +44,7 @@ final class SqlReplacer {
*/ */
static String replaceDatePlaceholder(ZonedDateTime now, String sql) { static String replaceDatePlaceholder(ZonedDateTime now, String sql) {
Matcher m = RELATIVE_DATE_PATTERN.matcher(sql); Matcher m = RELATIVE_DATE_PATTERN.matcher(sql);
StringBuffer sb = new StringBuffer(sql.length()); StringBuilder sb = new StringBuilder(sql.length());
while (m.find()) { while (m.find()) {
long daysToShift = Long.parseLong(m.group(1)); long daysToShift = Long.parseLong(m.group(1));
String daysAsStringDate = formatToSqlDate(now, daysToShift); String daysAsStringDate = formatToSqlDate(now, daysToShift);
@ -58,7 +59,12 @@ final class SqlReplacer {
.map( .map(
inputStream -> inputStream ->
new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)))
.orElse(null); .orElseThrow(
() ->
new SystemException(
String.format(
"could not find sql script '%s' in the classpath of '%s'",
script, SampleDataGenerator.class)));
} }
private static String replaceBooleanWithInteger(String sql) { private static String replaceBooleanWithInteger(String sql) {