Implementing reviewer's requests.

Author: staudtMarius

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

@@ -78,6 +78,22 @@ public <Q extends Quantity<Q>> ComparableQuantity<Q> getQuantity(String field, U
     return Quantities.getQuantity(getDouble(field), unit);
   }
 
+  /**
+   * Returns field value for given field name, or empty Optional if field does not exist.
+   *
+   * @param field field name
+   * @param unit unit of Quantity
+   * @param <Q> unit type parameter
+   * @return field value
+   */
+  public <Q extends Quantity<Q>> Optional<ComparableQuantity<Q>> getQuantityOptional(
+      String field, Unit<Q> unit) {
+    return Optional.ofNullable(fieldsToAttributes.get(field))
+        .filter(str -> !str.isEmpty())
+        .map(Double::parseDouble)
+        .map(value -> Quantities.getQuantity(value, unit));
+  }
+
   /**
    * Returns int value for given field name. Throws {@link FactoryException} if field does not exist
    * or parsing fails.

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

@@ -11,12 +11,9 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.*;
-import edu.ie3.datamodel.utils.Try;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import javax.measure.quantity.Angle;
-import tech.units.indriya.ComparableQuantity;
 
 public class TimeBasedSimpleValueFactory<V extends Value>
     extends TimeBasedValueFactory<SimpleTimeBasedValueData<V>, V> {
@@ -42,6 +39,7 @@ public TimeBasedSimpleValueFactory(
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   protected TimeBasedValue<V> buildModel(SimpleTimeBasedValueData<V> data) {
     ZonedDateTime time = timeUtil.toZonedDateTime(data.getField(TIME));
     V value;
@@ -72,10 +70,11 @@ protected TimeBasedValue<V> buildModel(SimpleTimeBasedValueData<V> data) {
     } else if (PValue.class.isAssignableFrom(data.getTargetClass())) {
       value = (V) new PValue(data.getQuantity(ACTIVE_POWER, ACTIVE_POWER_IN));
     } else if (VoltageValue.class.isAssignableFrom(data.getTargetClass())) {
-      Optional<ComparableQuantity<Angle>> angleOption =
-          Try.of(() -> data.getQuantity(VANG, VOLTAGE_ANGLE), FactoryException.class).getData();
-
-      value = (V) new VoltageValue(data.getQuantity(VMAG, VOLTAGE_MAGNITUDE), angleOption);
+      value =
+          (V)
+              new VoltageValue(
+                  data.getQuantity(VMAG, VOLTAGE_MAGNITUDE),
+                  data.getQuantityOptional(VANG, VOLTAGE_ANGLE));
     } else {
       throw new FactoryException(
           "The given factory cannot handle target class '" + data.getTargetClass() + "'.");

src/test/groovy/edu/ie3/datamodel/models/value/VoltageValueTest.groovy

@@ -8,18 +8,22 @@ package edu.ie3.datamodel.models.value
 import static edu.ie3.util.quantities.PowerSystemUnits.*
 
 import edu.ie3.util.quantities.QuantityUtil
+import spock.lang.Shared
 import spock.lang.Specification
 import tech.units.indriya.quantity.Quantities
 
 class VoltageValueTest extends Specification {
 
+  @Shared
+  double tolerance = 1e-10
+
   def "A VoltageValue should return the real part correctly"() {
     when:
     def actual = value.realPart
 
     then:
     actual.isPresent()
-    QuantityUtil.isEquivalentAbs(actual.get(), expected, 1e-3)
+    QuantityUtil.isEquivalentAbs(actual.get(), expected, tolerance)
 
     where:
     value                                                                                    | expected
@@ -35,7 +39,7 @@ class VoltageValueTest extends Specification {
 
     then:
     actual.isPresent()
-    QuantityUtil.isEquivalentAbs(actual.get(), expected, 1e-3)
+    QuantityUtil.isEquivalentAbs(actual.get(), expected, tolerance)
 
     where:
     value                                                                                    | expected