SORMAS-Foundation#3412 fix merge issues

Author: lgal

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/Person.java

@@ -598,8 +598,6 @@ public void setExternalId(String externalId) {
 		this.externalId = externalId;
 	}
 
-	public void setExternalId(String externalId) { this.externalId = externalId; }
-
 	public Country getBirthCountry() {
 		return birthCountry;
 	}

sormas-app/app/src/main/java/de/symeda/sormas/app/person/edit/PersonEditFragment.java

@@ -62,15 +62,12 @@
 import de.symeda.sormas.app.backend.contact.Contact;
 import de.symeda.sormas.app.backend.location.Location;
 import de.symeda.sormas.app.backend.person.Person;
-import de.symeda.sormas.app.backend.region.Country;
 import de.symeda.sormas.app.component.Item;
 import de.symeda.sormas.app.component.controls.ControlPropertyField;
 import de.symeda.sormas.app.component.controls.ValueChangeListener;
 import de.symeda.sormas.app.component.dialog.LocationDialog;
-import de.symeda.sormas.app.core.FieldHelper;
 import de.symeda.sormas.app.core.IEntryItemOnClickListener;
 import de.symeda.sormas.app.databinding.FragmentPersonEditLayoutBinding;
-import de.symeda.sormas.app.util.CountryHelper;
 import de.symeda.sormas.app.util.DataUtils;
 import de.symeda.sormas.app.util.DiseaseConfigurationCache;
 import de.symeda.sormas.app.util.InfrastructureHelper;
@@ -138,7 +135,7 @@ public static void setUpLayoutBinding(
 
 		List<Item> occupationFacilityTypeList = DataUtils.toItems(FacilityType.getTypes(FacilityTypeGroup.MEDICAL_FACILITY), true);
 		List<Item> placeOfBirthFacilityTypeList = DataUtils.toItems(FacilityType.getPlaceOfBirthTypes(), true);
-		List<Item> countryList = CountryHelper.loadCountries();
+		List<Item> countryList = InfrastructureHelper.loadCountries();
 
 		InfrastructureHelper.initializeHealthFacilityDetailsFieldVisibility(
 			contentBinding.personPlaceOfBirthFacility,

sormas-app/app/src/main/java/de/symeda/sormas/app/util/CountryHelper.java

@@ -21,7 +21,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.event.TypeOfPlace;
@@ -49,7 +51,18 @@
 public final class InfrastructureHelper {
 
 	public static List<Item> loadCountries() {
-		return toItems(DatabaseHelper.getCountryDao().queryActiveForAll(Country.NAME, true));
+		List<Item> items = new ArrayList<>();
+
+		items.add(new Item<>("", null));
+		items.addAll(
+				DatabaseHelper.getCountryDao()
+						.queryActiveForAll(Country.ISO_CODE, true)
+						.stream()
+						.map(c -> new Item<>(I18nProperties.getCountryName(c.getIsoCode(), c.getName()), c))
+						.sorted(Comparator.comparing(Item::getKey))
+						.collect(Collectors.toList()));
+
+		return items;
 	}
 
 	public static List<Item> loadRegions() {