Merge branch 'dev' into df/#809_cleanup

Author: danielfeismann

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
+- `SqlIdCoordinateSource.createCooridinateValue` now throws an exception when the coordinate can not be built [#911](https://github.com/ie3-institute/PowerSystemDataModel/issues/911)
+
 ## [4.0.0] - 2023-08-01
 
 ### Added

build.gradle

@@ -4,12 +4,12 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '6.21.0'//code format
-  id 'com.github.spotbugs' version '5.1.3' // code check, working on byte code
+  id 'com.diffplug.spotless' version '6.22.0'//code format
+  id 'com.github.spotbugs' version '5.2.0' // code check, working on byte code
   id 'de.undercouch.download' version '5.5.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
-  id "org.sonarqube" version "4.4.0.3356" // sonarqube
+  id "org.sonarqube" version "4.4.1.3373" // sonarqube
   id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
 }
 
@@ -87,7 +87,7 @@ dependencies {
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.23'
-  implementation 'com.couchbase.client:java-client:3.4.10'
+  implementation 'com.couchbase.client:java-client:3.4.11'
   runtimeOnly 'org.postgresql:postgresql:42.6.0' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.14.0' // I/O functionalities

src/main/java/edu/ie3/datamodel/io/source/sql/SqlIdCoordinateSource.java

@@ -173,27 +173,18 @@ public List<CoordinateDistance> getClosestCoordinates(
 
   // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  private Optional<CoordinateValue> createCoordinateValue(Map<String, String> fieldToValues) {
+  private CoordinateValue createCoordinateValue(Map<String, String> fieldToValues) {
     fieldToValues.remove("distance");
 
     SimpleFactoryData simpleFactoryData = new SimpleFactoryData(fieldToValues, Pair.class);
-    Optional<Pair<Integer, Point>> pair = factory.get(simpleFactoryData).getData();
 
-    if (pair.isEmpty()) {
-      return Optional.empty();
-    } else {
-      Pair<Integer, Point> data = pair.get();
-      return Optional.of(new CoordinateValue(data.getKey(), data.getValue()));
-    }
+    Pair<Integer, Point> pair = factory.get(simpleFactoryData).getOrThrow();
+    return new CoordinateValue(pair.getKey(), pair.getValue());
   }
 
   private List<CoordinateValue> executeQueryToList(
       String query, SqlDataSource.AddParams addParams) {
-    return dataSource
-        .executeQuery(query, addParams)
-        .map(this::createCoordinateValue)
-        .flatMap(Optional::stream)
-        .toList();
+    return dataSource.executeQuery(query, addParams).map(this::createCoordinateValue).toList();
   }
 
   /**