Merge branch 'dev' into df/#1278-v2g-rtd

Author: sebastian-peter

CHANGELOG.md

@@ -8,9 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Implemented GitHub Actions for automatic code integration. [#1237](https://github.com/ie3-institute/PowerSystemDataModel/issues/1237)
+- Added `CopyBuilders` to `Line-/Transformer2W-/Tranformer3WTypeInput` [#1275](https://github.com/ie3-institute/PowerSystemDataModel/issues/1275)
 
 ### Fixed
-
+- Fixed SonarQube junit path issue in GitHub Actions [#1284](https://github.com/ie3-institute/PowerSystemDataModel/issues/1284)
 ### Changed
 - Replaced `return this` with `return thisInstance` in CopyBuilders [#1250](https://github.com/ie3-institute/PowerSystemDataModel/issues/1250)
 

build.gradle

@@ -9,7 +9,7 @@ plugins {
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
-  id "org.sonarqube" version "6.0.1.5171" // sonarqube
+  id "org.sonarqube" version "6.1.0.5360" // sonarqube
   id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
   id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
 }
@@ -81,7 +81,7 @@ dependencies {
   testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
   testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
   testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
-  testImplementation 'net.bytebuddy:byte-buddy:1.17.2' // Mocks of classes
+  testImplementation 'net.bytebuddy:byte-buddy:1.17.4' // Mocks of classes
 
   // testcontainers (docker framework for testing)
   testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -97,7 +97,7 @@ dependencies {
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
 
   // Databases
-  implementation 'org.influxdb:influxdb-java:2.24'
+  implementation 'org.influxdb:influxdb-java:2.25'
   implementation 'com.couchbase.client:java-client:3.7.9'
   runtimeOnly 'org.postgresql:postgresql:42.7.5' // postgresql jdbc driver required during runtime
 
@@ -115,7 +115,7 @@ tasks.withType(Javadoc){
   failOnError = false // TODO: Temp until JavaDoc issues are resolved
 }
 
-task printVersion {
+tasks.register('printVersion') {
   doLast {
     println project.version
   }

gradle/scripts/semVer.gradle

@@ -1,13 +1,13 @@
 // tasks for semantic versioning using semver-gradle https://github.com/ethauvin/semver-gradle
 
-task currentVersion {
-  doFirst{
+tasks.register('currentVersion') {
+  doFirst {
     println semver.semver
   }
 }
 
-task devVersion {
-  doFirst{
+tasks.register('devVersion') {
+  doFirst {
     println "${semver.major}.${semver.minor}-SNAPSHOT"
   }
 }

gradle/scripts/sonarqube.gradle

@@ -14,7 +14,7 @@ sonarqube {
       'src/test/groovy'] // test src dirs
     // reports stuff (for all languages)
     property 'sonar.junit.reportPaths', [
-      'build/test-results/allTests'] // Comma-delimited list of paths to Surefire XML-format reports.
+      'build/test-results/test'] // Comma-delimited list of paths to Surefire XML-format reports.
     // unit tests reports dirs
     property "sonar.coverage.jacoco.xmlReportsPath", [
       "build/reports/jacoco/test/jacocoTestReport.xml"] // Comma-separated list of paths to JaCoCo (jacoco.xml) report files.

gradle/scripts/tests.gradle

@@ -1,40 +1,40 @@
 test {
   useJUnitPlatform()
   testLogging {
-    events "skipped", "failed"
+    events = ["skipped", "failed"]
   }
 
   // Improve logging for failed Spock tests
   testLogging {
-    exceptionFormat "Full"
+    exceptionFormat = "Full"
   }
 }
 
-task unitTest(type: Test) {
-  description 'Run only unit tests.'
-  group 'Verification'
+tasks.register('unitTest', Test) {
+  description = 'Run only unit tests.'
+  group = 'Verification'
 
   filter {
     includeTestsMatching '*Test*.*'
     excludeTestsMatching '*IT'
   }
   useJUnitPlatform()
   testLogging {
-    events "skipped", "failed"
+    events = ["skipped", "failed"]
   }
 }
 
-task integrationTest(type: Test) {
-  description 'Run only the integration tests.'
-  group 'Verification'
+tasks.register('integrationTest', Test) {
+  description = 'Run only the integration tests.'
+  group = 'Verification'
 
   filter {
     includeTestsMatching '*IT.*'
     excludeTestsMatching '*Test*.*'
   }
   useJUnitPlatform()
   testLogging {
-    events "skipped", "failed"
+    events = ["skipped", "failed"]
   }
 
   mustRunAfter unitTest

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

@@ -26,6 +26,8 @@ public String getId() {
     return id;
   }
 
+  public abstract AssetTypeInputCopyBuilder<?> copy();
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;

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

@@ -82,6 +82,11 @@ public ComparableQuantity<ElectricPotential> getvRated() {
     return vRated;
   }
 
+  @Override
+  public LineTypeInputCopyBuilder copy() {
+    return new LineTypeInputCopyBuilder(this);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -121,4 +126,70 @@ public String toString() {
         + vRated
         + '}';
   }
+
+  /**
+   * Abstract class for all builder that build child entities of abstract class {@link
+   * LineTypeInput}
+   */
+  public static final class LineTypeInputCopyBuilder
+      extends AssetTypeInput.AssetTypeInputCopyBuilder<LineTypeInputCopyBuilder> {
+
+    private ComparableQuantity<SpecificConductance> b;
+    private ComparableQuantity<SpecificConductance> g;
+    private ComparableQuantity<SpecificResistance> r;
+    private ComparableQuantity<SpecificResistance> x;
+    private ComparableQuantity<ElectricCurrent> iMax;
+    private ComparableQuantity<ElectricPotential> vRated;
+
+    protected LineTypeInputCopyBuilder(LineTypeInput entity) {
+      super(entity);
+      this.b = entity.b;
+      this.g = entity.g;
+      this.r = entity.r;
+      this.x = entity.x;
+      this.iMax = entity.iMax;
+      this.vRated = entity.vRated;
+    }
+
+    /** Setter */
+    public LineTypeInputCopyBuilder b(ComparableQuantity<SpecificConductance> b) {
+      this.b = b;
+      return thisInstance();
+    }
+
+    public LineTypeInputCopyBuilder g(ComparableQuantity<SpecificConductance> g) {
+      this.g = g;
+      return thisInstance();
+    }
+
+    public LineTypeInputCopyBuilder r(ComparableQuantity<SpecificResistance> r) {
+      this.r = r;
+      return thisInstance();
+    }
+
+    public LineTypeInputCopyBuilder x(ComparableQuantity<SpecificResistance> x) {
+      this.x = x;
+      return thisInstance();
+    }
+
+    public LineTypeInputCopyBuilder iMax(ComparableQuantity<ElectricCurrent> iMax) {
+      this.iMax = iMax;
+      return thisInstance();
+    }
+
+    public LineTypeInputCopyBuilder vRated(ComparableQuantity<ElectricPotential> vRated) {
+      this.vRated = vRated;
+      return thisInstance();
+    }
+
+    @Override
+    public LineTypeInput build() {
+      return new LineTypeInput(getUuid(), getId(), b, g, r, x, iMax, vRated);
+    }
+
+    @Override
+    protected LineTypeInputCopyBuilder thisInstance() {
+      return this;
+    }
+  }
 }

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

@@ -142,6 +142,11 @@ public int getTapMax() {
     return tapMax;
   }
 
+  @Override
+  public Transformer2WTypeInputCopyBuilder copy() {
+    return new Transformer2WTypeInputCopyBuilder(this);
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -216,4 +221,123 @@ public String toString() {
         + tapMax
         + '}';
   }
+
+  /**
+   * Abstract class for all builder that build child entities of abstract class {@link
+   * Transformer2WTypeInput}
+   */
+  public static final class Transformer2WTypeInputCopyBuilder
+      extends AssetTypeInput.AssetTypeInputCopyBuilder<Transformer2WTypeInputCopyBuilder> {
+
+    private ComparableQuantity<ElectricResistance> rSc;
+    private ComparableQuantity<ElectricResistance> xSc;
+    private ComparableQuantity<Power> sRated;
+    private ComparableQuantity<ElectricPotential> vRatedA;
+    private ComparableQuantity<ElectricPotential> vRatedB;
+    private ComparableQuantity<ElectricConductance> gM;
+    private ComparableQuantity<ElectricConductance> bM;
+    private ComparableQuantity<Dimensionless> dV;
+    private ComparableQuantity<Angle> dPhi;
+    private boolean tapSide;
+    private int tapNeutr;
+    private int tapMin;
+    private int tapMax;
+
+    private Transformer2WTypeInputCopyBuilder(Transformer2WTypeInput entity) {
+      super(entity);
+      this.rSc = entity.rSc;
+      this.xSc = entity.xSc;
+      this.sRated = entity.sRated;
+      this.vRatedA = entity.vRatedA;
+      this.vRatedB = entity.vRatedB;
+      this.gM = entity.gM;
+      this.bM = entity.bM;
+      this.dV = entity.dV;
+      this.dPhi = entity.dPhi;
+      this.tapSide = entity.tapSide;
+      this.tapNeutr = entity.tapNeutr;
+      this.tapMin = entity.tapMin;
+      this.tapMax = entity.tapMax;
+    }
+
+    /** Setter */
+    public Transformer2WTypeInputCopyBuilder rSc(ComparableQuantity<ElectricResistance> rSc) {
+      this.rSc = rSc;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder xSc(ComparableQuantity<ElectricResistance> xSc) {
+      this.xSc = xSc;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder sRated(ComparableQuantity<Power> sRated) {
+      this.sRated = sRated;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder vRatedA(
+        ComparableQuantity<ElectricPotential> vRatedA) {
+      this.vRatedA = vRatedA;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder vRatedB(
+        ComparableQuantity<ElectricPotential> vRatedB) {
+      this.vRatedB = vRatedB;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder gM(ComparableQuantity<ElectricConductance> gM) {
+      this.gM = gM;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder bM(ComparableQuantity<ElectricConductance> bM) {
+      this.bM = bM;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder dV(ComparableQuantity<Dimensionless> dV) {
+      this.dV = dV;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder dPhi(ComparableQuantity<Angle> dPhi) {
+      this.dPhi = dPhi;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder tapSide(boolean tapSide) {
+      this.tapSide = tapSide;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder tapNeutr(int tapNeutr) {
+      this.tapNeutr = tapNeutr;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder tapMin(int tapMin) {
+      this.tapMin = tapMin;
+      return thisInstance();
+    }
+
+    public Transformer2WTypeInputCopyBuilder tapMax(int tapMax) {
+      this.tapMax = tapMax;
+      return thisInstance();
+    }
+
+    @Override
+    public Transformer2WTypeInput build() {
+      return new Transformer2WTypeInput(
+          getUuid(), getId(), rSc, xSc, sRated, vRatedA, vRatedB, gM, bM, dV, dPhi, tapSide,
+          tapNeutr, tapMin, tapMax);
+    }
+
+    @Override
+    protected Transformer2WTypeInputCopyBuilder thisInstance() {
+      return this;
+    }
+  }
 }