From 640ffb3a7ebfa90b8bd245b8b6aa03975e218e6e Mon Sep 17 00:00:00 2001 From: SAllhusen <70843721+SAllhusen@users.noreply.github.com> Date: Sat, 17 Oct 2020 21:14:14 +0200 Subject: [PATCH] SqlReplacer now using DB#isDb2 --- common/taskana-common-data/pom.xml | 5 +++++ .../java/pro/taskana/sampledata/SqlReplacer.java | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/taskana-common-data/pom.xml b/common/taskana-common-data/pom.xml index 46ac33bed..10217f232 100644 --- a/common/taskana-common-data/pom.xml +++ b/common/taskana-common-data/pom.xml @@ -23,6 +23,11 @@ org.slf4j slf4j-api + + pro.taskana + taskana-common + ${project.version} + diff --git a/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java index db336a4e0..45d0e3151 100644 --- a/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java +++ b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java @@ -10,6 +10,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import pro.taskana.common.internal.configuration.DB; + /** This class replaces boolean values with int values if the database is db2. */ final class SqlReplacer { @@ -18,16 +20,13 @@ final class SqlReplacer { static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); + // to prevent initialization private SqlReplacer() {} static String getScriptAsSql(String dbProductName, ZonedDateTime now, String scriptPath) { return parseAndReplace(getScriptBufferedStream(scriptPath), now, dbProductName); } - static boolean isDb2(String dbProductName) { - return dbProductName != null && dbProductName.contains("DB2"); - } - /** * 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 @@ -61,17 +60,13 @@ final class SqlReplacer { .orElse(null); } - static String getSanitizedTableName(String table) { - return table.replaceAll("[^a-zA-Z0-9_]", "__"); - } - private static String replaceBooleanWithInteger(String sql) { return sql.replaceAll("(?i)true", "1").replaceAll("(?i)false", "0"); } private static String parseAndReplace( BufferedReader bufferedReader, ZonedDateTime now, String dbProductname) { - boolean isDb2 = isDb2(dbProductname); + boolean isDb2 = DB.isDb2(dbProductname); String sql = bufferedReader.lines().collect(Collectors.joining(System.lineSeparator())); if (isDb2) { sql = replaceBooleanWithInteger(sql);