From 07a454e2270b7bb71b22dc3471fac9b273da5940 Mon Sep 17 00:00:00 2001 From: MK13 Date: Mon, 11 Mar 2019 22:11:24 +0100 Subject: [PATCH] Various cleanups according to code check --- src/main/java/de/financer/ResponseReason.java | 2 +- src/main/java/de/financer/config/FinancerConfig.java | 2 +- src/main/java/de/financer/model/AccountStatus.java | 2 +- src/main/java/de/financer/model/AccountType.java | 2 +- src/main/java/de/financer/model/HolidayWeekendType.java | 2 +- src/main/java/de/financer/model/IntervalType.java | 2 +- src/main/java/de/financer/service/AccountService.java | 6 +++--- .../de/financer/service/RecurringTransactionService.java | 4 ++-- src/main/java/de/financer/service/TransactionService.java | 2 +- .../financer/task/SendRecurringTransactionReminderTask.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/financer/ResponseReason.java b/src/main/java/de/financer/ResponseReason.java index 8da8a29..35d12e4 100644 --- a/src/main/java/de/financer/ResponseReason.java +++ b/src/main/java/de/financer/ResponseReason.java @@ -34,6 +34,6 @@ public enum ResponseReason { } public ResponseEntity toResponseEntity() { - return new ResponseEntity(this.name(), this.httpStatus); + return new ResponseEntity<>(this.name(), this.httpStatus); } } diff --git a/src/main/java/de/financer/config/FinancerConfig.java b/src/main/java/de/financer/config/FinancerConfig.java index a9371cd..3e8a5f6 100644 --- a/src/main/java/de/financer/config/FinancerConfig.java +++ b/src/main/java/de/financer/config/FinancerConfig.java @@ -41,7 +41,7 @@ public class FinancerConfig { * via {@link FinancerConfig#getCountryCode}. */ public HolidayCalendar getHolidayCalendar() { - final Optional optionalHoliday = Arrays.asList(HolidayCalendar.values()).stream() + final Optional optionalHoliday = Arrays.stream(HolidayCalendar.values()) .filter((hc) -> hc.getId().equals(this.countryCode)) .findFirst(); diff --git a/src/main/java/de/financer/model/AccountStatus.java b/src/main/java/de/financer/model/AccountStatus.java index 60ced16..a60151f 100644 --- a/src/main/java/de/financer/model/AccountStatus.java +++ b/src/main/java/de/financer/model/AccountStatus.java @@ -4,5 +4,5 @@ public enum AccountStatus { /** Indicates that the account is open for bookings */ OPEN, /** Indicates that the account is closed and bookings to it are forbidden */ - CLOSED; + CLOSED } diff --git a/src/main/java/de/financer/model/AccountType.java b/src/main/java/de/financer/model/AccountType.java index b4e20d2..007146b 100644 --- a/src/main/java/de/financer/model/AccountType.java +++ b/src/main/java/de/financer/model/AccountType.java @@ -28,6 +28,6 @@ public enum AccountType { * @return whether the given type represents a valid account type */ public static boolean isValidType(String type) { - return Arrays.asList(AccountType.values()).stream().anyMatch((accountType) -> accountType.name().equals(type)); + return Arrays.stream(AccountType.values()).anyMatch((accountType) -> accountType.name().equals(type)); } } diff --git a/src/main/java/de/financer/model/HolidayWeekendType.java b/src/main/java/de/financer/model/HolidayWeekendType.java index 6c1b883..b25cbdb 100644 --- a/src/main/java/de/financer/model/HolidayWeekendType.java +++ b/src/main/java/de/financer/model/HolidayWeekendType.java @@ -60,6 +60,6 @@ public enum HolidayWeekendType { * @return whether the given type represents a valid holiday weekend type */ public static boolean isValidType(String type) { - return Arrays.asList(HolidayWeekendType.values()).stream().anyMatch((holidayWeekendType) -> holidayWeekendType.name().equals(type)); + return Arrays.stream(HolidayWeekendType.values()).anyMatch((holidayWeekendType) -> holidayWeekendType.name().equals(type)); } } diff --git a/src/main/java/de/financer/model/IntervalType.java b/src/main/java/de/financer/model/IntervalType.java index 2d64948..952f9b8 100644 --- a/src/main/java/de/financer/model/IntervalType.java +++ b/src/main/java/de/financer/model/IntervalType.java @@ -25,6 +25,6 @@ public enum IntervalType { * @return whether the given type represents a valid interval type */ public static boolean isValidType(String type) { - return Arrays.asList(IntervalType.values()).stream().anyMatch((intervalType) -> intervalType.name().equals(type)); + return Arrays.stream(IntervalType.values()).anyMatch((intervalType) -> intervalType.name().equals(type)); } } diff --git a/src/main/java/de/financer/service/AccountService.java b/src/main/java/de/financer/service/AccountService.java index 7f05956..511dec0 100644 --- a/src/main/java/de/financer/service/AccountService.java +++ b/src/main/java/de/financer/service/AccountService.java @@ -44,14 +44,14 @@ public class AccountService { * @return all possible account types as specified by the {@link AccountType} enumeration, never null */ public Iterable getAccountTypes() { - return Arrays.asList(AccountType.values()).stream().map(AccountType::name).collect(Collectors.toList()); + return Arrays.stream(AccountType.values()).map(AccountType::name).collect(Collectors.toList()); } /** * @return all possible account status as specified by the {@link AccountStatus} enumeration, never null */ public Iterable getAccountStatus() { - return Arrays.asList(AccountStatus.values()).stream().map(AccountStatus::name).collect(Collectors.toList()); + return Arrays.stream(AccountStatus.values()).map(AccountStatus::name).collect(Collectors.toList()); } /** @@ -93,7 +93,7 @@ public class AccountService { // If we create an account it's implicitly open account.setStatus(AccountStatus.OPEN); // and has a current balance of 0 - account.setCurrentBalance(Long.valueOf(0l)); + account.setCurrentBalance(Long.valueOf(0L)); try { this.accountRepository.save(account); diff --git a/src/main/java/de/financer/service/RecurringTransactionService.java b/src/main/java/de/financer/service/RecurringTransactionService.java index 6eb27ce..4daf71a 100644 --- a/src/main/java/de/financer/service/RecurringTransactionService.java +++ b/src/main/java/de/financer/service/RecurringTransactionService.java @@ -330,7 +330,7 @@ public class RecurringTransactionService { response = ResponseReason.INVALID_BOOKING_ACCOUNTS; } else if (amount == null) { response = ResponseReason.MISSING_AMOUNT; - } else if (amount == 0l) { + } else if (amount == 0L) { response = ResponseReason.AMOUNT_ZERO; } else if (holidayWeekendType == null) { response = ResponseReason.MISSING_HOLIDAY_WEEKEND_TYPE; @@ -382,7 +382,7 @@ public class RecurringTransactionService { return this.transactionService.createTransaction(recurringTransaction.getFromAccount().getKey(), recurringTransaction.getToAccount().getKey(), - amount.orElseGet(() -> recurringTransaction.getAmount()), + amount.orElseGet(recurringTransaction::getAmount), LocalDate.now().format(DateTimeFormatter.ofPattern(this.financerConfig.getDateFormat())), recurringTransaction.getDescription(), recurringTransaction); diff --git a/src/main/java/de/financer/service/TransactionService.java b/src/main/java/de/financer/service/TransactionService.java index 84ad9aa..6e8865a 100644 --- a/src/main/java/de/financer/service/TransactionService.java +++ b/src/main/java/de/financer/service/TransactionService.java @@ -154,7 +154,7 @@ public class TransactionService { response = ResponseReason.INVALID_BOOKING_ACCOUNTS; } else if (amount == null) { response = ResponseReason.MISSING_AMOUNT; - } else if (amount == 0l) { + } else if (amount == 0L) { response = ResponseReason.AMOUNT_ZERO; } else if (date == null) { response = ResponseReason.MISSING_DATE; diff --git a/src/main/java/de/financer/task/SendRecurringTransactionReminderTask.java b/src/main/java/de/financer/task/SendRecurringTransactionReminderTask.java index 4e003d8..f534e7c 100644 --- a/src/main/java/de/financer/task/SendRecurringTransactionReminderTask.java +++ b/src/main/java/de/financer/task/SendRecurringTransactionReminderTask.java @@ -52,7 +52,7 @@ public class SendRecurringTransactionReminderTask { .append(System.lineSeparator()) .append(System.lineSeparator()); - IterableUtils.toList(recurringTransactions).stream().forEach((rt) -> { + IterableUtils.toList(recurringTransactions).forEach((rt) -> { reminderBuilder.append(rt.getId()) .append("|") .append(rt.getDescription())