From 3f124f47db92e9e8262bbd1ab721fc71cf0279fc Mon Sep 17 00:00:00 2001
From: Lia Lissmann <89016649+LiaLissmann@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:11:19 +0200
Subject: [PATCH] TSK-1710: Fixed a few code smells

---
 .../common/internal/configuration/DbSchemaCreator.java   | 9 ++++-----
 .../taskana/simplehistory/impl/TaskHistoryQueryImpl.java | 6 +++++-
 .../simplehistory/impl/WorkbasketHistoryQueryImpl.java   | 7 ++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
index 2ce830127..6b8e884d7 100644
--- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
+++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/DbSchemaCreator.java
@@ -87,7 +87,7 @@ public class DbSchemaCreator {
       connection.setSchema(this.schemaName);
       SqlRunner runner = new SqlRunner(connection);
       if (LOGGER.isDebugEnabled()) {
-        LOGGER.debug(connection.getMetaData().toString());
+        LOGGER.debug("{}", connection.getMetaData());
       }
 
       String query =
@@ -163,8 +163,7 @@ public class DbSchemaCreator {
 
   private boolean isSchemaPreexisting(Connection connection, String dbProductId) {
     ScriptRunner runner = getScriptRunnerInstance(connection);
-    StringWriter localErrorWriter = new StringWriter();
-    runner.setErrorLogWriter(new PrintWriter(localErrorWriter));
+    runner.setErrorLogWriter(errorLogWriter);
 
     String scriptPath = selectDbSchemaDetectionScript(dbProductId);
     try (InputStream resource = DbSchemaCreator.class.getResourceAsStream(scriptPath);
@@ -174,8 +173,8 @@ public class DbSchemaCreator {
     } catch (RuntimeSqlException | IOException e) {
       if (LOGGER.isDebugEnabled()) {
         LOGGER.debug("Schema does not exist.");
-        if (!localErrorWriter.toString().trim().isEmpty()) {
-          LOGGER.debug(localErrorWriter.toString());
+        if (!errorWriter.toString().trim().isEmpty()) {
+          LOGGER.debug(errorWriter.toString());
         }
       }
       return false;
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
index 7366396a7..00b931e06 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java
@@ -33,6 +33,9 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
   private final List<String> orderBy;
   private final List<String> orderColumns;
 
+  @SuppressWarnings("unused")
+  private TaskHistoryQueryColumnName columnName;
+
   private String[] idIn;
   private String[] businessProcessIdIn;
   private String[] parentBusinessProcessIdIn;
@@ -657,8 +660,9 @@ public class TaskHistoryQueryImpl implements TaskHistoryQuery {
   public List<String> listValues(
       TaskHistoryQueryColumnName dbColumnName, SortDirection sortDirection) {
     List<String> result = new ArrayList<>();
+    this.columnName = dbColumnName;
     this.orderBy.clear();
-    this.addOrderCriteria(dbColumnName.toString(), sortDirection);
+    this.addOrderCriteria(columnName.toString(), sortDirection);
 
     try {
       taskanaHistoryEngine.openConnection();
diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
index 93c42b75d..fb3488a80 100644
--- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
+++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java
@@ -31,6 +31,9 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
 
   private TaskanaHistoryEngineImpl taskanaHistoryEngine;
 
+  @SuppressWarnings("unused")
+  private WorkbasketHistoryQueryColumnName columnName;
+
   private List<String> orderBy;
   private List<String> orderColumns;
 
@@ -498,9 +501,10 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
   public List<String> listValues(
       WorkbasketHistoryQueryColumnName dbColumnName, SortDirection sortDirection) {
     List<String> result = new ArrayList<>();
+    this.columnName = dbColumnName;
     List<String> cacheOrderBy = this.orderBy;
     this.orderBy.clear();
-    this.addOrderCriteria(dbColumnName.toString(), sortDirection);
+    this.addOrderCriteria(columnName.toString(), sortDirection);
 
     try {
       taskanaHistoryEngine.openConnection();
@@ -511,6 +515,7 @@ public class WorkbasketHistoryQueryImpl implements WorkbasketHistoryQuery {
       return result;
     } finally {
       this.orderBy = cacheOrderBy;
+      this.columnName = null;
       this.orderColumns.remove(orderColumns.size() - 1);
       taskanaHistoryEngine.returnConnection();
     }