Bump actions/setup-java from 4.0.0 to 4.1.0

*  Bump actions/setup-java from 4.0.0 to 4.1.0

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* lint: fix coupling && visibility issues

* lint: further decoupling

* fix some code smells in ui data model

* polishing

* rm unnecessary field injection

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JKatzwinkel <JKatzwinkel@users.noreply.github.com>

.github/workflows/gradle.yml

@@ -43,7 +43,7 @@ jobs:
       uses: actions/checkout@v4.1.1
 
     - name: set up jdk
-      uses: actions/setup-java@v4.0.0
+      uses: actions/setup-java@v4.1.0
       with:
         distribution: temurin
         java-version: ${{ matrix.java-version }}

.github/workflows/submit_dependencies.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - uses: actions/setup-java@v4.0.0
+      - uses: actions/setup-java@v4.1.0
         with:
           distribution: temurin
           java-version: 21

README.md

@@ -1,7 +1,7 @@
 ![build](https://github.com/JKatzwinkel/tla-web/workflows/build/badge.svg)
 ![deploy](https://github.com/JKatzwinkel/tla-web/workflows/deploy/badge.svg)
-![LINE](https://img.shields.io/badge/line--coverage-91.00%25-brightgreen.svg)
-![METHOD](https://img.shields.io/badge/method--coverage-92.46%25-brightgreen.svg)
+![LINE](https://img.shields.io/badge/line--coverage-91.20%25-brightgreen.svg)
+![METHOD](https://img.shields.io/badge/method--coverage-92.61%25-brightgreen.svg)
 
 TLA web frontend.
 

src/main/java/tla/web/model/mappings/Util.java

@@ -22,6 +22,10 @@
 @Slf4j
 public class Util {
 
+    private Util() {
+        //
+    }
+
     public static final String SERIF_FONT_MARKUP_REGEX = "\\$([^$]+)\\$";
     public static final String SERIF_FONT_MARKUP_REPLACEMENT = "<span class=\"bbaw-libertine\">$1</span>";
 
@@ -109,7 +113,7 @@ public static String escapeMarkup(String text) {
             SERIF_FONT_MARKUP_REPLACEMENT
         );
         if (escaped != null) {
-            return escaped.replaceAll("\\n", "<br/>");
+            return escaped.replace("\\n", "<br/>");
         }
         return escaped;
     }

src/main/java/tla/web/model/meta/ObjectDetails.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import lombok.Getter;
@@ -35,8 +36,7 @@ public ObjectDetails(T object, Map<String, Map<String, TLAObject>> related) {
      * Map payload and related objects from DTO to domain model types.
      */
     public static ObjectDetails<? extends TLAObject> from(SingleDocumentWrapper<? extends AbstractDto> wrapper) {
-        var container = new ObjectDetails<>(wrapper);
-        return container;
+        return new ObjectDetails<>(wrapper);
     }
 
     /**
@@ -49,9 +49,9 @@ public Map<String, List<TLAObject>> extractRelatedObjects() {
             Collectors.toMap(
                 entry -> entry.getKey(),
                 entry -> entry.getValue().stream().map(
-                    reference -> this.expandRelatedObject(reference)
+                    this::expandRelatedObject
                 ).filter(
-                    o -> o != null
+                    Objects::nonNull
                 ).toList()
             )
         );

src/main/java/tla/web/model/ui/Pagination.java

@@ -1,6 +1,5 @@
 package tla.web.model.ui;
 
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.IntStream;
@@ -14,7 +13,7 @@
 @Getter
 public class Pagination {
 
-    public final static int OMISSION_THRESHOLD = 2;
+    public static final int OMISSION_THRESHOLD = 2;
 
     private long fromResult;
     private long toResult;
@@ -32,8 +31,8 @@ public Pagination(PageInfo dtoPage) {
         if (dtoPage != null) {
             this.currentPage = dtoPage.getNumber() + 1;
             this.totalResults = dtoPage.getTotalElements();
-            this.fromResult = (this.currentPage - 1) * dtoPage.getSize() + 1;
-            this.toResult = (this.currentPage - 1) * dtoPage.getSize() + dtoPage.getNumberOfElements();
+            this.fromResult = (this.currentPage - 1l) * dtoPage.getSize() + 1;
+            this.toResult = (this.currentPage - 1l) * dtoPage.getSize() + dtoPage.getNumberOfElements();
             this.lastPage = Math.max(dtoPage.getTotalPages(), 1);
             this.pages = this.makePageLinks();
         } else {
@@ -49,15 +48,15 @@ public Pagination(PageInfo dtoPage) {
      * @return
      */
     protected int distanceToRequiredPage(int page) {
-        return Arrays.asList(
+        return List.of(
             1,
             this.currentPage,
             this.lastPage
         ).stream().map(
             requiredPage -> Math.abs(requiredPage - page)
         ).reduce(
             Math::min
-        ).get();
+        ).orElseThrow();
     }
 
     /**
@@ -66,24 +65,24 @@ protected int distanceToRequiredPage(int page) {
      * ellipsis placeholders (n pages omitted).
      */
     protected List<Integer> makePageLinks() {
-        List<Integer> pages = new LinkedList<Integer>();
-        List<Integer> omitted = new LinkedList<Integer>();
+        List<Integer> included = new LinkedList<>();
+        List<Integer> omitted = new LinkedList<>();
         IntStream.rangeClosed(1, this.lastPage).forEach(
-            p -> {
-                if (this.distanceToRequiredPage(p) > OMISSION_THRESHOLD) {
-                    omitted.add(p);
+            page-> {
+                if (this.distanceToRequiredPage(page) > OMISSION_THRESHOLD) {
+                    omitted.add(page);
                 } else {
                     if (omitted.size() > 1) {
-                        pages.add(null);
+                        included.add(null);
                     } else {
-                        pages.addAll(omitted);
+                        included.addAll(omitted);
                     }
                     omitted.clear();
-                    pages.add(p);
+                    included.add(page);
                 }
             }
         );
-        return pages;
+        return included;
     }
 
 }

src/main/java/tla/web/model/ui/SearchFormExpansionState.java

@@ -3,9 +3,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-import lombok.Getter;
-import lombok.AllArgsConstructor;
-
 /**
  * Simple single-purpose POJO for initializing search form collapsible
  * expansion states (which search form currently has the focus)

src/main/java/tla/web/mvc/EditorialContentController.java

@@ -15,7 +15,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.jooq.lambda.Seq;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.MessageSource;
@@ -45,18 +44,24 @@
 @RequestMapping("/")
 public class EditorialContentController {
 
-    @Autowired
     private MessageSource l10n;
 
-    @Autowired
     private LocaleResolver localeResolver;
 
-    @Autowired
     private EditorialRegistry editorialRegistry;
 
-    @Autowired
     private RequestMappingHandlerMapping handlerMapping;
 
+    public EditorialContentController(
+        MessageSource l10n, LocaleResolver localeResolver,
+        EditorialRegistry editorialRegistry, RequestMappingHandlerMapping handlerMapping
+    ) {
+        this.l10n = l10n;
+        this.localeResolver = localeResolver;
+        this.editorialRegistry = editorialRegistry;
+        this.handlerMapping = handlerMapping;
+    }
+
     @Value("${tla.editorials.path}")
     private String editorialsDir;
 
@@ -112,7 +117,7 @@ private HttpHeaders preferContentLanguage(String lang, HttpHeaders header) {
     /**
      * build i18n message key for an editorial page's title.
      */
-    public static String getPageTitleMsgKey(String path, String lang) {
+    public static String getPageTitleMsgKey(String path) {
         return "editorial_title_" + Seq.toString(
             Stream.of(
                 path.split("/")
@@ -131,7 +136,7 @@ public static String getPageTitleMsgKey(String path, String lang) {
      */
     public String getPageTitle(String path, String lang) {
         return l10n.getMessage(
-            getPageTitleMsgKey(path, lang),
+            getPageTitleMsgKey(path),
             null,
             path,
             Locale.forLanguageTag(lang)
@@ -186,7 +191,7 @@ public String renderEditorial(
             List.of(
                 BREADCRUMB_HOME,
                 BreadCrumb.of(
-                    getPageTitleMsgKey(path, lang)
+                    getPageTitleMsgKey(path)
                 )
             )
         );
@@ -208,19 +213,15 @@ public void onApplicationReady(ApplicationReadyEvent event) throws NoSuchMethodE
             HttpHeaders.class,
             Model.class
         );
-        try {
-            this.editorialRegistry.getLangSupport().forEach(
-                (path, supportedLanguages) -> {
-                    handlerMapping.registerMapping(
-                        RequestMappingInfo.paths(path).methods(RequestMethod.GET).options(
-                            handlerMapping.getBuilderConfiguration()
-                        ).build(),
-                        this,
-                        handlerMethod
-                    );
-                }
-            );
-        } catch (Exception e) {}
+        this.editorialRegistry.getLangSupport().forEach(
+            (path, supportedLanguages) -> handlerMapping.registerMapping(
+                RequestMappingInfo.paths(path).methods(RequestMethod.GET).options(
+                    handlerMapping.getBuilderConfiguration()
+                ).build(),
+                this,
+                handlerMethod
+            )
+        );
     }
 
 }

src/main/java/tla/web/mvc/GlobalControllerAdvisor.java

@@ -5,7 +5,6 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpStatus;
@@ -27,13 +26,13 @@ public class GlobalControllerAdvisor extends DefaultHandlerExceptionResolver {
 
     public static final BreadCrumb BREADCRUMB_HOME = BreadCrumb.of("/", "menu_global_home");
 
-    @Autowired
     private BuildProperties buildProperties;
 
     private ApplicationProperties applicationProperties;
 
-    public GlobalControllerAdvisor(ApplicationProperties properties) {
+    public GlobalControllerAdvisor(ApplicationProperties properties, BuildProperties buildProperties) {
         this.applicationProperties = properties;
+        this.buildProperties = buildProperties;
     }
 
     @ModelAttribute("env")

src/main/java/tla/web/mvc/LemmaController.java

@@ -3,7 +3,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.MultiValueMap;
@@ -30,18 +29,21 @@
 @TemplateModelName("lemma")
 public class LemmaController extends ObjectController<Lemma, LemmaSearch> {
 
-    @Autowired
     private LemmaService lemmaService;
 
-    @Autowired
     private LemmaSearchProperties searchConfig;
 
-    public static final Script[] SEARCHABLE_SCRIPTS = {
+    public LemmaController(LemmaService lemmaService, LemmaSearchProperties searchConfig) {
+        this.lemmaService = lemmaService;
+        this.searchConfig = searchConfig;
+    }
+
+    static final Script[] SEARCHABLE_SCRIPTS = {
         Script.HIERATIC,
         Script.DEMOTIC
     };
 
-    public static final Language[] SEARCHABLE_TRANSLATION_LANGUAGES = {
+    static final Language[] SEARCHABLE_TRANSLATION_LANGUAGES = {
         Language.DE,
         Language.EN,
         Language.FR
@@ -82,11 +84,10 @@ public String getSearchResultsPage(
 
     @Override
     protected Model extendSearchResultsPageModel(Model model, SearchResults results, SearchCommand<?> searchForm) {
-        if (searchForm instanceof LemmaSearch) {
-            LemmaSearch form = (LemmaSearch) searchForm;
+        if (searchForm instanceof LemmaSearch form) {
             model.addAttribute(
                 "allTranslationLanguages",
-                (form.getTranscription() != null) ? form.getTranslation().getLang() : Collections.EMPTY_LIST
+                (form.getTranscription() != null) ? form.getTranslation().getLang() : Collections.emptyList()
             );
             model.addAttribute("allScripts", form.getScript());
         }

src/main/java/tla/web/mvc/ObjectController.java

@@ -3,6 +3,7 @@
 import static tla.web.mvc.GlobalControllerAdvisor.BREADCRUMB_HOME;
 
 import java.lang.annotation.Annotation;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -60,7 +61,7 @@ public abstract class ObjectController<T extends TLAObject, S extends SearchComm
 
     private String templatePath = null;
 
-    public ObjectController() {
+    ObjectController() {
         controllers.add(this);
     }
 
@@ -70,10 +71,9 @@ public ObjectController() {
      * @return URL path prefix
      */
     public String getRequestMapping() {
-        for (Annotation a : this.getClass().getAnnotationsByType(RequestMapping.class)) {
-            return ((RequestMapping) a).value()[0];
-        }
-        return null;
+        return Arrays.stream(this.getClass().getAnnotationsByType(RequestMapping.class)).map(
+            requestmapping -> requestmapping.value()[0]
+        ).findFirst().orElse(null);
     }
 
     /**
@@ -132,8 +132,8 @@ public static BreadCrumb createLink(Resolvable ref) {
     public String getTemplatePath() {
         if (this.templatePath == null) {
             for (Annotation a : getClass().getAnnotations()) {
-                if (a instanceof TemplateModelName) {
-                    this.templatePath = ((TemplateModelName) a).value();
+                if (a instanceof TemplateModelName tmn) {
+                    this.templatePath = tmn.value();
                 }
             }
         }

src/main/java/tla/web/mvc/SearchController.java

@@ -100,7 +100,7 @@ public String mainSearchPage(
      */
     private Function<String, SearchFormExpansionState> expandFormExpression(MultiValueMap<String, String> params) {
         if (SEARCH_FORMS.stream().anyMatch(
-            key -> params.containsKey(key)
+            params::containsKey
         )) {
             return key -> new SearchFormExpansionState(
                 key, params.containsKey(key)