Force user to provide time stamp pattern to ensure harmonized parsing

Author: ckittl

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

@@ -46,6 +46,7 @@ public class CouchbaseWeatherSource implements WeatherSource {
   private final CouchbaseConnector connector;
   private final IdCoordinateSource coordinateSource;
   private final String coordinateIdColumnName;
+  private final String timeStampPattern;
 
   /**
    * Instantiate a weather source utilising a connection to a couchbase instance obtained via the
@@ -57,13 +58,20 @@ 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) {
+      TimeBasedWeatherValueFactory weatherFactory,
+      String timeStampPattern) {
     this(
-        connector, coordinateSource, DEFAULT_KEY_PREFIX, DEFAULT_NAMING_CONVENTION, weatherFactory);
+        connector,
+        coordinateSource,
+        DEFAULT_KEY_PREFIX,
+        DEFAULT_TIMESTAMP_PATTERN,
+        DEFAULT_NAMING_CONVENTION,
+        weatherFactory);
   }
 
   /**
@@ -76,15 +84,22 @@ public CouchbaseWeatherSource(
    * @param weatherFactory Factory to transfer field to value mapping into actual java object
    *     instances
    * @deprecated Use {@link CouchbaseWeatherSource#CouchbaseWeatherSource(CouchbaseConnector,
-   *     IdCoordinateSource, String, NamingConvention, TimeBasedWeatherValueFactory)} instead
+   *     IdCoordinateSource, String, String, NamingConvention, TimeBasedWeatherValueFactory)}
+   *     instead
    */
   @Deprecated
   public CouchbaseWeatherSource(
       CouchbaseConnector connector,
       IdCoordinateSource coordinateSource,
       String keyPrefix,
       TimeBasedWeatherValueFactory weatherFactory) {
-    this(connector, coordinateSource, keyPrefix, DEFAULT_NAMING_CONVENTION, weatherFactory);
+    this(
+        connector,
+        coordinateSource,
+        keyPrefix,
+        DEFAULT_TIMESTAMP_PATTERN,
+        DEFAULT_NAMING_CONVENTION,
+        weatherFactory);
   }
 
   /**
@@ -94,6 +109,7 @@ 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
@@ -102,12 +118,14 @@ 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.coordinateIdColumnName = weatherFactory.getCoordinateIdFieldString(namingConvention);
   }
 
@@ -186,7 +204,7 @@ public Optional<TimeBasedValue<WeatherValue>> getWeather(ZonedDateTime date, Poi
   public String generateWeatherKey(ZonedDateTime time, Integer coordinateId) {
     String key = keyPrefix + "::";
     key += coordinateId + "::";
-    key += time.format(DateTimeFormatter.ofPattern(DEFAULT_TIMESTAMP_PATTERN));
+    key += time.format(DateTimeFormatter.ofPattern(timeStampPattern));
     return key;
   }
 

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

@@ -63,8 +63,9 @@ class CouchbaseWeatherSourceCosmoIT extends Specification implements WeatherSour
 				"--dataset", "file:///home/weather.json")
 
 		def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
-		def weatherFactory = new CosmoTimeBasedWeatherValueFactory(new TimeUtil(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd'T'HH:mm:ssxxx"))
-		source = new CouchbaseWeatherSource(connector, CosmoWeatherTestData.coordinateSource, weatherFactory)
+		def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"
+		def weatherFactory = new CosmoTimeBasedWeatherValueFactory(new TimeUtil(ZoneId.of("UTC"), Locale.GERMANY, dtfPattern))
+		source = new CouchbaseWeatherSource(connector, CosmoWeatherTestData.coordinateSource, weatherFactory, dtfPattern)
 	}
 
 	def "The test container can establish a valid connection"() {

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

@@ -61,8 +61,9 @@ class CouchbaseWeatherSourceIconIT extends Specification implements WeatherSourc
 				"--dataset", "file:///home/weather.json")
 
 		def connector = new CouchbaseConnector(couchbaseContainer.connectionString, bucketDefinition.name, couchbaseContainer.username, couchbaseContainer.password)
-		def weatherFactory = new IconTimeBasedWeatherValueFactory(new TimeUtil(ZoneId.of("UTC"), Locale.GERMANY, "yyyy-MM-dd'T'HH:mm:ssxxx"))
-		source = new CouchbaseWeatherSource(connector, IconWeatherTestData.coordinateSource, weatherFactory)
+		def dtfPattern = "yyyy-MM-dd'T'HH:mm:ssxxx"
+		def weatherFactory = new IconTimeBasedWeatherValueFactory(new TimeUtil(ZoneId.of("UTC"), Locale.GERMANY, dtfPattern))
+		source = new CouchbaseWeatherSource(connector, IconWeatherTestData.coordinateSource, weatherFactory, dtfPattern)
 	}
 
 	def "The test container can establish a valid connection"() {