Merge pull request #187 from ie3-institute/ds/#178-import-deprecated-classes

Imports all the deprecated util classes to restore master

Author: ckittl

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

@@ -5,7 +5,7 @@
 */
 package edu.ie3.datamodel.io.factory;
 
-import static edu.ie3.util.quantities.PowerSystemUnits.KILOVOLT;
+import static edu.ie3.util.quantities.dep.PowerSystemUnits.KILOVOLT;
 
 import edu.ie3.datamodel.exceptions.FactoryException;
 import edu.ie3.datamodel.exceptions.VoltageLevelException;

src/main/java/edu/ie3/datamodel/io/factory/input/CylindricalStorageInputFactory.java

@@ -10,7 +10,7 @@
 import edu.ie3.datamodel.models.input.OperatorInput;
 import edu.ie3.datamodel.models.input.thermal.CylindricalStorageInput;
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
-import edu.ie3.util.quantities.interfaces.SpecificHeatCapacity;
+import edu.ie3.util.quantities.dep.interfaces.SpecificHeatCapacity;
 import java.util.UUID;
 import javax.measure.quantity.Temperature;
 import javax.measure.quantity.Volume;

src/main/java/edu/ie3/datamodel/io/factory/input/ThermalHouseInputFactory.java

@@ -10,8 +10,8 @@
 import edu.ie3.datamodel.models.input.OperatorInput;
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput;
 import edu.ie3.datamodel.models.input.thermal.ThermalHouseInput;
-import edu.ie3.util.quantities.interfaces.HeatCapacity;
-import edu.ie3.util.quantities.interfaces.ThermalConductance;
+import edu.ie3.util.quantities.dep.interfaces.HeatCapacity;
+import edu.ie3.util.quantities.dep.interfaces.ThermalConductance;
 import java.util.UUID;
 import tec.uom.se.ComparableQuantity;
 

src/main/java/edu/ie3/datamodel/io/factory/input/participant/BmInputFactory.java

@@ -12,7 +12,7 @@
 import edu.ie3.datamodel.models.input.system.BmInput;
 import edu.ie3.datamodel.models.input.system.characteristic.ReactivePowerCharacteristic;
 import edu.ie3.datamodel.models.input.system.type.BmTypeInput;
-import edu.ie3.util.quantities.interfaces.EnergyPrice;
+import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
 import java.util.UUID;
 import tec.uom.se.ComparableQuantity;
 

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

@@ -10,7 +10,7 @@
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue;
 import edu.ie3.datamodel.models.value.WeatherValue;
 import edu.ie3.util.TimeUtil;
-import edu.ie3.util.quantities.interfaces.Irradiation;
+import edu.ie3.util.quantities.dep.interfaces.Irradiation;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Collections;

src/main/java/edu/ie3/datamodel/io/factory/typeinput/LineTypeInputFactory.java

@@ -8,8 +8,8 @@
 import edu.ie3.datamodel.io.factory.SimpleEntityData;
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.input.connector.type.LineTypeInput;
-import edu.ie3.util.quantities.interfaces.SpecificConductance;
-import edu.ie3.util.quantities.interfaces.SpecificResistance;
+import edu.ie3.util.quantities.dep.interfaces.SpecificConductance;
+import edu.ie3.util.quantities.dep.interfaces.SpecificResistance;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;

src/main/java/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactory.java

@@ -11,10 +11,10 @@
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.input.system.characteristic.WecCharacteristicInput;
 import edu.ie3.datamodel.models.input.system.type.*;
-import edu.ie3.util.quantities.interfaces.Currency;
-import edu.ie3.util.quantities.interfaces.DimensionlessRate;
-import edu.ie3.util.quantities.interfaces.EnergyPrice;
-import edu.ie3.util.quantities.interfaces.SpecificEnergy;
+import edu.ie3.util.quantities.dep.interfaces.Currency;
+import edu.ie3.util.quantities.dep.interfaces.DimensionlessRate;
+import edu.ie3.util.quantities.dep.interfaces.EnergyPrice;
+import edu.ie3.util.quantities.dep.interfaces.SpecificEnergy;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;

src/main/java/edu/ie3/datamodel/models/StandardUnits.java

@@ -5,9 +5,9 @@
 */
 package edu.ie3.datamodel.models;
 
-import static edu.ie3.util.quantities.PowerSystemUnits.*;
+import static edu.ie3.util.quantities.dep.PowerSystemUnits.*;
 
-import edu.ie3.util.quantities.interfaces.*;
+import edu.ie3.util.quantities.dep.interfaces.*;
 import javax.measure.Unit;
 import javax.measure.quantity.*;
 import tec.uom.se.unit.MetricPrefix;

src/main/java/edu/ie3/datamodel/models/input/connector/Transformer3WInput.java

@@ -5,7 +5,7 @@
 */
 package edu.ie3.datamodel.models.input.connector;
 
-import static edu.ie3.util.quantities.PowerSystemUnits.PU;
+import static edu.ie3.util.quantities.dep.PowerSystemUnits.PU;
 
 import edu.ie3.datamodel.io.extractor.HasType;
 import edu.ie3.datamodel.models.OperationTime;

src/main/java/edu/ie3/datamodel/models/input/connector/type/LineTypeInput.java

@@ -7,8 +7,8 @@
 
 import edu.ie3.datamodel.models.StandardUnits;
 import edu.ie3.datamodel.models.input.AssetTypeInput;
-import edu.ie3.util.quantities.interfaces.SpecificConductance;
-import edu.ie3.util.quantities.interfaces.SpecificResistance;
+import edu.ie3.util.quantities.dep.interfaces.SpecificConductance;
+import edu.ie3.util.quantities.dep.interfaces.SpecificResistance;
 import java.util.Objects;
 import java.util.UUID;
 import javax.measure.quantity.ElectricCurrent;