Merge remote-tracking branch 'origin/dev' into ck/#267-adaptColumnSch…

…emeOfCOSMOWeatherData

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CharacteristicInput.java

@@ -23,7 +23,7 @@ public abstract class CharacteristicInput<A extends Quantity<A>, O extends Quant
   protected final String characteristicPrefix;
   protected final int decimalPlaces;
 
-  protected final SortedSet<CharacteristicPoint<A, O>> points;
+  private final SortedSet<CharacteristicPoint<A, O>> points;
 
   /**
    * Constructor for the abstract class
@@ -32,14 +32,14 @@ public abstract class CharacteristicInput<A extends Quantity<A>, O extends Quant
    * @param characteristicPrefix Prefix, that prepends the actual characteristic
    * @param decimalPlaces Desired amount of decimal places when de-serializing the characteristic
    */
-  public CharacteristicInput(
+  protected CharacteristicInput(
       SortedSet<CharacteristicPoint<A, O>> points, String characteristicPrefix, int decimalPlaces) {
     this.points = Collections.unmodifiableSortedSet(points);
     this.characteristicPrefix = characteristicPrefix;
     this.decimalPlaces = decimalPlaces;
   }
 
-  public CharacteristicInput(
+  protected CharacteristicInput(
       String input,
       Unit<A> abscissaUnit,
       Unit<O> ordinateUnit,

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CosPhiFixed.java

@@ -52,6 +52,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "cosPhiFixed{" + "points=" + points + '}';
+    return "cosPhiFixed{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/CosPhiP.java

@@ -39,6 +39,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "CosPhiP{" + "points=" + points + '}';
+    return "CosPhiP{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/EvCharacteristicInput.java

@@ -41,6 +41,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "EvCharacteristicInput{" + "points=" + points + '}';
+    return "EvCharacteristicInput{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/OlmCharacteristicInput.java

@@ -51,6 +51,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "OlmCharacteristicInput{" + "points=" + points + '}';
+    return "OlmCharacteristicInput{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/QV.java

@@ -38,6 +38,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "QV{" + "points=" + points + '}';
+    return "QV{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/input/system/characteristic/WecCharacteristicInput.java

@@ -34,6 +34,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "WecCharacteristicInput{" + "points=" + points + '}';
+    return "WecCharacteristicInput{" + "points=" + getPoints() + '}';
   }
 }

src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeries.java

@@ -19,14 +19,14 @@
  */
 public abstract class TimeSeries<E extends TimeSeriesEntry<V>, V extends Value>
     extends UniqueEntity {
-  protected final Set<E> entries;
+  private final Set<E> entries;
 
-  public TimeSeries(Set<E> entries) {
+  protected TimeSeries(Set<E> entries) {
     super();
     this.entries = Collections.unmodifiableSet(entries);
   }
 
-  public TimeSeries(UUID uuid, Set<E> entries) {
+  protected TimeSeries(UUID uuid, Set<E> entries) {
     super(uuid);
     this.entries = Collections.unmodifiableSet(entries);
   }

src/main/java/edu/ie3/datamodel/models/timeseries/repetitive/LoadProfileInput.java

@@ -23,7 +23,7 @@ public LoadProfileInput(UUID uuid, StandardLoadProfile type, Set<LoadProfileEntr
     super(uuid, values);
     this.type = type;
     this.dayOfWeekToHourlyValues =
-        entries.stream()
+        getEntries().stream()
             .collect(
                 Collectors.groupingBy(
                     LoadProfileEntry::getDayOfWeek,
@@ -54,11 +54,6 @@ public StandardLoadProfile getType() {
     return type;
   }
 
-  @Override
-  public Set<LoadProfileEntry> getEntries() {
-    return entries;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;

src/main/java/edu/ie3/datamodel/models/voltagelevels/CommonVoltageLevel.java

@@ -16,7 +16,7 @@
 
 /** Class with extended information to describe common voltage levels in energy systems. */
 public class CommonVoltageLevel extends VoltageLevel {
-  protected final Set<String> synonymousIds;
+  private final Set<String> synonymousIds;
   protected final RightOpenInterval<ComparableQuantity<ElectricPotential>> voltageRange;
 
   /**