fixing Sonarqube

Author: jo-bao

src/main/java/edu/ie3/datamodel/io/SqlUtils.java

@@ -12,7 +12,7 @@
 public class SqlUtils {
 
   protected static final Logger log = LoggerFactory.getLogger(SqlUtils.class);
-  private static final String endQueryCreateTable =
+  private static final String END_QUERY_CREATE_TABLE =
       ")\n \t WITHOUT OIDS\n \t TABLESPACE pg_default;";
 
   private SqlUtils() {
@@ -27,7 +27,7 @@ private static String beginQueryCreateTable(String schemaName, String tableName)
   public static String queryCreateGridTable(String schemaName) {
     return beginQueryCreateTable(schemaName, DbGridMetadata.GRID_TABLE_COLUMN)
         + "\tuuid uuid PRIMARY KEY,\n\tname TEXT NOT NULL\n"
-        + endQueryCreateTable;
+        + END_QUERY_CREATE_TABLE;
   }
 
   /**

src/main/java/edu/ie3/datamodel/io/connectors/SqlConnector.java

@@ -160,28 +160,4 @@ public Map<String, String> extractFieldMap(ResultSet rs) {
     }
     return insensitiveFieldsToAttributes;
   }
-
-  /**
-   * Executes a query to check if a table exists
-   *
-   * @param tableName Name of the table, that should be checked
-   * @return True, if the table exists
-   */
-  public boolean tableExistsSQL(String tableName) {
-    String query =
-        "SELECT count(*) "
-            + "FROM information_schema.tables "
-            + "WHERE table_name = ?"
-            + "LIMIT 1;";
-    try (PreparedStatement ps = getConnection().prepareStatement(query)) {
-      ps.setString(1, tableName);
-
-      ResultSet resultSet = ps.executeQuery();
-      resultSet.next();
-      return resultSet.getInt(1) != 0;
-    } catch (SQLException e) {
-      log.error("Error during execution of query {}", query, e);
-    }
-    return false;
-  }
 }

src/main/java/edu/ie3/datamodel/io/sink/SqlSink.java

@@ -193,10 +193,7 @@ private <C extends Entity, E extends TimeSeriesEntry<V>, V extends Value> void p
       } else if (ResultEntity.class.isAssignableFrom(cls)) {
         insertListIgnoreNested(entities, cls, identifier, false);
       } else if (TimeSeries.class.isAssignableFrom(cls)) {
-        entities.forEach(
-            ts -> {
-              persistTimeSeries((TimeSeries<E, V>) ts, identifier);
-            });
+        entities.forEach(ts -> persistTimeSeries((TimeSeries<E, V>) ts, identifier));
       } else {
         log.error("I don't know how to handle an entity of class {}", cls.getSimpleName());
       }
@@ -262,20 +259,24 @@ private <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
                               identifier,
                               timeSeries.getUuid().toString()))
                   .collect(Collectors.joining(",\n", "", ";"));
-      try {
-        connector.executeUpdate(query);
-      } catch (SQLException e) {
-        throw new RuntimeException(
-            String.format(
-                "An error occurred during extraction of the time series, SQLReason: '%s'",
-                e.getMessage()),
-            e);
-      }
+      executeQueryToPersist(query);
     } catch (ProcessorProviderException e) {
       throw new ProcessorProviderException("Exception occurred during processor request: ", e);
     }
   }
 
+  private void executeQueryToPersist(String query) {
+    try {
+      connector.executeUpdate(query);
+    } catch (SQLException e) {
+      throw new RuntimeException(
+          String.format(
+              "An error occurred during extraction of the time series, SQLReason: '%s'",
+              e.getMessage()),
+          e);
+    }
+  }
+
   /** Persists a whole {@link JointGridContainer}. */
   public void persistJointGrid(JointGridContainer jointGridContainer, UUID gridUUID) {
     DbGridMetadata identifier = new DbGridMetadata(jointGridContainer.getGridName(), gridUUID);
@@ -427,13 +428,13 @@ private String queryTimeSeriesValueLine(
       Map<String, String> entityFieldData,
       String[] headerElements,
       DbGridMetadata identifier,
-      String TSuuid) {
+      String tsUuid) {
     return writeOneLine(
         Stream.concat(
             Stream.concat(
                 Arrays.stream(headerElements).map(entityFieldData::get),
                 identifier.getStreamForQuery()),
-            Stream.of(quote(TSuuid, "'"))));
+            Stream.of(quote(tsUuid, "'"))));
   }
 
   private LinkedHashMap<String, String> sqlEntityFieldData(

src/main/java/edu/ie3/datamodel/io/source/sql/SqlDataSource.java

@@ -190,8 +190,4 @@ protected Stream<Map<String, String>> executeQuery(String query, AddParams addPa
   protected Stream<Map<String, String>> executeQuery(String query) {
     return executeQuery(query, x -> {});
   }
-
-  public boolean checkExistingTable(String tableName) throws SQLException {
-    return connector.tableExistsSQL(tableName);
-  }
 }