More codacy fixes

ie3-institute · Dec 20, 2021 · e20309a · e20309a
1 parent 64ea5dd
commit e20309a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 38 deletions.
diff --git a/src/main/java/edu/ie3/datamodel/io/csv/timeseries/ColumnScheme.java b/src/main/java/edu/ie3/datamodel/io/csv/timeseries/ColumnScheme.java
@@ -5,7 +5,6 @@
 */
 package edu.ie3.datamodel.io.csv.timeseries;
 
-import edu.ie3.datamodel.exceptions.SourceException;
 import edu.ie3.datamodel.models.value.*;
 import edu.ie3.util.StringUtils;
 import java.util.Arrays;
@@ -14,43 +13,28 @@
 
 /** Yet supported column schemes in individual time series */
 public enum ColumnScheme {
-  ENERGY_PRICE("c"),
-  ACTIVE_POWER("p"),
-  APPARENT_POWER("pq"),
-  HEAT_DEMAND("h"),
-  ACTIVE_POWER_AND_HEAT_DEMAND("ph"),
-  APPARENT_POWER_AND_HEAT_DEMAND("pqh"),
-  WEATHER("weather");
+  ENERGY_PRICE("c", EnergyPriceValue.class),
+  ACTIVE_POWER("p", PValue.class),
+  APPARENT_POWER("pq", SValue.class),
+  HEAT_DEMAND("h", HeatDemandValue.class),
+  ACTIVE_POWER_AND_HEAT_DEMAND("ph", HeatAndPValue.class),
+  APPARENT_POWER_AND_HEAT_DEMAND("pqh", HeatAndSValue.class),
+  WEATHER("weather", WeatherValue.class);
 
   private final String scheme;
+  private final Class<? extends Value> valueClass;
 
-  ColumnScheme(String scheme) {
+  ColumnScheme(String scheme, Class<? extends Value> valueClass) {
     this.scheme = scheme;
+    this.valueClass = valueClass;
   }
 
   public String getScheme() {
     return scheme;
   }
 
-  public Class<? extends Value> getValueClass() throws SourceException {
-    switch (this) {
-      case ACTIVE_POWER:
-        return PValue.class;
-      case APPARENT_POWER:
-        return SValue.class;
-      case ENERGY_PRICE:
-        return EnergyPriceValue.class;
-      case APPARENT_POWER_AND_HEAT_DEMAND:
-        return HeatAndSValue.class;
-      case ACTIVE_POWER_AND_HEAT_DEMAND:
-        return HeatAndPValue.class;
-      case HEAT_DEMAND:
-        return HeatDemandValue.class;
-      case WEATHER:
-        return WeatherValue.class;
-      default:
-        throw new SourceException("Unknown column scheme '" + this + "'.");
-    }
+  public Class<? extends Value> getValueClass() {
+    return valueClass;
   }
 
   public static Optional<ColumnScheme> parse(String key) {

diff --git a/src/test/groovy/edu/ie3/datamodel/io/csv/timeseries/ColumnSchemeTest.groovy b/src/test/groovy/edu/ie3/datamodel/io/csv/timeseries/ColumnSchemeTest.groovy
@@ -47,19 +47,19 @@ class ColumnSchemeTest extends Specification {
 
 	def "Correct value classes are returned for all column schemes"() {
 		when:
-		def actual = columnScheme.getValueClass()
+		def actual = columnScheme.valueClass
 
 		then:
 		actual == expectedValueClass
 
 		where:
 		columnScheme || expectedValueClass
-		ColumnScheme.ENERGY_PRICE || EnergyPriceValue.class
-		ColumnScheme.ACTIVE_POWER || PValue.class
-		ColumnScheme.APPARENT_POWER || SValue.class
-		ColumnScheme.HEAT_DEMAND || HeatDemandValue.class
-		ColumnScheme.ACTIVE_POWER_AND_HEAT_DEMAND || HeatAndPValue.class
-		ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND || HeatAndSValue.class
-		ColumnScheme.WEATHER || WeatherValue.class
+		ColumnScheme.ENERGY_PRICE || EnergyPriceValue
+		ColumnScheme.ACTIVE_POWER || PValue
+		ColumnScheme.APPARENT_POWER || SValue
+		ColumnScheme.HEAT_DEMAND || HeatDemandValue
+		ColumnScheme.ACTIVE_POWER_AND_HEAT_DEMAND || HeatAndPValue
+		ColumnScheme.APPARENT_POWER_AND_HEAT_DEMAND || HeatAndSValue
+		ColumnScheme.WEATHER || WeatherValue
 	}
 }
diff --git a/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy b/src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvTimeSeriesSourceIT.groovy
@@ -5,6 +5,8 @@
  */
 package edu.ie3.datamodel.io.source.csv
 
+import static edu.ie3.test.common.TimeSeriesSourceTestData.*
+
 import edu.ie3.datamodel.exceptions.SourceException
 import edu.ie3.datamodel.io.naming.FileNamingStrategy
 import edu.ie3.datamodel.io.factory.timeseries.TimeBasedSimpleValueFactory
@@ -13,8 +15,6 @@ import edu.ie3.util.interval.ClosedInterval
 import spock.lang.Shared
 import spock.lang.Specification
 
-import static edu.ie3.test.common.TimeSeriesSourceTestData.*
-
 class CsvTimeSeriesSourceIT extends Specification implements CsvTestDataMeta {
 
 	@Shared