Merge pull request #2048 from bakdata/feature/support-single-date-for…

…-daterange support single dates for date set (input and output)
ingef · Aug 26, 2021 · feb432a · feb432a
2 parents 22eee00 + 1b90475
commit feb432a
Show file tree

Hide file tree

Showing 116 changed files with 624 additions and 599 deletions.
diff --git a/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/CDateRangeDeserializer.java b/backend/src/main/java/com/bakdata/conquery/io/jackson/serializer/CDateRangeDeserializer.java
@@ -23,6 +23,6 @@ protected CDateRangeDeserializer(DateReader dateReader) {
     @SneakyThrows
     @Override
     public CDateRange deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-        return DateRangeParser.parseISORange(p.getText(), dateReader);
+        return dateReader.parseToCDateRange(p.getText());
     }
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/LocaleConfig.java
@@ -45,7 +45,7 @@ public class LocaleConfig {
 	 */
 	@NotEmpty
 	private Map<Locale, String> localeRangeStartEndSeparators = Map.of(
-			Locale.GERMAN, "-",
+			Locale.GERMAN, " - ",
 			Locale.ROOT, "/"
 	);