Merge branch 'dev' into sh/#872-storage-documentation

Author: SimonHuette

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Changing from comparing strings to comparing uuids in `EntitySource.findFirstEntityByUuid` [#829](https://github.com/ie3-institute/PowerSystemDataModel/issues/829)
-
+- Adding JavaDoc to `EntitySource.safeMapGet` [#828](https://github.com/ie3-institute/PowerSystemDataModel/issues/828)
 
 ## [4.1.0] - 2023-11-02
 

Jenkinsfile

@@ -451,7 +451,6 @@ def constantBranchesProps() {
     [
       string(defaultValue: '', description: '', name: 'deploy', trim: true)
     ]),
-    [$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false],
     [$class: 'ThrottleJobProperty', categories: [], limitOneJobWithMatchingParams: false, maxConcurrentPerNode: 0, maxConcurrentTotal: 0, paramsToUseForLimit: '', throttleEnabled: true, throttleOption: 'project']
   ])
 }

build.gradle

@@ -4,7 +4,7 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '6.22.0' //code format
+  id 'com.diffplug.spotless' version '6.23.0' //code format
   id 'com.github.spotbugs' version '5.2.4' // code check, working on byte code
   id 'de.undercouch.download' version '5.5.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation

src/main/java/edu/ie3/datamodel/io/source/EntitySource.java

@@ -51,6 +51,17 @@ protected String buildSkippingMessage(
         + missingElementsString;
   }
 
+  /**
+   * Method for retrieving an element from a map. If the map doesn't contain the key an error
+   * message is build and returned instead.
+   *
+   * <p>Should not be used for other purposes than creating error messages.
+   *
+   * @param map with value
+   * @param key for the value
+   * @param mapName name of the map used for the error message
+   * @return either the value or an error message
+   */
   protected String safeMapGet(Map<String, String> map, String key, String mapName) {
     return Optional.ofNullable(map.get(key))
         .orElse(
@@ -83,7 +94,7 @@ protected <T extends UniqueEntity> Optional<T> findFirstEntityByUuid(
    * the provided fields to values mapping. The provided fields to values mapping needs to have one
    * and only one field with key {@link #TYPE} and a corresponding UUID value. If the type can be
    * found in the provided collection based on the UUID it is returned wrapped in a {@link Success}.
-   * Otherwise a {@link Failure} is returned and a warning is logged.
+   * Otherwise, a {@link Failure} is returned and a warning is logged.
    *
    * @param types a collection of types that should be used for searching
    * @param fieldsToAttributes the field name to value mapping incl. the key {@link #TYPE}