diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java index b5c37d09dc4da47b7d902a628bead9b8aca6b04e..c558660499a052a5ab83c8ad9cd368a0e40793fb 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java @@ -210,7 +210,7 @@ public class DatabaseService .map(Path::toString) .filter(path -> path.endsWith(".json")) .sorted() - .collect(Collectors.toList()); + .toList(); } catch(IOException e) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java b/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java index 9fcb7495fd5c6f640f9929f3342b200e51556030..dd1f3368d5801760cd029f88bed8e0dc78a1c7aa 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java @@ -91,7 +91,7 @@ public class InternalDatabase final List<Account> customAccounts = accounts.stream() .filter(account -> account.getType() == AccountType.CUSTOM) - .collect(Collectors.toList()); + .toList(); numberOfEntitiesByType.put(EntityType.ACCOUNT, customAccounts.size()); numberOfEntitiesByType.put(EntityType.TRANSACTION, transactions.size()); diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java index 03942f52e0ac79c5ef5d29e7d7ad60a44436442c..482bcc2d6c3a40d9efea843f1e2854081e17b733 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v6/BackupDatabase_v6.java @@ -134,7 +134,7 @@ public class BackupDatabase_v6 implements BackupDatabase List<BackupIcon_v7> castedIcons = newIcons.stream() .map(BackupIcon_v7.class::cast) - .collect(Collectors.toList()); + .toList(); upgradedDatabase.setIcons(castedIcons); return upgradedDatabase; diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java index b36a2af297b4b5dbfc2b9899d695e4f7fba40313..f6468263f4897e6faf6c549a4afaacc8527b0a3a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java @@ -100,12 +100,12 @@ public class ReportSettings public List<ReportColumn> getColumnsSorted() { - return columns.stream().sorted(Comparator.comparing(ReportColumn::getPosition)).collect(Collectors.toList()); + return columns.stream().sorted(Comparator.comparing(ReportColumn::getPosition)).toList(); } public List<ReportColumn> getColumnsSortedAndFiltered() { - return columns.stream().filter(ReportColumn::isActivated).sorted(Comparator.comparing(ReportColumn::getPosition)).collect(Collectors.toList()); + return columns.stream().filter(ReportColumn::isActivated).sorted(Comparator.comparing(ReportColumn::getPosition)).toList(); } public List<ReportColumn> getColumns() diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java index 0870489e255792538a40363c5e534e825c76250b..58d6bb0e1210d967ff15bea857ee7514ad985a1c 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java @@ -312,7 +312,7 @@ public class TransactionService implements Resettable .map(Transaction::getName) .distinct() .limit(MAX_SUGGESTIONS) - .collect(Collectors.toList()); + .toList(); model.addAttribute(TransactionModelAttributes.SUGGESTIONS_JSON, GSON.toJson(nameSuggestions)); } } diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java b/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java index 7deb6a9341a3be84a95d4a4762b6991cd6219db8..12f85efbe788c0d300b57c6c50d7384546fccfef 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/types/MonthNames.java @@ -3,7 +3,6 @@ package de.deadlocker8.budgetmaster.utils.types; import de.thecodelabs.utils.util.Localization; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; public enum MonthNames @@ -37,6 +36,6 @@ public enum MonthNames { return Stream.of(MonthNames.values()) .map(monthName -> Localization.getString(monthName.getKey())) - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java b/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java index ccc7411a94feb7525a96816cc47499984ca9992b..c098f61348b15e52a54686a5486b0ca8ee46824a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java @@ -3,7 +3,6 @@ package de.deadlocker8.budgetmaster.utils.types; import de.thecodelabs.utils.util.Localization; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; public enum WeekDay @@ -32,6 +31,6 @@ public enum WeekDay { return Stream.of(WeekDay.values()) .map(weekDay -> Localization.getString(weekDay.getKey())) - .collect(Collectors.toList()); + .toList(); } } diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java index 083e80bcfec45a7f604a364490eadd65d31534d2..2f790b17f151a6cebd900800d3b9e015a441b0c8 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/EnsureAllIconizableHaveAnIconInstanceTest.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; @ActiveProfiles("test") @SeleniumTest @Transactional -public class EnsureAllIconizableHaveAnIconInstanceTest +class EnsureAllIconizableHaveAnIconInstanceTest { @TestConfiguration static class TestDatabaseConfiguration