Merge branch 'dev' into df/#1352-air-condition-input

Author: danielfeismann

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4

CHANGELOG.md

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
 - Extend `GermanVoltageLevelUtils` with more synonymousIds [#143](https://github.com/ie3-institute/PowerSystemDataModel/issues/143)
+- Change spotless to use googleJavaFormat('1.28.0') [#1409](https://github.com/ie3-institute/PowerSystemDataModel/issues/1409)
 
 ## [8.1.0] - 2025-07-25
 

build.gradle

@@ -16,7 +16,7 @@ plugins {
 
 ext {
   //version (changing these should be considered thoroughly!)
-  javaVersion = JavaVersion.VERSION_17
+  javaVersion = JavaVersion.VERSION_21
   groovyVersion = "4.0"
   groovyBinaryVersion = "4.0.28"
 

docs/readthedocs/gettingstarted.md

@@ -5,7 +5,7 @@ If you feel, something is missing, please contact us!
 
 ## Requirements
 
-Java > v 17
+PowerSystemDataModel requires Java to be at least Version 21.
 
 ## Where to get
 

gradle/scripts/spotless.gradle

@@ -10,7 +10,7 @@ spotless {
   //sets a license header, removes unused imports and formats conforming to the google java format
   java {
     removeUnusedImports() // removes any unused imports
-    googleJavaFormat('1.13.0')
+    googleJavaFormat('1.28.0')
     licenseHeader ie3LicHead
   }
 

src/main/java/edu/ie3/datamodel/exceptions/FailedValidationException.java

@@ -21,7 +21,9 @@ public FailedValidationException(String message) {
     super(message);
   }
 
-  /** @param exceptions List of exceptions, which must not be empty */
+  /**
+   * @param exceptions List of exceptions, which must not be empty
+   */
   public FailedValidationException(List<? extends Exception> exceptions) {
     super("Validation failed due to:\n " + ExceptionUtils.combineExceptions(exceptions));
   }

src/main/java/edu/ie3/datamodel/graph/SubGridGate.java

@@ -43,13 +43,14 @@ public static SubGridGate fromTransformer3W(
     return switch (inferiorPort) {
       case B -> new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeB());
       case C -> new SubGridGate(transformer, transformer.getNodeA(), transformer.getNodeC());
-      default -> throw new IllegalArgumentException(
-          "Only port "
-              + ConnectorPort.B
-              + " or "
-              + ConnectorPort.C
-              + " can be "
-              + "chosen as inferior port.");
+      default ->
+          throw new IllegalArgumentException(
+              "Only port "
+                  + ConnectorPort.B
+                  + " or "
+                  + ConnectorPort.C
+                  + " can be "
+                  + "chosen as inferior port.");
     };
   }
 

src/main/java/edu/ie3/datamodel/io/DbGridMetadata.java

@@ -21,7 +21,9 @@ public String toString() {
     return GRID_NAME_COLUMN + "=" + gridName + ", " + GRID_UUID_COLUMN + "=" + uuid.toString();
   }
 
-  /** @return Stream with grid uuid */
+  /**
+   * @return Stream with grid uuid
+   */
   public Stream<String> getStreamForQuery() {
     return Stream.of(quote(uuid.toString(), "'"));
   }

src/main/java/edu/ie3/datamodel/io/SqlUtils.java

@@ -23,7 +23,9 @@ private static String beginQueryCreateTable(String schemaName, String tableName)
     return "CREATE TABLE " + schemaName + "." + tableName + "\n(\n";
   }
 
-  /** @return query to create a SQL table for a grid */
+  /**
+   * @return query to create a SQL table for a grid
+   */
   public static String queryCreateGridTable(String schemaName) {
     return beginQueryCreateTable(schemaName, DbGridMetadata.GRID_TABLE_COLUMN)
         + "\tuuid uuid PRIMARY KEY,\n\tname TEXT NOT NULL\n"

src/main/java/edu/ie3/datamodel/io/connectors/CouchbaseConnector.java

@@ -137,7 +137,9 @@ public void shutdown() {
     cluster.disconnect();
   }
 
-  /** @return the bucket name */
+  /**
+   * @return the bucket name
+   */
   public String getBucketName() {
     return bucketName;
   }