Use Stream#toList

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Remove unused imports
   - Use enhanced switch statements
   - Replace lambdas with method references
+  - Use `Stream#toList`
 - Create JavaDoc with java 17 instead of java 8
 
 ### Added

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

@@ -14,7 +14,6 @@
 import com.couchbase.client.java.query.QueryResult;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
 
 /**
  * Implements a DataConnector for Couchbase. Couchbase is a JSON document based database. <br>
@@ -115,7 +114,7 @@ public CompletableFuture<QueryResult> query(String query) {
    */
   public List<CompletableFuture<GetResult>> bulkGet(List<String> keys) {
     final Collection session = getSession();
-    return keys.stream().map(key -> session.async().get(key)).collect(Collectors.toList());
+    return keys.stream().map(key -> session.async().get(key)).toList();
   }
 
   /**

src/main/java/edu/ie3/datamodel/io/factory/Factory.java

@@ -47,7 +47,7 @@ public Optional<R> get(D data) {
     // magic: case-insensitive get/set calls on set strings
     final List<Set<String>> allFields = getFields(data);
 
-    validateParameters(data, allFields.stream().toArray((IntFunction<Set<String>[]>) Set[]::new));
+    validateParameters(data, allFields.toArray((IntFunction<Set<String>[]>) Set[]::new));
 
     try {
       // build the model
@@ -116,9 +116,7 @@ protected int validateParameters(D data, Set<String>... fieldSets) {
 
     // get all sets that match the fields to attributes
     List<Set<String>> validFieldSets =
-        Arrays.stream(fieldSets)
-            .filter(x -> x.equals(fieldsToValues.keySet()))
-            .collect(Collectors.toList());
+        Arrays.stream(fieldSets).filter(x -> x.equals(fieldsToValues.keySet())).toList();
 
     if (validFieldSets.size() == 1) {
       // if we can identify a unique parameter set for a constructor, we take it and return the

src/main/java/edu/ie3/datamodel/io/naming/DefaultDirectoryHierarchy.java

@@ -147,7 +147,7 @@ private void checkExpectedDirectories() throws FileException {
    */
   private void checkFurtherDirectoryElements() throws FileException {
     try (Stream<Path> apparentElementsStream = Files.list(projectDirectory)) {
-      for (Path apparentPath : apparentElementsStream.collect(Collectors.toList())) {
+      for (Path apparentPath : apparentElementsStream.toList()) {
         if (Files.isDirectory(apparentPath)
             && !subDirectories.containsKey(apparentPath)
             && apparentPath.compareTo(inputTree) != 0
@@ -219,7 +219,7 @@ public Optional<String> getSubDirectory(Class<? extends UniqueEntity> cls, Strin
                         .anyMatch(definedClass -> definedClass.isAssignableFrom(cls)))
             .findFirst();
 
-    if (!maybeSubDirectory.isPresent()) {
+    if (maybeSubDirectory.isEmpty()) {
       logger.debug("Don't know a fitting sub directory for class '{}'.", cls.getSimpleName());
       return Optional.empty();
     } else {

src/main/java/edu/ie3/datamodel/io/source/IdCoordinateSource.java

@@ -8,7 +8,6 @@
 import edu.ie3.util.geo.CoordinateDistance;
 import edu.ie3.util.geo.GeoUtils;
 import java.util.*;
-import java.util.stream.Collectors;
 import org.locationtech.jts.geom.Point;
 
 /**
@@ -78,6 +77,6 @@ default List<CoordinateDistance> getNearestCoordinates(
             (allCoordinates == null || allCoordinates.isEmpty())
                 ? getAllCoordinates()
                 : allCoordinates);
-    return sortedDistances.stream().limit(n).collect(Collectors.toList());
+    return sortedDistances.stream().limit(n).toList();
   }
 }

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

@@ -413,7 +413,7 @@ protected List<Map<String, String>> csvRowFieldValueMapping(
         .parallel()
         .map(csvRow -> buildFieldsToAttributes(csvRow, headline))
         .filter(map -> !map.isEmpty())
-        .collect(Collectors.toList());
+        .toList();
   }
 
   /**

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

@@ -20,7 +20,6 @@
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.locationtech.jts.geom.Point;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -118,7 +117,7 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
     Set<Integer> coordinateIds =
         coordinates.stream()
             .map(idCoordinateSource::getId)
-            .flatMap(o -> o.map(Stream::of).orElseGet(Stream::empty))
+            .flatMap(Optional::stream)
             .collect(Collectors.toSet());
     if (coordinateIds.isEmpty()) {
       logger.warn("Unable to match coordinates to coordinate ID");
@@ -141,7 +140,7 @@ public Map<Point, IndividualTimeSeries<WeatherValue>> getWeather(
   public Optional<TimeBasedValue<WeatherValue>> getWeather(ZonedDateTime date, Point coordinate) {
     List<TimeBasedValue<WeatherValue>> timeBasedValues = Collections.emptyList();
     Optional<Integer> coordinateId = idCoordinateSource.getId(coordinate);
-    if (!coordinateId.isPresent()) {
+    if (coordinateId.isEmpty()) {
       logger.warn("Unable to match coordinate {} to a coordinate ID", coordinate);
       return Optional.empty();
     }
@@ -298,10 +297,7 @@ private List<TimeBasedValue<WeatherValue>> processWeatherQuery(PreparedStatement
    */
   private List<TimeBasedValue<WeatherValue>> toTimeBasedWeatherValues(
       Collection<Map<String, String>> fieldMaps) {
-    return fieldMaps.stream()
-        .map(this::toTimeBasedWeatherValue)
-        .flatMap(o -> o.map(Stream::of).orElseGet(Stream::empty))
-        .collect(Collectors.toList());
+    return fieldMaps.stream().map(this::toTimeBasedWeatherValue).flatMap(Optional::stream).toList();
   }
 
   /**
@@ -314,7 +310,7 @@ private Optional<TimeBasedValue<WeatherValue>> toTimeBasedWeatherValue(
       Map<String, String> fieldMap) {
     fieldMap.remove("tid");
     Optional<TimeBasedWeatherValueData> data = toTimeBasedWeatherValueData(fieldMap);
-    if (!data.isPresent()) return Optional.empty();
+    if (data.isEmpty()) return Optional.empty();
     return weatherFactory.get(data.get());
   }
 
@@ -331,7 +327,7 @@ private Optional<TimeBasedWeatherValueData> toTimeBasedWeatherValueData(
     fieldMap.putIfAbsent("uuid", UUID.randomUUID().toString());
     int coordinateId = Integer.parseInt(coordinateValue);
     Optional<Point> coordinate = idCoordinateSource.getCoordinate(coordinateId);
-    if (!coordinate.isPresent()) {
+    if (coordinate.isEmpty()) {
       logger.warn("Unable to match coordinate ID {} to a point", coordinateId);
       return Optional.empty();
     }