Fixe some more minor issues

Author: raulbob

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/TreatmentOption.java

@@ -15,6 +15,7 @@
 
 package de.symeda.sormas.ui.caze.notifier;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
@@ -35,15 +36,17 @@ public class TreatmentOption implements Comparable<TreatmentOption> {
     public static final TreatmentOption UNKNOWN =
         new TreatmentOption(YesNoUnknown.UNKNOWN.toString(), I18nProperties.getEnumCaption(YesNoUnknown.UNKNOWN));
 
-    public static final Set<TreatmentOption> ALL_OPTIONS = Collections.unmodifiableSet(new TreeSet<>(Set.of(YES, NO, NOT_APPLICABLE, UNKNOWN)));
+    public static final Set<TreatmentOption> ALL_OPTIONS =
+        Collections.unmodifiableSet(new TreeSet<>(Arrays.asList(YES, NO, NOT_APPLICABLE, UNKNOWN)));
 
     private String value;
     private String caption;
 
     /**
      * Creates a TreatmentOption from a YesNoUnknown enum value.
      * 
-     * @param yesNoUnknown the enum value to convert, null returns NOT_APPLICABLE
+     * @param yesNoUnknown
+     *            the enum value to convert, null returns NOT_APPLICABLE
      * @return corresponding TreatmentOption
      */
     public static final TreatmentOption forValue(YesNoUnknown yesNoUnknown) {
@@ -65,8 +68,10 @@ public static final TreatmentOption forValue(YesNoUnknown yesNoUnknown) {
     /**
      * Creates a new TreatmentOption.
      * 
-     * @param value the internal value
-     * @param caption the display caption
+     * @param value
+     *            the internal value
+     * @param caption
+     *            the display caption
      */
     public TreatmentOption(String value, String caption) {
         this.value = value;
@@ -111,14 +116,14 @@ public int compareTo(TreatmentOption other) {
         if (other == null) {
             return 1;
         }
-        
+
         // Define the desired order: YES, NO, UNKNOWN, NOT_APPLICABLE
         int thisOrder = getOrder(this);
         int otherOrder = getOrder(other);
-        
+
         return Integer.compare(thisOrder, otherOrder);
     }
-    
+
     private int getOrder(TreatmentOption option) {
         if (option.equals(YES)) {
             return 1;

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/doctordeclaration/DoctorDeclarationMessageProcessingFlow.java

@@ -16,12 +16,14 @@
 package de.symeda.sormas.ui.externalmessage.doctordeclaration;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -320,8 +322,10 @@ public void done(CaseDataDto result) {
 					notifierDto.setEmail(externalMessage.getNotifierEmail());
 					if (externalMessage.getReporterName() != null && externalMessage.getReporterName().contains("-")) {
 						// Split the reporter name into first and last names if it contains a hyphen
-						notifierDto.setAgentFirstName(externalMessage.getReporterName().split("-")[0]);
-						notifierDto.setAgentLastName(externalMessage.getReporterName().split("-")[1]);
+						// Some names may already contain hyphens, assume first parts are the first name and last parts are the last name
+						final String[] nameParts = externalMessage.getReporterName().split("-");
+						notifierDto.setAgentFirstName(Arrays.stream(nameParts).limit(nameParts.length - 1).map(String::trim).collect(Collectors.joining(" ")));
+						notifierDto.setAgentLastName(nameParts.length > 0 ? nameParts[nameParts.length - 1].trim() : "");
 					}
 					// Update the case with notifier details and complete the callback
 					callback.done(getExternalMessageProcessingFacade().updateAndSetCaseNotifier(result.getUuid(), notifierDto));