Fix serialisation of locales

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 - Added functionality to disable URL aliases at all
 
+### Fixed
+
+- Fixed serialisation of locales
+
 ## [9.3.0](https://github.com/dbmdz/cudami/releases/tag/9.3.0) – 2025-01-07
 
 ### Changed

src/main/java/io/github/dbmdz/cudami/business/i18n/LanguageService.java

@@ -7,6 +7,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
@@ -96,6 +97,13 @@ public String getLocalizedLanguageString(Locale locale, Locale displayLocale) {
     return localizedLanguageString;
   }
 
+  public List<String> sortAndMapLanguages(
+      Locale displayLocale, Collection<Locale> languagesToSortAndMap) {
+    return sortLanguages(displayLocale, languagesToSortAndMap).stream()
+        .map(Locale::toLanguageTag)
+        .collect(Collectors.toCollection(LinkedList::new));
+  }
+
   public List<Locale> sortLanguages(Locale displayLocale, Collection<Locale> languagesToSort) {
     List<Locale> sortedLanguages =
         prioritisedSortedLanguages.stream()

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/ArticlesController.java

@@ -44,11 +44,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Article article = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, article.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, article.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/CollectionsController.java

@@ -54,11 +54,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Collection collection = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, collection.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, collection.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/EventsController.java

@@ -40,11 +40,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Event event = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, event.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, event.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/HeadwordEntriesController.java

@@ -45,11 +45,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     HeadwordEntry headwordEntry = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, headwordEntry.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, headwordEntry.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/ProjectsController.java

@@ -44,11 +44,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Project project = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, project.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, project.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/TopicsController.java

@@ -53,11 +53,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Topic topic = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, topic.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, topic.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/WebsitesController.java

@@ -79,11 +79,11 @@ public String edit(
     if (useReact) {
       final Locale displayLocale = LocaleContextHolder.getLocale();
       Website website = service.getByUuid(uuid);
-      List<Locale> existingLanguages =
-          languageService.sortLanguages(displayLocale, website.getLabel().getLocales());
+      List<String> existingLanguages =
+          languageService.sortAndMapLanguages(displayLocale, website.getLabel().getLocales());
 
-      if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-        model.addAttribute("activeLanguage", activeLanguage);
+      if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+        model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
       } else {
         model.addAttribute("activeLanguage", existingLanguages.get(0));
       }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/agent/CorporateBodiesController.java

@@ -46,11 +46,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     CorporateBody corporateBody = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, corporateBody.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, corporateBody.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/agent/PersonsController.java

@@ -45,11 +45,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Person person = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, person.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, person.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/entity/work/WorksController.java

@@ -8,11 +8,9 @@
 import io.github.dbmdz.cudami.business.i18n.LanguageService;
 import io.github.dbmdz.cudami.controller.ParameterHelper;
 import io.github.dbmdz.cudami.controller.identifiable.entity.AbstractEntitiesController;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -48,9 +46,7 @@ public String edit(
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Work work = service.getByUuid(uuid);
     List<String> existingLanguages =
-        languageService.sortLanguages(displayLocale, work.getLabel().getLocales()).stream()
-            .map(Locale::toLanguageTag)
-            .collect(Collectors.toCollection(ArrayList::new));
+        languageService.sortAndMapLanguages(displayLocale, work.getLabel().getLocales());
 
     if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
       model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());

src/main/java/io/github/dbmdz/cudami/controller/identifiable/resource/FileResourcesMetadataController.java

@@ -47,11 +47,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     FileResource fileResource = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, fileResource.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, fileResource.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }

src/main/java/io/github/dbmdz/cudami/controller/identifiable/web/WebpagesController.java

@@ -65,11 +65,11 @@ public String edit(
       throws TechnicalException {
     final Locale displayLocale = LocaleContextHolder.getLocale();
     Webpage webpage = service.getByUuid(uuid);
-    List<Locale> existingLanguages =
-        languageService.sortLanguages(displayLocale, webpage.getLabel().getLocales());
+    List<String> existingLanguages =
+        languageService.sortAndMapLanguages(displayLocale, webpage.getLabel().getLocales());
 
-    if (activeLanguage != null && existingLanguages.contains(activeLanguage)) {
-      model.addAttribute("activeLanguage", activeLanguage);
+    if (activeLanguage != null && existingLanguages.contains(activeLanguage.toLanguageTag())) {
+      model.addAttribute("activeLanguage", activeLanguage.toLanguageTag());
     } else {
       model.addAttribute("activeLanguage", existingLanguages.get(0));
     }