diff --git a/src/main/java/de/focus_shift/launchpad/core/LaunchpadControllerAdvice.java b/src/main/java/de/focus_shift/launchpad/core/LaunchpadControllerAdvice.java index d26fc9e..f183813 100644 --- a/src/main/java/de/focus_shift/launchpad/core/LaunchpadControllerAdvice.java +++ b/src/main/java/de/focus_shift/launchpad/core/LaunchpadControllerAdvice.java @@ -1,7 +1,5 @@ package de.focus_shift.launchpad.core; -import static java.util.stream.Collectors.toList; - import de.focus_shift.launchpad.api.HasLaunchpad; import java.util.List; import java.util.Locale; @@ -30,7 +28,7 @@ public void addAttributes(Model model, Locale locale, Authentication authenticat app -> new AppDto( app.getUrl().toString(), app.getAppName().get(locale), app.getIcon())) - .collect(toList()); + .toList(); if (!appDtos.isEmpty()) { model.addAttribute("launchpad", new LaunchpadDto(appDtos)); diff --git a/src/main/java/de/focus_shift/launchpad/core/LaunchpadDto.java b/src/main/java/de/focus_shift/launchpad/core/LaunchpadDto.java index 6fcb597..28378ee 100644 --- a/src/main/java/de/focus_shift/launchpad/core/LaunchpadDto.java +++ b/src/main/java/de/focus_shift/launchpad/core/LaunchpadDto.java @@ -1,35 +1,5 @@ package de.focus_shift.launchpad.core; import java.util.List; -import java.util.Objects; -class LaunchpadDto { - - private final List apps; - - LaunchpadDto(List apps) { - this.apps = apps; - } - - public List getApps() { - return apps; - } - - @Override - public String toString() { - return "LaunchpadDto{" + "apps=" + apps + '}'; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - LaunchpadDto that = (LaunchpadDto) o; - return Objects.equals(apps, that.apps); - } - - @Override - public int hashCode() { - return Objects.hash(apps); - } -} +record LaunchpadDto(List apps) {} diff --git a/src/main/java/de/focus_shift/launchpad/core/LaunchpadServiceImpl.java b/src/main/java/de/focus_shift/launchpad/core/LaunchpadServiceImpl.java index 3682bc2..2cdd435 100644 --- a/src/main/java/de/focus_shift/launchpad/core/LaunchpadServiceImpl.java +++ b/src/main/java/de/focus_shift/launchpad/core/LaunchpadServiceImpl.java @@ -1,7 +1,6 @@ package de.focus_shift.launchpad.core; import static java.lang.invoke.MethodHandles.lookup; -import static java.util.stream.Collectors.toList; import de.focus_shift.launchpad.api.LaunchpadAppUrlCustomizer; import java.net.MalformedURLException; @@ -37,7 +36,7 @@ private List getApplications(Authentication authentication) { .filter(Optional::isPresent) .flatMap(Optional::stream) .filter(app -> isAllowed(app, authentication)) - .collect(toList()); + .toList(); } private boolean isAllowed(App app, Authentication authentication) {