Using time stamp pattern from factory to build Couchbase queries

Author: ckittl

src/main/java/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSource.java

@@ -36,7 +36,6 @@ public class CouchbaseWeatherSource implements WeatherSource {
   private static final Logger logger = LogManager.getLogger(CouchbaseWeatherSource.class);
 
   private static final NamingConvention DEFAULT_NAMING_CONVENTION = NamingConvention.FLAT;
-  private static final String DEFAULT_TIMESTAMP_PATTERN = "yyyy-MM-dd'T'HH:mm:ssxxx";
   /** The start of the document key, comparable to a table name in relational databases */
   private static final String DEFAULT_KEY_PREFIX = "weather";
 
@@ -59,20 +58,13 @@ public class CouchbaseWeatherSource implements WeatherSource {
    * @param coordinateSource Source to obtain actual coordinates from
    * @param weatherFactory Factory to transfer field to value mapping into actual java object
    *     instances
-   * @param timeStampPattern Pattern of time stamps to parse
    */
   public CouchbaseWeatherSource(
       CouchbaseConnector connector,
       IdCoordinateSource coordinateSource,
-      TimeBasedWeatherValueFactory weatherFactory,
-      String timeStampPattern) {
+      TimeBasedWeatherValueFactory weatherFactory) {
     this(
-        connector,
-        coordinateSource,
-        DEFAULT_KEY_PREFIX,
-        DEFAULT_TIMESTAMP_PATTERN,
-        DEFAULT_NAMING_CONVENTION,
-        weatherFactory);
+        connector, coordinateSource, DEFAULT_KEY_PREFIX, DEFAULT_NAMING_CONVENTION, weatherFactory);
   }
 
   /**
@@ -85,22 +77,15 @@ public CouchbaseWeatherSource(
    * @param weatherFactory Factory to transfer field to value mapping into actual java object
    *     instances
    * @deprecated Use {@link CouchbaseWeatherSource#CouchbaseWeatherSource(CouchbaseConnector,
-   *     IdCoordinateSource, String, String, NamingConvention, TimeBasedWeatherValueFactory)}
-   *     instead
+   *     IdCoordinateSource, String, NamingConvention, TimeBasedWeatherValueFactory)} instead
    */
   @Deprecated
   public CouchbaseWeatherSource(
       CouchbaseConnector connector,
       IdCoordinateSource coordinateSource,
       String keyPrefix,
       TimeBasedWeatherValueFactory weatherFactory) {
-    this(
-        connector,
-        coordinateSource,
-        keyPrefix,
-        DEFAULT_TIMESTAMP_PATTERN,
-        DEFAULT_NAMING_CONVENTION,
-        weatherFactory);
+    this(connector, coordinateSource, keyPrefix, DEFAULT_NAMING_CONVENTION, weatherFactory);
   }
 
   /**
@@ -110,7 +95,6 @@ public CouchbaseWeatherSource(
    * @param connector Connector, that establishes the connection to the couchbase instance
    * @param coordinateSource Source to obtain actual coordinates from
    * @param keyPrefix Prefix of entries, that belong to weather
-   * @param timeStampPattern Pattern of time stamps to parse
    * @param namingConvention the (case) convention, how columns are named
    * @param weatherFactory Factory to transfer field to value mapping into actual java object
    *     instances
@@ -119,14 +103,13 @@ public CouchbaseWeatherSource(
       CouchbaseConnector connector,
       IdCoordinateSource coordinateSource,
       String keyPrefix,
-      String timeStampPattern,
       NamingConvention namingConvention,
       TimeBasedWeatherValueFactory weatherFactory) {
     this.connector = connector;
     this.coordinateSource = coordinateSource;
     this.keyPrefix = keyPrefix;
     this.weatherFactory = weatherFactory;
-    this.timeStampPattern = timeStampPattern;
+    this.timeStampPattern = weatherFactory.getTimeStampPattern();
     this.namingConvention = namingConvention;
     this.coordinateIdColumnName = weatherFactory.getCoordinateIdFieldString(namingConvention);
   }

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceCosmoIT.groovy

@@ -13,7 +13,6 @@ import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
 import edu.ie3.datamodel.models.value.WeatherValue
 import edu.ie3.test.common.CosmoWeatherTestData
 import edu.ie3.test.helper.WeatherSourceTestHelper
-import edu.ie3.util.TimeUtil
 import edu.ie3.util.interval.ClosedInterval
 import org.locationtech.jts.geom.Point
 import org.testcontainers.couchbase.BucketDefinition
@@ -23,8 +22,6 @@ import org.testcontainers.utility.MountableFile
 import spock.lang.Shared
 import spock.lang.Specification
 
-import java.time.ZoneId
-
 @Testcontainers
 class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSourceTestHelper {
 
@@ -63,9 +60,8 @@ class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSour
 				"--dataset", "file:///home/weather.json")
 
 		def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
-		def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"
-		def weatherFactory = new CosmoTimeBasedWeatherValueFactory(dtfPattern)
-		source = new CouchbaseWeatherSource(connector, CosmoWeatherTestData.coordinateSource, weatherFactory, dtfPattern)
+		def weatherFactory = new CosmoTimeBasedWeatherValueFactory("yyyy-MM-dd'T'HH:mm:ssxxx")
+		source = new CouchbaseWeatherSource(connector, CosmoWeatherTestData.coordinateSource, weatherFactory)
 	}
 
 	def "The test container can establish a valid connection"() {
@@ -111,7 +107,6 @@ class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSour
 	}
 
 
-
 	def "A CouchbaseWeatherSource can read all weather data in a given time interval"() {
 		given:
 		def timeInterval = new ClosedInterval(CosmoWeatherTestData.TIME_15H, CosmoWeatherTestData.TIME_17H)

src/test/groovy/edu/ie3/datamodel/io/source/couchbase/CouchbaseWeatherSourceIconIT.groovy

@@ -12,7 +12,6 @@ import edu.ie3.datamodel.models.timeseries.individual.IndividualTimeSeries
 import edu.ie3.datamodel.models.timeseries.individual.TimeBasedValue
 import edu.ie3.test.common.IconWeatherTestData
 import edu.ie3.test.helper.WeatherSourceTestHelper
-import edu.ie3.util.TimeUtil
 import edu.ie3.util.interval.ClosedInterval
 import org.testcontainers.couchbase.BucketDefinition
 import org.testcontainers.couchbase.CouchbaseContainer
@@ -21,8 +20,6 @@ import org.testcontainers.utility.MountableFile
 import spock.lang.Shared
 import spock.lang.Specification
 
-import java.time.ZoneId
-
 @Testcontainers
 class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourceTestHelper {
 
@@ -61,9 +58,8 @@ class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourc
 				"--dataset", "file:///home/weather.json")
 
 		def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
-		def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"
-		def weatherFactory = new IconTimeBasedWeatherValueFactory(dtfPattern)
-		source = new CouchbaseWeatherSource(connector, IconWeatherTestData.coordinateSource, weatherFactory, dtfPattern)
+		def weatherFactory = new IconTimeBasedWeatherValueFactory("yyyy-MM-dd'T'HH:mm:ssxxx")
+		source = new CouchbaseWeatherSource(connector, IconWeatherTestData.coordinateSource, weatherFactory)
 	}
 
 	def "The test container can establish a valid connection"() {