Adapting tests to groovy 4.0

Author: sebastian-peter

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"() {