Merge pull request #1269 from ie3-institute/mh/#1250-CopyBuilders-return-thisInstance

Copy builders return this instance

Author: staudtMarius

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+### Added
+
+### Fixed
+
+### Changed
+- Replaced `return this` with `return thisInstance` in CopyBuilders [#1250](https://github.com/ie3-institute/PowerSystemDataModel/issues/1250)
+
 ## [6.0.0] - 2025-02-27
 
 ### Added

src/main/java/edu/ie3/datamodel/models/input/EmInput.java

@@ -119,7 +119,7 @@ protected EmInputCopyBuilder(EmInput entity) {
 
     public EmInputCopyBuilder controlStrategy(String controlStrategy) {
       this.controlStrategy = controlStrategy;
-      return this;
+      return thisInstance();
     }
 
     public EmInputCopyBuilder parentEm(EmInput parentEm) {

src/main/java/edu/ie3/datamodel/models/input/MeasurementUnitInput.java

@@ -183,27 +183,27 @@ public MeasurementUnitInput build() {
 
     public MeasurementUnitInputCopyBuilder node(NodeInput node) {
       this.node = node;
-      return this;
+      return thisInstance();
     }
 
     public MeasurementUnitInputCopyBuilder vMag(boolean vMag) {
       this.vMag = vMag;
-      return this;
+      return thisInstance();
     }
 
     public MeasurementUnitInputCopyBuilder vAng(boolean vAng) {
       this.vAng = vAng;
-      return this;
+      return thisInstance();
     }
 
     public MeasurementUnitInputCopyBuilder p(boolean p) {
       this.p = p;
-      return this;
+      return thisInstance();
     }
 
     public MeasurementUnitInputCopyBuilder q(boolean q) {
       this.q = q;
-      return this;
+      return thisInstance();
     }
 
     @Override

src/main/java/edu/ie3/datamodel/models/input/NodeInput.java

@@ -203,27 +203,27 @@ public NodeInput build() {
 
     public NodeInputCopyBuilder vTarget(ComparableQuantity<Dimensionless> vTarget) {
       this.vTarget = vTarget;
-      return this;
+      return thisInstance();
     }
 
     public NodeInputCopyBuilder slack(boolean isSlack) {
       this.slack = isSlack;
-      return this;
+      return thisInstance();
     }
 
     public NodeInputCopyBuilder geoPosition(Point geoPosition) {
       this.geoPosition = geoPosition;
-      return this;
+      return thisInstance();
     }
 
     public NodeInputCopyBuilder voltLvl(VoltageLevel voltLvl) {
       this.voltLvl = voltLvl;
-      return this;
+      return thisInstance();
     }
 
     public NodeInputCopyBuilder subnet(int subnet) {
       this.subnet = subnet;
-      return this;
+      return thisInstance();
     }
 
     @Override

src/main/java/edu/ie3/datamodel/models/input/OperatorInput.java

@@ -79,7 +79,7 @@ public OperatorInput build() {
 
     public OperatorInputCopyBuilder id(String id) {
       this.id = id;
-      return this;
+      return thisInstance();
     }
 
     @Override

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

@@ -205,22 +205,22 @@ public LineInput build() {
 
     public LineInputCopyBuilder geoPosition(LineString geoPosition) {
       this.geoPosition = geoPosition;
-      return this;
+      return thisInstance();
     }
 
     public LineInputCopyBuilder type(LineTypeInput type) {
       this.type = type;
-      return this;
+      return thisInstance();
     }
 
     public LineInputCopyBuilder length(ComparableQuantity<Length> length) {
       this.length = length;
-      return this;
+      return thisInstance();
     }
 
     public LineInputCopyBuilder olmCharacteristic(OlmCharacteristicInput olmCharacteristic) {
       this.olmCharacteristic = olmCharacteristic;
-      return this;
+      return thisInstance();
     }
 
     @Override

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

@@ -123,7 +123,7 @@ public SwitchInput build() {
 
     public SwitchInputCopyBuilder closed(boolean closed) {
       this.closed = closed;
-      return this;
+      return thisInstance();
     }
 
     @Override

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

@@ -161,7 +161,7 @@ public Transformer2WInput build() {
 
     public Transformer2WInputCopyBuilder type(Transformer2WTypeInput type) {
       this.type = type;
-      return this;
+      return thisInstance();
     }
 
     @Override

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

@@ -328,17 +328,17 @@ public Transformer3WInput build() {
 
     public Transformer3WInputCopyBuilder type(Transformer3WTypeInput type) {
       this.type = type;
-      return this;
+      return thisInstance();
     }
 
     public Transformer3WInputCopyBuilder nodeC(NodeInput nodeC) {
       this.nodeC = nodeC;
-      return this;
+      return thisInstance();
     }
 
     public Transformer3WInputCopyBuilder internalSlack(boolean internalNodeIsSlack) {
       this.internSlack = internalNodeIsSlack;
-      return this;
+      return thisInstance();
     }
 
     @Override

src/main/java/edu/ie3/datamodel/models/input/container/GraphicElements.java

@@ -102,8 +102,7 @@ public int hashCode() {
    * @version 3.1
    * @since 14.02.23
    */
-  public static class GraphicElementsCopyBuilder
-      implements InputContainerCopyBuilder<GraphicInput> {
+  public static class GraphicElementsCopyBuilder extends InputContainerCopyBuilder<GraphicInput> {
     private Set<NodeGraphicInput> nodeGraphics;
     private Set<LineGraphicInput> lineGraphics;
 
@@ -125,7 +124,7 @@ protected GraphicElementsCopyBuilder(GraphicElements graphicElements) {
      */
     public GraphicElementsCopyBuilder nodeGraphics(Set<NodeGraphicInput> nodeGraphics) {
       this.nodeGraphics = nodeGraphics;
-      return this;
+      return thisInstance();
     }
 
     /**
@@ -136,12 +135,17 @@ public GraphicElementsCopyBuilder nodeGraphics(Set<NodeGraphicInput> nodeGraphic
      */
     public GraphicElementsCopyBuilder lineGraphics(Set<LineGraphicInput> lineGraphics) {
       this.lineGraphics = lineGraphics;
-      return this;
+      return thisInstance();
     }
 
     @Override
     public GraphicElements build() {
       return new GraphicElements(nodeGraphics, lineGraphics);
     }
+
+    @Override
+    protected GraphicElementsCopyBuilder thisInstance() {
+      return this;
+    }
   }
 }