Merge pull request #789 from ie3-institute/sp/#788-update-groovy

Set fixed groovy version and update groovy to 4.0

Author: t-ober

.github/dependabot.yml

@@ -13,10 +13,6 @@ updates:
   - sebastian-peter
   - danielfeismann
   - jo-bao
-  ignore:
-  - dependency-name: org.spockframework:spock-core
-    versions:
-        - 2.3-groovy-4.0
 
 - package-ecosystem: pip
   directory: "/docs/readthedocs"

CHANGELOG.md

@@ -86,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BREAKING: Updating PowerSystemUtils dependency to 2.0-SNAPSHOT [#595](https://github.com/ie3-institute/PowerSystemDataModel/issues/595)
 - BREAKING: Generified the `LoadInput` attribute `standardLoadProfile` to `loadProfile` as it should also address the newly added `TemperatureDependantLoadProfile`s [#601](https://github.com/ie3-institute/PowerSystemDataModel/issues/601)
 - Adapted to new double converters in PSU [#705](https://github.com/ie3-institute/PowerSystemDataModel/issues/705)
+- Setting fixed groovy version and updating groovy [#788](https://github.com/ie3-institute/PowerSystemDataModel/issues/788)
 
 ## [2.1.0] - 2022-01-05
 

build.gradle

@@ -16,6 +16,8 @@ plugins {
 ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
+  groovyVersion = "4.0"
+  groovyBinaryVersion = "4.0.11"
   testcontainersVersion = '1.17.6'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
@@ -63,8 +65,10 @@ dependencies {
   implementation 'org.jgrapht:jgrapht-core:1.5.1'
 
   // testing
+  testImplementation "org.apache.groovy:groovy:$groovyBinaryVersion"
+
   testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
-  testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+  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.4' // Mocks of classes
 

src/main/java/edu/ie3/datamodel/io/source/csv/CsvDataSource.java

@@ -83,7 +83,7 @@ protected CsvDataSource(String csvSep, String folderPath, FileNamingStrategy fil
    * @return a map containing the mapping of (fieldName to fieldValue) or an empty map if an error
    *     occurred
    */
-  private Map<String, String> buildFieldsToAttributes(
+  protected Map<String, String> buildFieldsToAttributes(
       final String csvRow, final String[] headline) {
 
     TreeMap<String, String> insensitiveFieldsToAttributes =
@@ -171,7 +171,7 @@ protected String[] parseCsvRow(String csvRow, String csvSep) {
    * @deprecated only left for downward compatibility. Will be removed in a major release
    */
   @Deprecated(since = "1.1.0", forRemoval = true)
-  private String[] oldFieldVals(String csvSep, String csvRow) {
+  protected String[] oldFieldVals(String csvSep, String csvRow) {
 
     /*geo json support*/
     final String geoJsonRegex = "\\{.+?}}}";
@@ -237,7 +237,7 @@ private List<String> extractMatchingStrings(String regexString, String csvRow) {
    * @return either the first found instancen of {@link OperatorInput} or {@link
    *     OperatorInput#NO_OPERATOR_ASSIGNED}
    */
-  private OperatorInput getFirstOrDefaultOperator(
+  protected OperatorInput getFirstOrDefaultOperator(
       Collection<OperatorInput> operators,
       String operatorUuid,
       String entityClassName,

src/test/groovy/edu/ie3/datamodel/io/sink/InfluxDbSinkIT.groovy

@@ -61,7 +61,7 @@ class InfluxDbSinkIT extends Specification {
     when:
     def connector = new InfluxDbConnector(influxDbContainer.url,"test_weather", "test_scenario")
     then:
-    connector.connectionValid
+    connector.isConnectionValid()
   }
 
   def "An InfluxDbSink can persist a ResultEntity"() {

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvDataSourceTest.groovy

@@ -34,31 +34,6 @@ class CsvDataSourceTest extends Specification {
     DummyCsvSource(String csvSep, String folderPath, FileNamingStrategy fileNamingStrategy) {
       super(csvSep, folderPath, fileNamingStrategy)
     }
-
-    Map<String, String> buildFieldsToAttributes(
-        final String csvRow, final String[] headline) {
-      return super.buildFieldsToAttributes(csvRow, headline)
-    }
-
-    OperatorInput getFirstOrDefaultOperator(
-        Collection<OperatorInput> operators, String operatorUuid, String entityClassName, String requestEntityUuid) {
-      return super.getFirstOrDefaultOperator(operators, operatorUuid, entityClassName, requestEntityUuid)
-    }
-
-    def <T extends UniqueEntity> Set<Map<String, String>> distinctRowsWithLog(
-        Class<T> entityClass, Collection<Map<String, String>> allRows) {
-      return super.distinctRowsWithLog(allRows, uuidExtractor, entityClass.simpleName, "UUID")
-    }
-
-    String[] parseCsvRow(
-        String csvRow, String csvSep) {
-      return super.parseCsvRow(csvRow, csvSep)
-    }
-
-    String[] oldFieldVals(
-        String csvSep, String csvRow) {
-      return super.oldFieldVals(csvSep, csvRow)
-    }
   }
 
   @Shared

src/test/groovy/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSourceCosmoIT.groovy

@@ -54,7 +54,7 @@ class InfluxDbWeatherSourceCosmoIT extends Specification implements TestContaine
     def connector = new InfluxDbConnector(influxDbContainer.url,"test_weather", "test_scenario")
 
     then:
-    connector.connectionValid
+    connector.isConnectionValid()
   }
 
   def "An InfluxDbWeatherSource can read and correctly parse a single value for a specific date and coordinate"() {

src/test/groovy/edu/ie3/datamodel/io/source/influxdb/InfluxDbWeatherSourceIconIT.groovy

@@ -52,7 +52,7 @@ class InfluxDbWeatherSourceIconIT extends Specification implements WeatherSource
     def connector = new InfluxDbConnector(influxDbContainer.url, "test_weather", "test_scenario")
 
     then:
-    connector.connectionValid
+    connector.isConnectionValid()
   }
 
   def "An InfluxDbWeatherSource can read and correctly parse a single value for a specific date and coordinate"() {