Merge remote-tracking branch 'origin/dev' into jb/#762-sql-grid-datas…

…ources

# Conflicts:
#	src/test/groovy/edu/ie3/test/common/TimeSeriesTestData.groovy

.gitignore

@@ -242,4 +242,9 @@ docs/readthedocs/_build
 **/*.synctex.gz
 **/*.synctex(busy)
 
-docs/javadoc
+### Metals ###
+.metals/
+.bloop/
+project/**/metals.sbt
+
+docs/javadoc

AUTHORS

@@ -1,10 +1,14 @@
-Copyright (c) 2023, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
+Copyright (c) 2024, Institute of Energy Systems, Energy Efficiency and Energy Economics (ie3)
 All rights reserved.
 
 Lead Developers:
     - Johannes Hiry
     - Chris Kittl
     - Debopama Sen-Sarma
+    - Thomas Oberließen
+    - Daniel Feismann
+    - Johannes Bao
+    - Sebastian Peter
 
 Main Contributers:
     - Johannes Hiry - https://github.com/johanneshiry
@@ -20,3 +24,8 @@ Main Contributers:
     - Marius Staudt - https://github.com/staudtMarius
     - Lara Roumeliotis - https://github.com/lararou
     - Vicky Bung - https://github.com/vickybung1
+    - Daniel Feismann - https://github.com/danielfeismann
+    - Johannes Bao - https://github.com/jo-bao
+    - Julian Hohmann - https://github.com/julianhohmann
+    - Simon Huette - https://github.com/SimonHuette
+    - Pierre Petersmeier - http://github.com/pierrepetersmeier

CHANGELOG.md

@@ -7,13 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased/Snapshot]
 
 ### Added
+- Formatting Spotless Groovy import order [#960](https://github.com/ie3-institute/PowerSystemDataModel/issues/960)
+- Implementing missing typical methods in `Try` [#970](https://github.com/ie3-institute/PowerSystemDataModel/issues/970)
+- Added log warning when using `SwitchInputs` with `parallelDevices` parameter [#840](https://github.com/ie3-institute/PowerSystemDataModel/issues/840)
+- Validation for `EvcsInput` [#1000](https://github.com/ie3-institute/PowerSystemDataModel/issues/1000)
+- Scaling method in system participant copy builders [#1011](https://github.com/ie3-institute/PowerSystemDataModel/issues/1011)
 
 ### Fixed
 - Fixed Couchbase integration tests that randomly failed [#755](https://github.com/ie3-institute/PowerSystemDataModel/issues/755)
+- Fixed hyperlink in line documentation [#965](https://github.com/ie3-institute/PowerSystemDataModel/issues/965)
+- Fixed some tests no failing when they should [#958](https://github.com/ie3-institute/PowerSystemDataModel/issues/958)
+- Fixed thermal-house-documentation [#873](https://github.com/ie3-institute/PowerSystemDataModel/issues/873)
+- Fixed ElectricVehicle Documentation [#875](https://github.com/ie3-institute/PowerSystemDataModel/issues/875)
+- Fixed Equal behavior of `ConnectorResult` [#1001](https://github.com/ie3-institute/PowerSystemDataModel/issues/1001) 
 
 ### 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)
+- Abstracting some methods in `ValidationUtils` [#852](https://github.com/ie3-institute/PowerSystemDataModel/issues/852)
+- Changes to Energy Management inputs:
+  - `EmInput` should not be connected to the grid [#955](https://github.com/ie3-institute/PowerSystemDataModel/issues/955)
+  - System participants now reference the em entity [#957](https://github.com/ie3-institute/PowerSystemDataModel/issues/957)
+- Enhancing the error message for coordinate sources with invalid column names [#670](https://github.com/ie3-institute/PowerSystemDataModel/issues/670) 
+- Allowing for additional unused columns in sources [#839](https://github.com/ie3-institute/PowerSystemDataModel/issues/839)
+- Improving column name validation to only run once per source [#849](https://github.com/ie3-institute/PowerSystemDataModel/issues/849)
+- Refactored and abstracted `EntitySource`s and `EntityData` creation [#969](https://github.com/ie3-institute/PowerSystemDataModel/issues/969)
+- Updated contributing.md [#737](https://github.com/ie3-institute/PowerSystemDataModel/issues/737)
+- Don't throw exceptions for not yet implemented validations [#879](https://github.com/ie3-institute/PowerSystemDataModel/issues/879)
+- `CsvDataSource` throws exceptions on error [#954](https://github.com/ie3-institute/PowerSystemDataModel/issues/954)
 
 ## [4.1.0] - 2023-11-02
 
@@ -37,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixed wrong rated power unit hint [#804](https://github.com/ie3-institute/PowerSystemDataModel/issues/804)
 - Fixed wrong hash code generation of ConnectorResult [#817](https://github.com/ie3-institute/PowerSystemDataModel/issues/817) 
+- Fixed wrong path for timeSeriesMapping [#886](https://github.com/ie3-institute/PowerSystemDataModel/issues/886)
 
 ### Changed
 - Removing deprecated classes and methods [#540](https://github.com/ie3-institute/PowerSystemDataModel/issues/540)
@@ -45,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use nio paths instead of strings for file path [#723](https://github.com/ie3-institute/PowerSystemDataModel/issues/723)
 - Data source will throw an exceptions instead of returning an empty optionals [#707](https://github.com/ie3-institute/PowerSystemDataModel/issues/707)
 - Improving `ValidationUtils` [#758](https://github.com/ie3-institute/PowerSystemDataModel/issues/758)
+- conversion from rst to markdown myst[#979](https://github.com/ie3-institute/PowerSystemDataModel/pull/985)
 
 ## [3.0.0] - 2023-02-16
 

CONTRIBUTING.md

@@ -16,7 +16,7 @@ With this document we would like to give you some orientation on how you can con
 ## Testing and reporting bugs
 We really appreciate your usage of this project.
 Whenever you find a bug, it would be nice to check, if this isn't a feature to us. :wink:
-You may find extensive information about the intended behaviour when you [Read the Docs](https://powersystemdatamodel.readthedocs.io/en/latest/) or within the [javadoc](https://ie3-institute.github.io/PowerSystemDataModel/javadoc/).
+You may find extensive information about the intended behaviour when you [Read the Docs](https://powersystemdatamodel.readthedocs.io/en/latest/).
 If you still think it's a bug, please raise an [issue](https://guides.github.com/features/issues/) for us.
 Considering the following aspects in your inquiry, assists us in helping you:
 
@@ -67,9 +67,6 @@ Before marking the pull request as 'ready to review', take these precautionary a
 `gradle finalizePR` summarizes all of these steps .
 
 ## For any doubts
-... please contact
-* Johannes (@johanneshiry),
-* Debopama (@sensarmad) or
-* Chris (@ckittl)
+... please contact [us](AUTHORS)
 
 We are happy to help! :smiley:

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,8 +4,8 @@ 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.github.spotbugs' version '5.2.3' // code check, working on byte code
+  id 'com.diffplug.spotless' version '6.25.0' //code format
+  id 'com.github.spotbugs' version '6.0.7' // 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
@@ -17,8 +17,8 @@ ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
   groovyVersion = "4.0"
-  groovyBinaryVersion = "4.0.15"
-  testcontainersVersion = '1.19.3'
+  groovyBinaryVersion = "4.0.18"
+  testcontainersVersion = '1.19.5'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }
@@ -70,10 +70,10 @@ dependencies {
   // testing
   testImplementation "org.apache.groovy:groovy:$groovyBinaryVersion"
 
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
   testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
   testImplementation 'org.objenesis:objenesis:3.3' // Mock creation with constructor parameters
-  testImplementation 'net.bytebuddy:byte-buddy:1.14.10' // Mocks of classes
+  testImplementation 'net.bytebuddy:byte-buddy:1.14.12' // Mocks of classes
 
   // testcontainers (docker framework for testing)
   testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -83,17 +83,17 @@ dependencies {
   testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.22.0')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.22.1')
   implementation 'org.apache.logging.log4j:log4j-api' // log4j
   implementation 'org.apache.logging.log4j:log4j-core' // log4j
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
 
   // Databases
-  implementation 'org.influxdb:influxdb-java:2.23'
-  implementation 'com.couchbase.client:java-client:3.5.0'
-  runtimeOnly 'org.postgresql:postgresql:42.7.0' // postgresql jdbc driver required during runtime
+  implementation 'org.influxdb:influxdb-java:2.24'
+  implementation 'com.couchbase.client:java-client:3.5.3'
+  runtimeOnly 'org.postgresql:postgresql:42.7.2' // postgresql jdbc driver required during runtime
 
-  implementation 'commons-io:commons-io:2.15.0' // I/O functionalities
+  implementation 'commons-io:commons-io:2.15.1' // I/O functionalities
   implementation 'org.apache.commons:commons-compress:1.25.0' // I/O functionalities
   implementation 'org.apache.commons:commons-lang3:3.14.0'
 }

docs/readthedocs/gettingstarted.md

@@ -0,0 +1,47 @@
+# Getting started
+
+Welcome, dear fellow of bottom up power system modelling!
+This section is meant to give you some help getting hands on our project.
+If you feel, something is missing, please contact us!
+
+## Requirements
+
+Java > v 17
+
+## Where to get
+
+Checkout latest from [GitHub](https://github.com/ie3-institute/PowerSystemDataModel) or use maven for dependency
+management:
+
+### Stable releases
+
+On [Maven central](https://search.maven.org/artifact/com.github.ie3-institute/PowerSystemDataModel):
+
+```xml
+<dependency>
+  <groupId>com.github.ie3-institute</groupId>
+  <artifactId>PowerSystemDataModel</artifactId>
+  <version>2.1.0</version>
+</dependency>
+```
+
+### Snapshot releases
+
+Available on [OSS Sonatype](https://s01.oss.sonatype.org/).
+Add the correct repository:
+
+```xml
+<repositories>
+  <repository>https://s01.oss.sonatype.org/content/repositories/snapshots</repository>
+</repositories>
+```
+
+and add the dependency:
+
+```xml
+<dependency>
+  <groupId>com.github.ie3-institute</groupId>
+  <artifactId>PowerSystemDataModel</artifactId>
+  <version>3.0-SNAPSHOT</version>
+</dependency>
+```

docs/readthedocs/index.md

@@ -0,0 +1,34 @@
+# Documentation of the PowerSystemDataModel
+
+Welcome to the documentation of the PowerSystemDataModel.
+It provides an extensive data model capable of modelling energy systems with high granularity e.g. for bottom-up simulations.
+Additionally, useful functions to process, augment and furnish model i/o information is provided.
+Effective handling of geographic information related to power grids is also possible.
+
+```{toctree}
+:caption: 'Contents:'
+:maxdepth: 2
+
+gettingstarted
+models/models
+io/basiciousage
+```
+
+## Contact the (Main) Maintainers
+
+If you feel, something this missing, wrong or misleading, please contact one of our main contributors:
+
+> - [@sensarmad](https://github.com/sensarmad)
+> - [@t-ober](https://github.com/t-ober)
+> - [@danielfeismann](https://github.com/danielfeismann)
+> - [@sebastian-peter](https://github.com/sebastian-peter)
+> - [@jo-bao](https://github.com/jo-bao)
+> - [@julianhohmann](https://github.com/julianhohmann)
+
+Hat tip to all other contributors!
+
+# Indices and tables
+
+- {ref}`genindex`
+- {ref}`modindex`
+- {ref}`search`

docs/readthedocs/io/csvfiles.md

@@ -58,7 +58,7 @@ You may extend / alter the naming with pre- or suffix by calling `new EntityPers
 Let's spend a few more words on the individual time series:
 Those files are meant to carry different types of content - one might give information about wholesale market prices,
 the other is a record of power values provided by a real system.
-To be able to understand, what's inside of the file, the *columnScheme* part of the file name gives insight of it's
+To be able to understand, what's inside of the file, the *columnScheme* part of the file name gives insight of its
 content.
 The following keys are supported until now: