Skip to content

Commit 6fc1be8

Browse files
committed
Implementing requested changes.
1 parent a18d2bf commit 6fc1be8

File tree

4 files changed

+6
-133
lines changed

4 files changed

+6
-133
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66
package edu.ie3.datamodel.io.source.csv;
77

8-
import static edu.ie3.datamodel.utils.CollectionUtils.groupBy;
98
import static java.util.Collections.emptySet;
109

1110
import edu.ie3.datamodel.exceptions.SourceException;
@@ -22,6 +21,7 @@
2221
import edu.ie3.datamodel.utils.Try;
2322
import java.nio.file.Path;
2423
import java.util.*;
24+
import java.util.stream.Collectors;
2525

2626
/** Convenience class for cases where all used data comes from CSV sources */
2727
public class CsvThermalGridSource {
@@ -85,9 +85,11 @@ public static List<ThermalGrid> read(
8585
// filtered and thrown before
8686

8787
Map<ThermalBusInput, Set<ThermalHouseInput>> houseInputs =
88-
groupBy(houses.getOrThrow(), ThermalUnitInput::getThermalBus);
88+
houses.getOrThrow().stream()
89+
.collect(Collectors.groupingBy(ThermalUnitInput::getThermalBus, Collectors.toSet()));
8990
Map<ThermalBusInput, Set<ThermalStorageInput>> storageInputs =
90-
groupBy(storages.getOrThrow(), ThermalUnitInput::getThermalBus);
91+
storages.getOrThrow().stream()
92+
.collect(Collectors.groupingBy(ThermalUnitInput::getThermalBus, Collectors.toSet()));
9193

9294
return buses.values().stream()
9395
.map(

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static java.util.stream.Collectors.partitioningBy;
99

1010
import edu.ie3.datamodel.exceptions.FailureException;
11-
import edu.ie3.datamodel.exceptions.SourceException;
1211
import edu.ie3.datamodel.exceptions.TryException;
1312
import java.util.*;
1413
import java.util.function.Function;
@@ -594,7 +593,7 @@ public int hashCode() {
594593
*/
595594
@FunctionalInterface
596595
public interface TrySupplier<T, E extends Exception> {
597-
T get() throws E, SourceException;
596+
T get() throws E;
598597
}
599598

600599
/**

src/test/groovy/edu/ie3/datamodel/utils/CollectionUtilsTest.groovy

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)