Skip to content

Commit ae9da09

Browse files
pierrepetersmeierpierrepetersmeier
committed
FlatMap instead of Map. Optional in Tests.
1 parent 42e8599 commit ae9da09

File tree

7 files changed

+38
-37
lines changed

7 files changed

+38
-37
lines changed

‎src/main/java/edu/ie3/datamodel/models/value/WeatherValue.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ public WeatherValue(
8484
new SolarIrradianceValue(directSolarIrradiance, diffuseSolarIrradiance),
8585
new TemperatureValue(temperature),
8686
new WindValue(direction, velocity),
87-
groundTempValOne.map(GroundTemperatureValue::new),
88-
groundTempValTwo.map(GroundTemperatureValue::new));
87+
Optional.ofNullable(groundTempValOne)
88+
.flatMap(optional -> optional.map(GroundTemperatureValue::new)),
89+
Optional.ofNullable(groundTempValTwo)
90+
.flatMap(optional -> optional.map(GroundTemperatureValue::new)));
8991
}
9092

9193
public Point getCoordinate() {

‎src/test/groovy/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactoryTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
7979
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
8080
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
8181
Quantities.getQuantity(1.66103506088257d, StandardUnits.WIND_VELOCITY),
82-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
83-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)))
82+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
83+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))))
8484

8585
when:
8686
def model = factory.buildModel(data)

‎src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvWeatherSourceCosmoTest.groovy‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,12 @@ class CsvWeatherSourceCosmoTest extends Specification implements CsvTestDataMeta
144144
new WindValue(
145145
Quantities.getQuantity(12.1314, WIND_DIRECTION),
146146
Quantities.getQuantity(15.1617, WIND_VELOCITY)),
147-
new GroundTemperatureValue(
147+
Optional.of(new GroundTemperatureValue(
148148
Quantities.getQuantity(8.0, TEMPERATURE)
149-
),
150-
new GroundTemperatureValue(
149+
)),
150+
Optional.of(new GroundTemperatureValue(
151151
Quantities.getQuantity(9.5, TEMPERATURE)
152-
)
153-
)
152+
)))
154153
)
155154

156155
when:

‎src/test/groovy/edu/ie3/datamodel/utils/validation/UniquenessValidationUtilsTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ class UniquenessValidationUtilsTest extends Specification {
212212
new SolarIrradianceValue(Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE), Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE)),
213213
new TemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)),
214214
new WindValue(Quantities.getQuantity(5d, DEGREE_GEOM), Quantities.getQuantity(10d, METRE_PER_SECOND)),
215-
new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)),
216-
new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS))
215+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS))),
216+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)))
217217
)
218218

219219
Set<TimeBasedValue<WeatherValue>> uniqueValues = [
@@ -236,8 +236,8 @@ class UniquenessValidationUtilsTest extends Specification {
236236
new SolarIrradianceValue(Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE), Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE)),
237237
new TemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)),
238238
new WindValue(Quantities.getQuantity(5d, DEGREE_GEOM), Quantities.getQuantity(10d, METRE_PER_SECOND)),
239-
new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)),
240-
new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS))
239+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS))),
240+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(5d, Units.CELSIUS)))
241241
)
242242
Set<TimeBasedValue<WeatherValue>> notUniqueValues = [
243243
new TimeBasedValue<WeatherValue>(time, value),

‎src/test/groovy/edu/ie3/test/common/CosmoWeatherTestData.groovy‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class CosmoWeatherTestData extends WeatherTestData {
2525
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
2626
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
2727
Quantities.getQuantity(1.66103506088257d, StandardUnits.WIND_VELOCITY),
28-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
29-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
28+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
29+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
3030
)
3131

3232
public static final WeatherValue WEATHER_VALUE_193186_16H = new WeatherValue(
@@ -36,8 +36,8 @@ class CosmoWeatherTestData extends WeatherTestData {
3636
Quantities.getQuantity(278.012d, StandardUnits.TEMPERATURE),
3737
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
3838
Quantities.getQuantity(1.662d, StandardUnits.WIND_VELOCITY),
39-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
40-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
39+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
40+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
4141
)
4242

4343
public static final WeatherValue WEATHER_VALUE_193186_17H = new WeatherValue(
@@ -47,8 +47,8 @@ class CosmoWeatherTestData extends WeatherTestData {
4747
Quantities.getQuantity(278.013d, StandardUnits.TEMPERATURE),
4848
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
4949
Quantities.getQuantity(1.663d, StandardUnits.WIND_VELOCITY),
50-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
51-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
50+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
51+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
5252
)
5353

5454
public static final WeatherValue WEATHER_VALUE_193187_15H = new WeatherValue(
@@ -58,8 +58,8 @@ class CosmoWeatherTestData extends WeatherTestData {
5858
Quantities.getQuantity(279.019012451172d, StandardUnits.TEMPERATURE),
5959
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
6060
Quantities.getQuantity(1.76103506088257d, StandardUnits.WIND_VELOCITY),
61-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
62-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
61+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
62+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
6363
)
6464

6565
public static final WeatherValue WEATHER_VALUE_193187_16H = new WeatherValue(
@@ -69,8 +69,8 @@ class CosmoWeatherTestData extends WeatherTestData {
6969
Quantities.getQuantity(279.012d, StandardUnits.TEMPERATURE),
7070
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
7171
Quantities.getQuantity(1.762d, StandardUnits.WIND_VELOCITY),
72-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
73-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
72+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
73+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
7474
)
7575

7676
public static final WeatherValue WEATHER_VALUE_193188_15H = new WeatherValue(
@@ -80,7 +80,7 @@ class CosmoWeatherTestData extends WeatherTestData {
8080
Quantities.getQuantity(280.019012451172d, StandardUnits.TEMPERATURE),
8181
Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
8282
Quantities.getQuantity(1.86103506088257d, StandardUnits.WIND_VELOCITY),
83-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
84-
Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)
83+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE)),
84+
Optional.of(Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE))
8585
)
8686
}

‎src/test/groovy/edu/ie3/test/common/IconWeatherTestData.groovy‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class IconWeatherTestData extends WeatherTestData {
2525
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
2626
Quantities.getQuantity(270.45278309919627, StandardUnits.WIND_DIRECTION),
2727
Quantities.getQuantity(3.76601470961371, StandardUnits.WIND_VELOCITY),
28-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
29-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)
28+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)),
29+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE))
3030
)
3131

3232
public static final WeatherValue WEATHER_VALUE_67775_16H = new WeatherValue(
@@ -36,8 +36,8 @@ class IconWeatherTestData extends WeatherTestData {
3636
Quantities.getQuantity(24.1700023473353, StandardUnits.TEMPERATURE),
3737
Quantities.getQuantity(278.144331776102, StandardUnits.WIND_DIRECTION),
3838
Quantities.getQuantity(4.05744164637287, StandardUnits.WIND_VELOCITY),
39-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
40-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)
39+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)),
40+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE))
4141
)
4242

4343
public static final WeatherValue WEATHER_VALUE_67775_17H = new WeatherValue(
@@ -47,8 +47,8 @@ class IconWeatherTestData extends WeatherTestData {
4747
Quantities.getQuantity(23.6787403584074, StandardUnits.TEMPERATURE),
4848
Quantities.getQuantity(286.891007103442, StandardUnits.WIND_DIRECTION),
4949
Quantities.getQuantity(3.81526300455393, StandardUnits.WIND_VELOCITY),
50-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
51-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)
50+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)),
51+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE))
5252
)
5353

5454
public static final WeatherValue WEATHER_VALUE_67776_15H = new WeatherValue(
@@ -58,8 +58,8 @@ class IconWeatherTestData extends WeatherTestData {
5858
Quantities.getQuantity(22.365335568404, StandardUnits.TEMPERATURE),
5959
Quantities.getQuantity(245.604554131632, StandardUnits.WIND_DIRECTION),
6060
Quantities.getQuantity(4.39390441381814, StandardUnits.WIND_VELOCITY),
61-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
62-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)
61+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)),
62+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE))
6363
)
6464

6565
public static final WeatherValue WEATHER_VALUE_67776_16H = new WeatherValue(
@@ -69,7 +69,7 @@ class IconWeatherTestData extends WeatherTestData {
6969
Quantities.getQuantity(20.305111314491, StandardUnits.TEMPERATURE),
7070
Quantities.getQuantity(252.810224701109, StandardUnits.WIND_DIRECTION),
7171
Quantities.getQuantity(3.44242472583919, StandardUnits.WIND_VELOCITY),
72-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE),
73-
Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)
72+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE)),
73+
Optional.of(Quantities.getQuantity(24.4741992659816, StandardUnits.TEMPERATURE))
7474
)
7575
}

‎src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ trait TimeSeriesTestData {
207207
new SolarIrradianceValue(Quantities.getQuantity(10d, StandardUnits.SOLAR_IRRADIANCE), Quantities.getQuantity(15d, StandardUnits.SOLAR_IRRADIANCE)),
208208
new TemperatureValue(Quantities.getQuantity(10d, CELSIUS)),
209209
new WindValue(Quantities.getQuantity(10d, DEGREE_GEOM), Quantities.getQuantity(15d, METRE_PER_SECOND)),
210-
new GroundTemperatureValue(Quantities.getQuantity(10d, CELSIUS)),
211-
new GroundTemperatureValue(Quantities.getQuantity(10d, CELSIUS))
210+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(10d, CELSIUS))),
211+
Optional.of(new GroundTemperatureValue(Quantities.getQuantity(10d, CELSIUS)))
212212
)
213213
),
214214
] as Set

0 commit comments

Comments
 (0)