#13353 - Corrected test and bug in SystemConfigurationValueDiseasesProvider

raulbob · raulbob · commit a110f710068a · 2025-05-05T17:22:59.000+02:00
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/systemconfiguration/SystemConfigurationValueDiseasesProvider.java b/sormas-api/src/main/java/de/symeda/sormas/api/systemconfiguration/SystemConfigurationValueDiseasesProvider.java
@@ -69,7 +69,8 @@ public Map<String, String> getOptions() {
     public void applyValues(final Map<String, String> values, final SystemConfigurationValueDto dto) {
 
         if (null == values || values.isEmpty()) {
-            dto.setValue(null);
+            dto.setValue("");
+            return;
         }
         final String pipeSeparatedValues = values.keySet().stream().sorted(Comparator.naturalOrder()).collect(Collectors.joining("|"));
         dto.setValue(pipeSeparatedValues);
diff --git a/sormas-api/src/test/java/de/symeda/sormas/api/systemconfiguration/SystemConfigurationValueDiseasesProviderTest.java b/sormas-api/src/test/java/de/symeda/sormas/api/systemconfiguration/SystemConfigurationValueDiseasesProviderTest.java
@@ -102,7 +102,7 @@ void testApplyValuesWithEmptyValues() {
 
         provider.applyValues(values, dto);
 
-        assertThat(dto.getValue(), is((String) null));
+        assertThat(dto.getValue(), is(""));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ public Map<String, String> getOptions() {`
`69`	`69`	`public void applyValues(final Map<String, String> values, final SystemConfigurationValueDto dto) {`
`70`	`70`
`71`	`71`	`if (null == values \|\| values.isEmpty()) {`
`72`		`- dto.setValue(null);`
	`72`	`+ dto.setValue("");`
	`73`	`+ return;`
`73`	`74`	`}`
`74`	`75`	`final String pipeSeparatedValues = values.keySet().stream().sorted(Comparator.naturalOrder()).collect(Collectors.joining("\|"));`
`75`	`76`	`dto.setValue(pipeSeparatedValues);`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ void testApplyValuesWithEmptyValues() {`
`102`	`102`
`103`	`103`	`provider.applyValues(values, dto);`
`104`	`104`
`105`		`- assertThat(dto.getValue(), is((String) null));`
	`105`	`+ assertThat(dto.getValue(), is(""));`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`