fix returning null in TimeBasedWeatherValueData.java

Author: pierrepetersmeier

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

@@ -73,7 +73,9 @@ public Optional<String> getFieldOptional(String field) {
    * @param unit unit of Quantity
    * @param <Q> unit type parameter
    * @return Quantity of given field with given unit
+   * @deprecated Use {@link #getQuantityOptional(String, Unit)} instead.
    */
+  @Deprecated
   public <Q extends Quantity<Q>> ComparableQuantity<Q> getQuantity(String field, Unit<Q> unit) {
     return Quantities.getQuantity(getDouble(field), unit);
   }

src/main/java/edu/ie3/datamodel/io/factory/timeseries/CosmoTimeBasedWeatherValueFactory.java

@@ -63,15 +63,18 @@ protected TimeBasedValue<WeatherValue> buildModel(TimeBasedWeatherValueData data
     Point coordinate = data.getCoordinate();
     ZonedDateTime time = timeUtil.toZonedDateTime(data.getField(TIME));
     ComparableQuantity<Irradiance> directIrradiance =
-        data.getQuantity(DIRECT_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE);
+        data.getQuantityOptional(DIRECT_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE)
+            .orElse(null);
     ComparableQuantity<Irradiance> diffuseIrradiance =
-        data.getQuantity(DIFFUSE_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE);
+        data.getQuantityOptional(DIFFUSE_IRRADIANCE, PowerSystemUnits.WATT_PER_SQUAREMETRE)
+            .orElse(null);
     ComparableQuantity<Temperature> temperature =
-        data.getQuantity(TEMPERATURE, StandardUnits.TEMPERATURE);
+        data.getQuantityOptional(TEMPERATURE, StandardUnits.TEMPERATURE).orElse(null);
     ComparableQuantity<Angle> windDirection =
-        data.getQuantity(WIND_DIRECTION, StandardUnits.WIND_DIRECTION);
+        data.getQuantityOptional(WIND_DIRECTION, StandardUnits.WIND_DIRECTION).orElse(null);
     ComparableQuantity<Speed> windVelocity =
-        data.getQuantity(WIND_VELOCITY, StandardUnits.WIND_VELOCITY);
+        data.getQuantityOptional(WIND_VELOCITY, StandardUnits.WIND_VELOCITY).orElse(null);
+
     WeatherValue weatherValue =
         new WeatherValue(
             coordinate,
@@ -80,6 +83,7 @@ protected TimeBasedValue<WeatherValue> buildModel(TimeBasedWeatherValueData data
             temperature,
             windDirection,
             windVelocity);
+
     return new TimeBasedValue<>(time, weatherValue);
   }
 }

src/main/java/edu/ie3/datamodel/io/factory/timeseries/TimeBasedWeatherValueData.java

@@ -7,6 +7,7 @@
 
 import edu.ie3.datamodel.models.value.WeatherValue;
 import java.util.Map;
+import java.util.Optional;
 import javax.measure.Quantity;
 import javax.measure.Unit;
 import org.locationtech.jts.geom.Point;
@@ -32,8 +33,9 @@ public Point getCoordinate() {
   }
 
   @Override
-  public <Q extends Quantity<Q>> ComparableQuantity<Q> getQuantity(String field, Unit<Q> unit) {
-    return getField(field).isEmpty() ? null : super.getQuantity(field, unit);
+  public <Q extends Quantity<Q>> Optional<ComparableQuantity<Q>> getQuantityOptional(
+      String field, Unit<Q> unit) {
+    return super.getQuantityOptional(field, unit);
   }
 
   @Override

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

@@ -34,12 +34,12 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     def data = new TimeBasedWeatherValueData(parameter, coordinate)
 
     def expectedResults = new TimeBasedValue(
-        time, new WeatherValue(coordinate,
-        Quantities.getQuantity(286.872985839844d, StandardUnits.SOLAR_IRRADIANCE),
-        Quantities.getQuantity(282.671997070312d, StandardUnits.SOLAR_IRRADIANCE),
-        null,
-        Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
-        Quantities.getQuantity(1.66103506088257d, StandardUnits.WIND_VELOCITY)))
+        time, new WeatherValue(  coordinate,
+        data.getQuantityOptional("directIrradiance", StandardUnits.SOLAR_IRRADIANCE).orElse(null),
+        data.getQuantityOptional("diffuseIrradiance", StandardUnits.SOLAR_IRRADIANCE).orElse(null),
+        data.getQuantityOptional("temperature", StandardUnits.TEMPERATURE).orElse(null),
+        data.getQuantityOptional("windDirection", StandardUnits.WIND_DIRECTION).orElse(null),
+        data.getQuantityOptional("windVelocity", StandardUnits.WIND_VELOCITY).orElse(null)))
 
     when:
     def model = factory.buildModel(data)
@@ -67,12 +67,16 @@ class CosmoTimeBasedWeatherValueFactoryTest extends Specification {
     def data = new TimeBasedWeatherValueData(parameter, coordinate)
 
     def expectedResults = new TimeBasedValue(
-        time, new WeatherValue(coordinate,
-        Quantities.getQuantity(286.872985839844d, StandardUnits.SOLAR_IRRADIANCE),
-        Quantities.getQuantity(282.671997070312d, StandardUnits.SOLAR_IRRADIANCE),
-        Quantities.getQuantity(278.019012451172d, StandardUnits.TEMPERATURE),
-        Quantities.getQuantity(0d, StandardUnits.WIND_DIRECTION),
-        Quantities.getQuantity(1.66103506088257d, StandardUnits.WIND_VELOCITY)))
+        time, new WeatherValue(
+        coordinate,
+        data.getQuantityOptional("directIrradiance", StandardUnits.SOLAR_IRRADIANCE).orElse(null),
+        data.getQuantityOptional("diffuseIrradiance", StandardUnits.SOLAR_IRRADIANCE).orElse(null),
+        data.getQuantityOptional("temperature", StandardUnits.TEMPERATURE).orElse(null),
+        data.getQuantityOptional("windDirection", StandardUnits.WIND_DIRECTION).orElse(null),
+        data.getQuantityOptional("windVelocity", StandardUnits.WIND_VELOCITY).orElse(null)
+        )
+        )
+
 
     when:
     def model = factory.buildModel(data)