Close Taskana#2200 - fix the exception text for wrong classification …

…categoeries
ryzheboka · Jan 23, 2024 · 25a31dc · 25a31dc
1 parent 7ef02cf
commit 25a31dc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/TaskanaConfiguration.java
@@ -711,6 +711,7 @@ public static class Builder {
     private static final Logger LOGGER = LoggerFactory.getLogger(Builder.class);
     private static final String DEFAULT_TASKANA_PROPERTIES = "/taskana.properties";
     private static final String DEFAULT_TASKANA_PROPERTY_SEPARATOR = "|";
+    private String separator = DEFAULT_TASKANA_PROPERTY_SEPARATOR;
 
     // region general configuration
     private final DataSource dataSource;
@@ -1037,6 +1038,7 @@ public Builder initTaskanaProperties(String propertiesFile, String separator) {
       LOGGER.debug(
           "Reading taskana configuration from {} with separator {}", propertiesFile, separator);
       properties = loadProperties(propertiesFile);
+      this.separator = separator;
       configureAnnotatedFields(separator, properties);
       addMasterDomain();
       return this;
@@ -1056,6 +1058,11 @@ public Builder enforceServiceLevel(boolean enforceServiceLevel) {
       return this;
     }
 
+    public Builder separator(String separator) {
+      this.separator = separator;
+      return this;
+    }
+
     // endregion
 
     // region authentication configuration
@@ -1451,8 +1458,9 @@ private void validateConfiguration() {
                 "Parameter classificationCategoriesByType (taskana.classification.categories.<KEY>)"
                     + " contains invalid Classification Types. "
                     + "configured: %s "
-                    + "detected: %s",
-                classificationTypes, classificationCategoriesByType.keySet()));
+                    + "existing: %s",
+                classificationTypes,
+                "[" + String.join(separator, classificationCategoriesByType.keySet()) + "]"));
       }
 
       if (!classificationCategoriesByType.keySet().containsAll(classificationTypes)) {