remove more storage attributes which aren't used any longer

Author: danielfeismann

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

@@ -86,12 +86,7 @@ protected List<Set<String>> getFields(Class<?> entityClass) {
           expandSet(standardConstructorParams, ETA_EL, ETA_THERMAL, P_THERMAL, P_OWN);
     } else if (entityClass.equals(StorageTypeInput.class)) {
       constructorParameters =
-          expandSet(
-              standardConstructorParams,
-              E_STORAGE,
-              P_MAX,
-              ACTIVE_POWER_GRADIENT,
-              ETA);
+          expandSet(standardConstructorParams, E_STORAGE, P_MAX, ACTIVE_POWER_GRADIENT, ETA);
     }
 
     return Collections.singletonList(constructorParameters);
@@ -237,15 +232,6 @@ private SystemParticipantTypeInput buildStorageTypeInput(
     ComparableQuantity<Dimensionless> eta = data.getQuantity(ETA, StandardUnits.EFFICIENCY);
 
     return new StorageTypeInput(
-        uuid,
-        id,
-        capEx,
-        opEx,
-        eStorage,
-        sRated,
-        cosPhi,
-        pMax,
-        activePowerGradient,
-        eta);
+        uuid, id, capEx, opEx, eStorage, sRated, cosPhi, pMax, activePowerGradient, eta);
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/type/StorageTypeInput.java

@@ -28,7 +28,6 @@ public class StorageTypeInput extends SystemParticipantTypeInput {
   /** Efficiency of the charging and discharging process (typically in %) */
   private final ComparableQuantity<Dimensionless> eta;
 
-
   /**
    * @param uuid of the input entity
    * @param id of this type of Storage
@@ -93,8 +92,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(
-        super.hashCode(), eStorage, pMax, activePowerGradient, eta);
+    return Objects.hash(super.hashCode(), eStorage, pMax, activePowerGradient, eta);
   }
 
   @Override
@@ -145,9 +143,6 @@ private StorageTypeInputCopyBuilder(StorageTypeInput entity) {
       this.pMax = entity.getpMax();
       this.activePowerGradient = entity.getActivePowerGradient();
       this.eta = entity.getEta();
-      this.dod = entity.getDod();
-      this.lifeTime = entity.getLifeTime();
-      this.lifeCycle = entity.getLifeCycle();
     }
 
     public StorageTypeInputCopyBuilder seteStorage(ComparableQuantity<Energy> eStorage) {
@@ -235,10 +230,7 @@ public StorageTypeInput build() {
           getCosPhiRated(),
           pMax,
           activePowerGradient,
-          eta,
-          dod,
-          lifeTime,
-          lifeCycle);
+          eta);
     }
 
     @Override

src/main/java/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtils.java

@@ -499,7 +499,6 @@ private static List<Try<Void, InvalidEntityException>> checkStorageType(
       StorageTypeInput storageTypeInput) {
     List<Try<Void, InvalidEntityException>> exceptions = new ArrayList<>();
 
-
     exceptions.addAll(
         Try.ofVoid(
             InvalidEntityException.class,
@@ -511,8 +510,7 @@ private static List<Try<Void, InvalidEntityException>> checkStorageType(
             () ->
                 detectNegativeQuantities(
                     new Quantity<?>[] {
-                      storageTypeInput.getpMax(),
-                      storageTypeInput.getActivePowerGradient(),
+                      storageTypeInput.getpMax(), storageTypeInput.getActivePowerGradient(),
                     },
                     storageTypeInput),
             () ->

src/test/groovy/edu/ie3/datamodel/io/factory/typeinput/SystemParticipantTypeInputFactoryTest.groovy

@@ -283,8 +283,8 @@ class SystemParticipantTypeInputFactoryTest extends Specification implements Fac
 
     then:
     input.failure
-    input.exception.get().message == "The provided fields [capex, cosPhiRated, dod, estorage, eta, id, lifetime, opex, pmax, pmin, srated, uuid] are invalid for instance of 'StorageTypeInput'. \n" +
+    input.exception.get().message == "The provided fields [capex, cosPhiRated, estorage, eta, id, opex, pmax, pmin, srated, uuid] are invalid for instance of 'StorageTypeInput'. \n" +
         "The following fields (without complex objects e.g. nodes, operators, ...) to be passed to a constructor of 'StorageTypeInput' are possible (NOT case-sensitive!):\n" +
-        "0: [activePowerGradient, capex, cosPhiRated, eStorage, eta, id, opex, pMax, sRated, uuid] or [active_power_gradient, capex, cos_phi_rated, dod, e_storage, eta, id, life_cycle, life_time, opex, p_max, s_rated, uuid]\n"
+        "0: [activePowerGradient, capex, cosPhiRated, eStorage, eta, id, opex, pMax, sRated, uuid] or [active_power_gradient, capex, cos_phi_rated, e_storage, eta, id, opex, p_max, s_rated, uuid]\n"
   }
 }

src/test/groovy/edu/ie3/datamodel/models/input/system/type/StorageTypeInputTest.groovy

@@ -23,7 +23,6 @@ class StorageTypeInputTest extends Specification {
     def alteredUnit = storageTypeInput.copy()
         .seteStorage(Quantities.getQuantity(90, ENERGY_IN))
         .setpMax(Quantities.getQuantity(15, ACTIVE_POWER_IN))
-        .setLifeTime(Quantities.getQuantity(999999, LIFE_TIME))
         .build()
 
     then:
@@ -38,9 +37,6 @@ class StorageTypeInputTest extends Specification {
       assert pMax == Quantities.getQuantity(15, ACTIVE_POWER_IN)
       assert activePowerGradient == storageTypeInput.activePowerGradient
       assert eta == storageTypeInput.eta
-      assert dod == storageTypeInput.dod
-      assert lifeTime == Quantities.getQuantity(999999, LIFE_TIME)
-      assert lifeCycle == storageTypeInput.lifeCycle
     }
   }
 
@@ -63,9 +59,6 @@ class StorageTypeInputTest extends Specification {
       assert pMax == storageTypeInput.pMax * 2d
       assert activePowerGradient == storageTypeInput.activePowerGradient
       assert eta == storageTypeInput.eta
-      assert dod == storageTypeInput.dod
-      assert lifeTime == storageTypeInput.lifeTime
-      assert lifeCycle == storageTypeInput.lifeCycle
     }
   }
 }

src/test/groovy/edu/ie3/test/common/TypeTestData.groovy

@@ -70,9 +70,6 @@ class TypeTestData extends GridTestData {
   Quantities.getQuantity(12.961, KILOWATT),
   Quantities.getQuantity(0.03, PU_PER_HOUR),
   Quantities.getQuantity(0.92, PU),
-  Quantities.getQuantity(20d, PERCENT),
-  Quantities.getQuantity(43800.0, HOUR),
-  100000
   )
 
   public static final WecCharacteristicInput wecCharacteristicInput = new WecCharacteristicInput("cP:{(10.00,0.05),(15.00,0.10),(20.00,0.20)}")