changes after review

Author: jo-bao

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

@@ -13,12 +13,12 @@
 /** Class for identification of entities and results from grids in SQL databases. */
 public record DbGridMetadata(String gridName, UUID uuid) {
 
-  public static final String GRID_TABLE = "grids";
-  public static final String GRID_NAME = "grid_name";
-  public static final String GRID_UUID = "grid_uuid";
+  public static final String GRID_TABLE_COLUMN = "grids";
+  public static final String GRID_NAME_COLUMN = "grid_name";
+  public static final String GRID_UUID_COLUMN = "grid_uuid";
 
   public String toString() {
-    return GRID_NAME + "=" + gridName + ", " + GRID_UUID + "=" + uuid.toString();
+    return GRID_NAME_COLUMN + "=" + gridName + ", " + GRID_UUID_COLUMN + "=" + uuid.toString();
   }
 
   /** @return Stream with grid uuid */

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

@@ -25,7 +25,7 @@ private static String beginQueryCreateTable(String schemaName, String tableName)
 
   /** @return query to create a SQL table for a grid */
   public static String queryCreateGridTable(String schemaName) {
-    return beginQueryCreateTable(schemaName, DbGridMetadata.GRID_TABLE)
+    return beginQueryCreateTable(schemaName, DbGridMetadata.GRID_TABLE_COLUMN)
         + "\tuuid uuid PRIMARY KEY,\n\tname TEXT NOT NULL\n"
         + endQueryCreateTable;
   }

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

@@ -106,17 +106,13 @@ public <C extends Entity> void persistAll(Collection<C> entities, DbGridMetadata
       persistMixedList(
           entitiesToAdd.stream().filter(ent -> cls.isAssignableFrom(ent.getClass())).toList(),
           identifier);
-      entitiesToAdd.removeIf(
-          ent ->
-              cls.isAssignableFrom(
-                  ent.getClass())); // maybe it's not necessary, but I'm not sure if there are
-      // entities who aren't in the hierarchic structure
+      entitiesToAdd.removeIf(ent -> cls.isAssignableFrom(ent.getClass()));
     }
     persistMixedList(new ArrayList<>(entitiesToAdd), identifier); // persist left entities
   }
 
   /**
-   * Persist an entity. By default this method take care about the extraction process of nested
+   * Persist an entity. By default this method takes care of the extraction process of nested
    * entities (if any)
    *
    * @param entity the entity that should be persisted
@@ -456,7 +452,7 @@ private static String basicInsertQuery(String schemaName, String tableName) {
   /** Provides the insert, column names, grid identifier and the VALUES statement for a query. */
   private String basicInsertQueryValuesGrid(
       String schemaName, String tableName, String[] headerElements) {
-    String[] addParams = {DbGridMetadata.GRID_UUID};
+    String[] addParams = {DbGridMetadata.GRID_UUID_COLUMN};
     return basicInsertQuery(schemaName, tableName)
         + " "
         + writeOneLine(StringUtils.camelCaseToSnakeCase(headerElements), addParams)
@@ -469,7 +465,7 @@ private String basicInsertQueryValuesGrid(
    */
   private String basicInsertQueryValuesITS(
       String schemaName, String tableName, String[] headerElements) {
-    String[] addParams = {DbGridMetadata.GRID_UUID, TIME_SERIES};
+    String[] addParams = {DbGridMetadata.GRID_UUID_COLUMN, TIME_SERIES};
     return basicInsertQuery(schemaName, tableName)
         + " "
         + writeOneLine(StringUtils.camelCaseToSnakeCase(headerElements), addParams)

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

@@ -130,28 +130,7 @@ class SqlSinkTest extends Specification implements TestContainerHelper, TimeSeri
     timeSeriesProcessorMap.put(timeSeriesProcessorKey, timeSeriesProcessor)
 
     SqlSink sink = new SqlSink(schemaName,
-    new ProcessorProvider([
-      new ResultEntityProcessor(PvResult),
-      new ResultEntityProcessor(WecResult),
-      new ResultEntityProcessor(EvResult),
-      new ResultEntityProcessor(EvcsResult),
-      new ResultEntityProcessor(EmResult),
-      new ResultEntityProcessor(FlexOptionsResult),
-      new InputEntityProcessor(Transformer2WInput),
-      new InputEntityProcessor(NodeInput),
-      new InputEntityProcessor(EvcsInput),
-      new InputEntityProcessor(Transformer2WTypeInput),
-      new InputEntityProcessor(LineGraphicInput),
-      new InputEntityProcessor(NodeGraphicInput),
-      new InputEntityProcessor(CylindricalStorageInput),
-      new InputEntityProcessor(ThermalHouseInput),
-      new InputEntityProcessor(OperatorInput),
-      new InputEntityProcessor(LineInput),
-      new InputEntityProcessor(ThermalBusInput),
-      new InputEntityProcessor(LineTypeInput),
-      new InputEntityProcessor(LoadInput),
-      new InputEntityProcessor(EmInput)
-    ], timeSeriesProcessorMap),
+    new ProcessorProvider(),
     namingStrategy,
     connector)
     UUID inputModel = UUID.fromString("22bea5fc-2cb2-4c61-beb9-b476e0107f52")

src/test/resources/edu/ie3/datamodel/io/sink/_sql/input_entities.sql

@@ -79,18 +79,17 @@ CREATE TABLE public.node_graphic_input
 
 CREATE TABLE public.cylindrical_storage_input
 (
-    uuid UUID PRIMARY KEY,
+    uuid uuid PRIMARY KEY,
     c DOUBLE PRECISION NOT NULL,
     id TEXT NOT NULL,
-    inlet_temp DOUBLE PRECISION NOT NULL,
-    operates_from TIMESTAMP WITH TIME ZONE,
-    operates_until TIMESTAMP WITH TIME ZONE,
-    operator UUID,
-    return_temp DOUBLE PRECISION NOT NULL,
-    storage_volume_lvl DOUBLE PRECISION NOT NULL,
-    storage_volume_lvl_min DOUBLE PRECISION NOT NULL,
-    thermal_bus UUID NOT NULL,
-    grid_uuid UUID NOT NULL REFERENCES grids(uuid)
+    inlet_temp double precision NOT NULL,
+    operates_from timestamp with time zone,
+    operates_until timestamp with time zone,
+    operator uuid,
+    return_temp double precision NOT NULL,
+    storage_volume_lvl double precision NOT NULL,
+    thermal_bus uuid NOT NULL,
+    grid_uuid uuid NOT NULL
 )
     WITHOUT OIDS
 	TABLESPACE pg_default;