diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml index 4b655c334..446fb1b0d 100644 --- a/rest/taskana-rest-spring-example/pom.xml +++ b/rest/taskana-rest-spring-example/pom.xml @@ -103,12 +103,6 @@ spring-ldap-core ${spring.ldap.version} - - junit - junit - 4.12 - test - com.h2database diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java index c4d56926b..709306e18 100644 --- a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java @@ -59,15 +59,17 @@ public class SampleDataGenerator { } /** - * This method resolves the custom sql function defined through this regex: {@value RELATIVE_DATE_REGEX}. - * Its parameter is a digit representing the relative offset of a given starting point date. + * This method resolves the custom sql function defined through this regex: {@value RELATIVE_DATE_REGEX}. Its + * parameter is a digit representing the relative offset of a given starting point date. *

- * Yes, this can be done as an actual sql function, but that'd lead to a little more complexity - * (and thus we'd have to maintain the code for db compatibility ...) - * Since we're already replacing the boolean attributes of sql files this addition is not a huge computational cost. + * Yes, this can be done as an actual sql function, but that'd lead to a little more complexity (and thus we'd have + * to maintain the code for db compatibility ...) Since we're already replacing the boolean attributes of sql files + * this addition is not a huge computational cost. * - * @param now anchor for relative date conversion. - * @param sql sql statement which may contain the above declared custom function. + * @param now + * anchor for relative date conversion. + * @param sql + * sql statement which may contain the above declared custom function. * @return sql statement with the given function resolved, if the 'sql' parameter contained any. */ private static String replaceRelativeTimeFunction(LocalDateTime now, String sql) { @@ -82,7 +84,8 @@ public class SampleDataGenerator { } private static String parseAndReplace(LocalDateTime now, InputStream stream) { - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream))) { + try ( + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) { return replaceRelativeTimeFunction(now, bufferedReader.lines().collect(Collectors.joining(System.lineSeparator()))); } catch (IOException e) {