minor changes + fmt

Author: johanneshiry

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

@@ -159,7 +159,7 @@ public BufferedReader initReader(Class<? extends UniqueEntity> clz) throws FileN
                               + "'."));
     } catch (ConnectorException e) {
       log.error(
-          "Cannot get reader for entity '{}' as no file naming strategy for this file exists. Exception:{}",
+          "Cannot get reader for entity '{}' as no file naming strategy for this file exists. Exception: {}",
           clz::getSimpleName,
           () -> e);
     }
@@ -204,8 +204,7 @@ public Optional<IndividualTimeSeriesMetaInformation> getIndividualTimeSeriesMeta
    */
   private Map<UUID, CsvIndividualTimeSeriesMetaInformation>
       buildIndividualTimeSeriesMetaInformation() {
-    return getIndividualTimeSeriesFilePaths()
-        .parallelStream()
+    return getIndividualTimeSeriesFilePaths().parallelStream()
         .map(
             filePath -> {
               /* Extract meta information from file path and enhance it with the file path itself */
@@ -233,8 +232,7 @@ public Optional<IndividualTimeSeriesMetaInformation> getIndividualTimeSeriesMeta
   @Deprecated
   public Map<ColumnScheme, Set<TimeSeriesReadingData>> initTimeSeriesReader(
       ColumnScheme... columnSchemes) {
-    return getIndividualTimeSeriesFilePaths()
-        .parallelStream()
+    return getIndividualTimeSeriesFilePaths().parallelStream()
         .map(
             pathString -> {
               String filePathWithoutEnding = removeFileEnding(pathString);

src/main/java/edu/ie3/datamodel/io/processor/timeseries/TimeSeriesProcessor.java

@@ -77,7 +77,7 @@ public TimeSeriesProcessor(Class<T> timeSeriesClass, Class<E> entryClass, Class<
     if (!eligibleKeys.contains(timeSeriesKey))
       throw new EntityProcessorException(
           "Cannot register time series combination '"
-              + timeSeriesKey.toString()
+              + timeSeriesKey
               + "' with entity processor '"
               + this.getClass().getSimpleName()
               + "'. Eligible combinations: "
@@ -106,7 +106,8 @@ private SortedMap<String, FieldSourceToMethod> buildFieldToSource(
       Class<T> timeSeriesClass, Class<E> entryClass, Class<V> valueClass) {
     /* Get the mapping from field name to getter method ignoring the getter for returning all entries */
     Map<String, FieldSourceToMethod> timeSeriesMapping =
-        mapFieldNameToGetter(timeSeriesClass, Arrays.asList("entries", "uuid", "type")).entrySet()
+        mapFieldNameToGetter(timeSeriesClass, Arrays.asList("entries", "uuid", "type"))
+            .entrySet()
             .stream()
             .collect(
                 Collectors.toMap(
@@ -136,7 +137,8 @@ private SortedMap<String, FieldSourceToMethod> buildFieldToSource(
                           mapFieldNameToGetter(
                                   valueClass,
                                   Arrays.asList("solarIrradiance", "temperature", "wind"))
-                              .entrySet().stream()
+                              .entrySet()
+                              .stream()
                               .map(
                                   entry ->
                                       new AbstractMap.SimpleEntry<>(

src/main/java/edu/ie3/datamodel/io/source/csv/CsvDataSource.java

@@ -356,18 +356,12 @@ protected <T extends UniqueEntity> Optional<T> findFirstEntityByUuid(
    */
   protected Stream<Map<String, String>> buildStreamWithFieldsToAttributesMap(
       Class<? extends UniqueEntity> entityClass, CsvFileConnector connector) {
-    try (BufferedReader reader = connector.initReader(entityClass)) {
-      return buildStreamWithFieldsToAttributesMap(entityClass, reader);
+    try {
+      return buildStreamWithFieldsToAttributesMap(entityClass, connector.initReader(entityClass));
     } catch (FileNotFoundException e) {
       log.warn(
           "Unable to find file for entity '{}': {}", entityClass.getSimpleName(), e.getMessage());
-    } catch (IOException e) {
-      log.warn(
-          "Unable to close stream from file for entity '{}': {}",
-          entityClass.getSimpleName(),
-          e.getMessage());
     }
-
     return Stream.empty();
   }
 
@@ -400,10 +394,7 @@ protected Stream<Map<String, String>> buildStreamWithFieldsToAttributesMap(
       Collection<Map<String, String>> allRows = csvRowFieldValueMapping(reader, headline);
 
       return distinctRowsWithLog(
-              allRows,
-              fieldToValues -> fieldToValues.get("uuid"),
-              entityClass.getSimpleName(),
-              "UUID")
+          allRows, fieldToValues -> fieldToValues.get("uuid"), entityClass.getSimpleName(), "UUID")
           .parallelStream();
     } catch (IOException e) {
       log.warn(
@@ -462,8 +453,7 @@ protected Set<Map<String, String>> distinctRowsWithLog(
 
     /* Check for rows with the same key based on the provided key extractor function */
     Set<Map<String, String>> distinctIdSet =
-        allRowsSet
-            .parallelStream()
+        allRowsSet.parallelStream()
             .filter(ValidationUtils.distinctByKey(keyExtractor))
             .collect(Collectors.toSet());
     if (distinctIdSet.size() != allRowsSet.size()) {

src/main/java/edu/ie3/datamodel/io/source/csv/CsvIdCoordinateSource.java

@@ -123,7 +123,7 @@ protected Stream<Map<String, String>> buildStreamWithFieldsToAttributesMap() {
                   .get(factory.getLatField())
                   .concat(fieldToValues.get(factory.getLonField()));
       return distinctRowsWithLog(
-              withDistinctCoordinateId, coordinateExtractor, "coordinate id mapping", "coordinate")
+          withDistinctCoordinateId, coordinateExtractor, "coordinate id mapping", "coordinate")
           .parallelStream();
     } catch (IOException e) {
       log.error("Cannot read the file for coordinate id to coordinate mapping.", e);

src/main/java/edu/ie3/datamodel/io/source/csv/CsvWeatherSource.java

@@ -246,7 +246,7 @@ protected Stream<Map<String, String>> buildStreamWithFieldsToAttributesMap(
                   .get(weatherFactory.getTimeFieldString())
                   .concat(fieldToValues.get(weatherFactory.getCoordinateIdFieldString()));
       return distinctRowsWithLog(
-              allRows, timeCoordinateIdExtractor, entityClass.getSimpleName(), "UUID")
+          allRows, timeCoordinateIdExtractor, entityClass.getSimpleName(), "UUID")
           .parallelStream();
 
     } catch (IOException e) {

src/main/java/edu/ie3/datamodel/models/input/container/GraphicElements.java

@@ -48,14 +48,12 @@ public GraphicElements(List<GraphicInput> graphics) {
 
     /* init sets */
     this.nodeGraphics =
-        graphics
-            .parallelStream()
+        graphics.parallelStream()
             .filter(graphic -> graphic instanceof NodeGraphicInput)
             .map(graphic -> (NodeGraphicInput) graphic)
             .collect(Collectors.toSet());
     this.lineGraphics =
-        graphics
-            .parallelStream()
+        graphics.parallelStream()
             .filter(graphic -> graphic instanceof LineGraphicInput)
             .map(graphic -> (LineGraphicInput) graphic)
             .collect(Collectors.toSet());

src/main/java/edu/ie3/datamodel/models/input/container/RawGridElements.java

@@ -84,38 +84,32 @@ public RawGridElements(List<AssetInput> rawGridElements) {
 
     /* init sets */
     this.nodes =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof NodeInput)
             .map(nodeInput -> (NodeInput) nodeInput)
             .collect(Collectors.toSet());
     this.lines =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof LineInput)
             .map(lineInput -> (LineInput) lineInput)
             .collect(Collectors.toSet());
     this.transformer2Ws =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof Transformer2WInput)
             .map(trafo2wInput -> (Transformer2WInput) trafo2wInput)
             .collect(Collectors.toSet());
     this.transformer3Ws =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof Transformer3WInput)
             .map(trafo3wInput -> (Transformer3WInput) trafo3wInput)
             .collect(Collectors.toSet());
     this.switches =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof SwitchInput)
             .map(switchInput -> (SwitchInput) switchInput)
             .collect(Collectors.toSet());
     this.measurementUnits =
-        rawGridElements
-            .parallelStream()
+        rawGridElements.parallelStream()
             .filter(gridElement -> gridElement instanceof MeasurementUnitInput)
             .map(measurementUnitInput -> (MeasurementUnitInput) measurementUnitInput)
             .collect(Collectors.toSet());

src/main/java/edu/ie3/datamodel/models/input/container/SystemParticipants.java

@@ -106,62 +106,52 @@ public SystemParticipants(List<SystemParticipantInput> systemParticipants) {
 
     /* init sets */
     this.bmPlants =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof BmInput)
             .map(bmInput -> (BmInput) bmInput)
             .collect(Collectors.toSet());
     this.chpPlants =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof ChpInput)
             .map(chpInput -> (ChpInput) chpInput)
             .collect(Collectors.toSet());
     this.evCS =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof EvcsInput)
             .map(evcsInput -> (EvcsInput) evcsInput)
             .collect(Collectors.toSet());
     this.evs =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof EvInput)
             .map(evInput -> (EvInput) evInput)
             .collect(Collectors.toSet());
     this.fixedFeedIns =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof FixedFeedInInput)
             .map(fixedFeedInInpu -> (FixedFeedInInput) fixedFeedInInpu)
             .collect(Collectors.toSet());
     this.heatPumps =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof HpInput)
             .map(hpInput -> (HpInput) hpInput)
             .collect(Collectors.toSet());
     this.loads =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof LoadInput)
             .map(loadInput -> (LoadInput) loadInput)
             .collect(Collectors.toSet());
     this.pvPlants =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof PvInput)
             .map(pvInput -> (PvInput) pvInput)
             .collect(Collectors.toSet());
     this.storages =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof StorageInput)
             .map(storageInput -> (StorageInput) storageInput)
             .collect(Collectors.toSet());
     this.wecPlants =
-        systemParticipants
-            .parallelStream()
+        systemParticipants.parallelStream()
             .filter(gridElement -> gridElement instanceof WecInput)
             .map(wecInput -> (WecInput) wecInput)
             .collect(Collectors.toSet());

src/main/java/edu/ie3/datamodel/models/input/system/type/chargingpoint/ChargingPointTypeUtils.java

@@ -142,7 +142,8 @@ private ChargingPointTypeUtils() {
                       Stream.concat(
                           Stream.of(type.getId().toLowerCase()),
                           type.getSynonymousIds().stream().map(String::toLowerCase))
-                          .collect(Collectors.toMap(Function.identity(), v -> type)).entrySet()
+                          .collect(Collectors.toMap(Function.identity(), v -> type))
+                          .entrySet()
                           .stream())
               .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
 

src/main/java/edu/ie3/datamodel/utils/ContainerNodeUpdateUtil.java

@@ -207,9 +207,7 @@ private static SystemParticipants updateSystemParticipantsWithNodes(
       SystemParticipants systemParticipants, Map<NodeInput, NodeInput> oldToNewNodes) {
 
     List<SystemParticipantInput> sysParts =
-        systemParticipants
-            .allEntitiesAsList()
-            .parallelStream()
+        systemParticipants.allEntitiesAsList().parallelStream()
             .map(
                 sysPart -> {
                   if (oldToNewNodes.containsKey(sysPart.getNode())) {