From 9bead62744330604dab4c28ae715afb54a78b245 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 9 Feb 2022 21:34:47 +0100
Subject: [PATCH] Refactoring: use toList for stream collection
---
.../de/deadlocker8/budgetmaster/database/DatabaseService.java | 2 +-
.../deadlocker8/budgetmaster/database/InternalDatabase.java | 2 +-
.../budgetmaster/database/model/v6/BackupDatabase_v6.java | 2 +-
.../budgetmaster/reports/settings/ReportSettings.java | 4 ++--
.../budgetmaster/transactions/TransactionService.java | 2 +-
.../de/deadlocker8/budgetmaster/utils/types/MonthNames.java | 3 +--
.../java/de/deadlocker8/budgetmaster/utils/types/WeekDay.java | 3 +--
.../EnsureAllIconizableHaveAnIconInstanceTest.java | 2 +-
8 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
index b5c37d09d..c55866049 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 9fcb7495f..dd1f3368d 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 03942f52e..482bcc2d6 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 b36a2af29..f6468263f 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 0870489e2..58d6bb0e1 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 7deb6a934..12f85efbe 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 ccc7411a9..c098f6134 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 083e80bcf..2f790b17f 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
--
GitLab