Merge branch 'dev' into sp/#282-SimScheduler-data-structures

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Adapt test to new PowerSystemUtils snapshot  [#294](https://github.com/ie3-institute/simona/issues/294)
 - Simplified ParticipantConfigUtil [#273](https://github.com/ie3-institute/simona/issues/273)
 - Consolidated and enhanced SimScheduler tests [#285](https://github.com/ie3-institute/simona/issues/285)
+- Renaming sub-package directories [#141](https://github.com/ie3-institute/simona/issues/141)
 - Added faster data structures to SimScheduler [#282](https://github.com/ie3-institute/simona/issues/282)
 
 ### Fixed

build.gradle

@@ -10,7 +10,7 @@ plugins {
   id 'com.diffplug.spotless' version '6.9.1'// code format
   id 'com.github.onslip.gradle-one-jar' version '1.0.6' // pack a self contained jar
   id "com.github.ben-manes.versions" version '0.42.0'
-  id "de.undercouch.download" version "5.1.0" // downloads plugin
+  id "de.undercouch.download" version "5.1.1" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
   id "com.github.johnrengelman.shadow" version "7.1.2" // fat jar
   id "org.sonarqube" version "3.4.0.2513" // sonarqube
@@ -105,7 +105,7 @@ dependencies {
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0'
   testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
-  implementation 'org.mockito:mockito-core:4.6.1' // mocking framework
+  implementation 'org.mockito:mockito-core:4.7.0' // mocking framework
   testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.13"
   testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.0' //scalatest html output
   testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'

src/test/groovy/edu/ie3/simona/model/participant/PVModelIT.groovy

@@ -128,7 +128,7 @@ trait PVModelITHelper {
 		"load the grid input data from the corresponding resources folder"
 
 		def csvGridSource = CsvGridSource.readGrid("it_grid", ";",
-				this.getClass().getResource("pv/it/grid_data").file,
+				this.getClass().getResource("_pv/it/grid_data").file,
 				new FileNamingStrategy())
 
 		def simulationStartDate = TimeUtil.withDefaults.toZonedDateTime("2011-01-01 00:00:00")
@@ -165,7 +165,7 @@ trait PVModelITHelper {
 
 	HashMap<ZonedDateTime, HashMap<String, WeatherMessage.WeatherData>> getWeatherData() {
 		"read the weather data from the provided weather data file"
-		final String fileName = "pv/it/weather.tar.gz"
+		final String fileName = "_pv/it/weather.tar.gz"
 		final def csvRecords = getCsvRecords(fileName)
 
 		HashMap<ZonedDateTime, HashMap<String, WeatherMessage.WeatherData>> weatherMap = new HashMap<>()
@@ -203,7 +203,7 @@ trait PVModelITHelper {
 
 	HashMap<ZonedDateTime, HashMap<String, Quantity<Power>>> getResultsData() {
 		"read the results data from the provided file"
-		final String fileName = "pv/it/results2.tar.gz"
+		final String fileName = "_pv/it/results2.tar.gz"
 		def csvRecords = getCsvRecords(fileName)
 
 		// we skip the first line and use hardcoded headers, because the first line is garbled

src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySpec.scala

@@ -80,7 +80,7 @@ class PrimaryServiceProxySpec
     .get(
       this.getClass
         .getResource(
-          "it"
+          "_it"
         )
         .toURI
     )

src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySqlIT.scala

@@ -60,7 +60,7 @@ class PrimaryServiceProxySqlIT
 
   override protected def beforeAll(): Unit = {
     // Copy sql import scripts into docker
-    val sqlImportFile = getMountableFile("timeseries/")
+    val sqlImportFile = getMountableFile("_timeseries/")
     container.copyFileToContainer(sqlImportFile, "/home/")
 
     Iterable(

src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSpec.scala

@@ -64,7 +64,7 @@ class PrimaryServiceWorkerSpec
     .get(
       this.getClass
         .getResource(
-          "it"
+          "_it"
         )
         .toURI
     )

src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceWorkerSqlIT.scala

@@ -68,7 +68,7 @@ class PrimaryServiceWorkerSqlIT
 
   override protected def beforeAll(): Unit = {
     // Copy sql import scripts into docker
-    val sqlImportFile = getMountableFile("timeseries/")
+    val sqlImportFile = getMountableFile("_timeseries/")
     container.copyFileToContainer(sqlImportFile, "/home/")
 
     Iterable("time_series_p.sql", "time_series_pqh.sql")

src/test/scala/edu/ie3/simona/sim/setup/ExtSimLoaderSpec.scala

@@ -16,8 +16,8 @@ class ExtSimLoaderSpec extends UnitSpec {
 
   private val resourceDir = "ext-sim-loader"
 
-  private val noJarsDir = s"$resourceDir/no-jars"
-  private val jarsDir = s"$resourceDir/jars"
+  private val noJarsDir = s"$resourceDir/_no-jars"
+  private val jarsDir = s"$resourceDir/_jars"
 
   private val workingJar = s"$jarsDir/mock_ext_sim.jar"
   private val workingJar2 = s"$jarsDir/mock_ext_sim-2.jar"