Fixing sonarqube

Author: Johannes Bao

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

@@ -13,7 +13,7 @@ public class SqlUtils {
 
   protected static final Logger log = LoggerFactory.getLogger(SqlUtils.class);
   private static final String endQueryCreateTable =
-      ")\n" + "\t WITHOUT OIDS\n" + "\t TABLESPACE pg_default;";
+      ")\n \t WITHOUT OIDS\n \t TABLESPACE pg_default;";
 
   private SqlUtils() {
     throw new IllegalStateException("Utility classes cannot be instantiated");
@@ -36,7 +36,7 @@ public static String queryCreateGridTable(String schemaName) {
    * @return input with quoteSymbol
    */
   public static String quote(String input, String quoteSymbol) {
-    if (Objects.equals(input, "")) {
+    if (Objects.equals(input, "") || Objects.equals(input, "null")) {
       return "NULL";
     } else {
       return input.matches("^\".*\"$") ? input : quoteSymbol + input + quoteSymbol;

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

@@ -61,11 +61,16 @@ public ResultSet executeQuery(Statement stmt, String query) throws SQLException
   /**
    * Executes an update query
    *
-   * @param updateQuery the query to execute
+   * @param query the query to execute
    * @return The number of updates or a negative number if the execution failed
    */
-  public int executeUpdate(String updateQuery) throws SQLException {
-    return getConnection().createStatement().executeUpdate(updateQuery);
+  public int executeUpdate(String query) throws SQLException {
+    try (Statement statement = getConnection().createStatement()) {
+      return statement.executeUpdate(query);
+    } catch (SQLException e) {
+      throw new SQLException(
+          String.format("Error at execution of query, SQLReason: '%s'", e.getMessage()), e);
+    }
   }
 
   /**
@@ -162,17 +167,21 @@ public Map<String, String> extractFieldMap(ResultSet rs) {
    * @param tableName Name of the table, that should be checked
    * @return True, if the table exists
    */
-  public boolean tableExistsSQL(String tableName) throws SQLException {
-    PreparedStatement preparedStatement =
-        connection.prepareStatement(
-            "SELECT count(*) "
-                + "FROM information_schema.tables "
-                + "WHERE table_name = ?"
-                + "LIMIT 1;");
-    preparedStatement.setString(1, tableName);
+  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 = preparedStatement.executeQuery();
-    resultSet.next();
-    return resultSet.getInt(1) != 0;
+      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

@@ -33,7 +33,6 @@
 import edu.ie3.datamodel.models.timeseries.TimeSeriesEntry;
 import edu.ie3.datamodel.models.value.Value;
 import edu.ie3.util.StringUtils;
-import java.io.IOException;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -105,9 +104,7 @@ public <C extends Entity> void persistAll(Collection<C> entities, DbGridMetadata
     // Persist the entities in hierarchic order to avoid failure because of foreign keys
     for (Class<?> cls : hierarchicInsert()) {
       persistMixedList(
-          entitiesToAdd.stream()
-              .filter(ent -> cls.isAssignableFrom(ent.getClass()))
-              .collect(Collectors.toList()),
+          entitiesToAdd.stream().filter(ent -> cls.isAssignableFrom(ent.getClass())).toList(),
           identifier);
       entitiesToAdd.removeIf(
           ent ->
@@ -202,15 +199,7 @@ private <C extends Entity, E extends TimeSeriesEntry<V>, V extends Value> void p
       } else if (TimeSeries.class.isAssignableFrom(cls)) {
         entities.forEach(
             ts -> {
-              try {
-                persistTimeSeries((TimeSeries<E, V>) ts, identifier);
-              } catch (SQLException e) {
-                throw new RuntimeException(
-                    String.format(
-                        "An error occurred during extraction of entity '%s', SQLReason: '%s'",
-                        cls.getSimpleName(), e.getMessage()),
-                    e);
-              }
+              persistTimeSeries((TimeSeries<E, V>) ts, identifier);
             });
       } else {
         log.error("I don't know how to handle an entity of class {}", cls.getSimpleName());
@@ -244,22 +233,20 @@ private <C extends Entity> void insertListIgnoreNested(
 
   /** Persist one time series. */
   protected <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
-      TimeSeries<E, V> timeSeries, DbGridMetadata identifier) throws SQLException {
+      TimeSeries<E, V> timeSeries, DbGridMetadata identifier) {
     try {
       TimeSeriesProcessorKey key = new TimeSeriesProcessorKey(timeSeries);
       String[] headerElements = processorProvider.getHeaderElements(key);
       persistTimeSeries(timeSeries, headerElements, identifier);
     } catch (ProcessorProviderException e) {
       log.error(
           "Exception occurred during receiving of header elements. Cannot write this element.", e);
-    } catch (IOException e) {
-      log.error("Exception occurred during closing of writer.", e);
     }
   }
 
   private <E extends TimeSeriesEntry<V>, V extends Value> void persistTimeSeries(
       TimeSeries<E, V> timeSeries, String[] headerElements, DbGridMetadata identifier)
-      throws ProcessorProviderException, IOException {
+      throws ProcessorProviderException {
     try {
       String query =
           basicInsertQueryValuesITS(

src/test/groovy/edu/ie3/datamodel/io/sink/SqlSinkTest.groovy

@@ -277,7 +277,7 @@ class SqlSinkTest extends Specification implements TestContainerHelper, TimeSeri
 
     then:
     def exception = thrown(SQLException)
-    exception.message.contains("ERROR: invalid input syntax for type uuid: \"null\"\n")
+    exception.message.contains("ERROR: null value in column \"node\" of relation \"pv_input\" violates not-null constraint")
 
     cleanup:
     sink.shutdown()
@@ -317,8 +317,8 @@ class SqlSinkTest extends Specification implements TestContainerHelper, TimeSeri
 
     then:
     def exception = thrown(SQLException)
-    exception.message == "ERROR: insert or update on table \"load_input\" violates foreign key constraint \"load_input_node_fkey\"\n" +
-    "  Detail: Key (node)=(4ca90220-74c2-4369-9afa-a18bf068840d) is not present in table \"node_input\"."
+    exception.message.contains("ERROR: insert or update on table \"load_input\" violates foreign key constraint \"load_input_node_fkey\"\n" +
+    "  Detail: Key (node)=(4ca90220-74c2-4369-9afa-a18bf068840d) is not present in table \"node_input\".")
   }
 
   def "A valid SqlSink throws an exception if a grid does not exist."() {

src/test/resources/log4j2-test.xml

@@ -25,7 +25,7 @@
     </Appenders>
     <Loggers>
         <asyncRoot level="debug">
-            <AppenderRef ref="Console" level="error"/>
+            <AppenderRef ref="Console" level="off"/>
             <AppenderRef ref="RF" level="debug"/>
         </asyncRoot>
     </Loggers>