From 0ad1de9caf61aa7df0e174f17898ecb17d3857f6 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 30 Oct 2021 17:34:09 +0200
Subject: [PATCH] cleanup
---
.../budgetmaster/controller/BackupController.java | 3 +--
.../budgetmaster/controller/NewsEntry.java | 10 +++++-----
.../budgetmaster/templates/TemplateService.java | 13 +------------
.../deadlocker8/budgetmaster/utils/DateHelper.java | 4 ++++
4 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
index 620ae0eb5..0fe89af14 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/BackupController.java
@@ -4,7 +4,6 @@ import de.deadlocker8.budgetmaster.settings.SettingsService;
import de.deadlocker8.budgetmaster.utils.Mappings;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
@@ -23,7 +22,7 @@ public class BackupController extends BaseController
}
@RequestMapping("/cancel")
- public String cancel(HttpServletRequest request, Model model)
+ public String cancel(HttpServletRequest request)
{
settingsService.updateLastBackupReminderDate();
return "redirect:" + request.getHeader("Referer");
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
index f6806c830..3931b65fd 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/NewsEntry.java
@@ -15,15 +15,15 @@ public class NewsEntry
this.description = description;
}
- public static NewsEntry createWithLocalizationKeys(String headlineKey, String descriptionKey)
+ public static NewsEntry createWithLocalizationKey(String shortKey)
{
- return new NewsEntry(Localization.getString(headlineKey), Localization.getString(descriptionKey));
+ return createWithLocalizationKeys(MessageFormat.format("news.{0}.headline", shortKey),
+ MessageFormat.format("news.{0}.description", shortKey));
}
- public static NewsEntry createWithLocalizationKey(String shortKey)
+ public static NewsEntry createWithLocalizationKeys(String headlineKey, String descriptionKey)
{
- return new NewsEntry(Localization.getString(MessageFormat.format("news.{0}.headline", shortKey)),
- Localization.getString(MessageFormat.format("news.{0}.description", shortKey)));
+ return new NewsEntry(Localization.getString(headlineKey), Localization.getString(descriptionKey));
}
public String getHeadline()
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
index 6b5d8cc06..3a8aa8d6b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
@@ -7,18 +7,13 @@ import de.deadlocker8.budgetmaster.accounts.AccountService;
import de.deadlocker8.budgetmaster.accounts.AccountState;
import de.deadlocker8.budgetmaster.categories.CategoryService;
import de.deadlocker8.budgetmaster.categories.CategoryType;
-import de.deadlocker8.budgetmaster.icon.IconService;
-import de.deadlocker8.budgetmaster.images.ImageService;
import de.deadlocker8.budgetmaster.services.AccessAllEntities;
import de.deadlocker8.budgetmaster.services.AccessEntityByID;
import de.deadlocker8.budgetmaster.services.Resettable;
-import de.deadlocker8.budgetmaster.settings.SettingsService;
import de.deadlocker8.budgetmaster.transactions.Transaction;
import de.deadlocker8.budgetmaster.transactions.TransactionBase;
import de.deadlocker8.budgetmaster.utils.FontAwesomeIcons;
import org.padler.natorder.NaturalOrderComparator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
@@ -31,8 +26,6 @@ import java.util.stream.Collectors;
@Service
public class TemplateService implements Resettable, AccessAllEntities<Template>, AccessEntityByID<Template>
{
- private static final Logger LOGGER = LoggerFactory.getLogger(TemplateService.class);
-
private static final Gson GSON = new GsonBuilder()
.setPrettyPrinting()
.create();
@@ -40,17 +33,13 @@ public class TemplateService implements Resettable, AccessAllEntities<Template>,
private final TemplateRepository templateRepository;
private final AccountService accountService;
private final CategoryService categoryService;
- private final ImageService imageService;
- private final IconService iconService;
@Autowired
- public TemplateService(TemplateRepository templateRepository, AccountService accountService, CategoryService categoryService, SettingsService settingsService, ImageService imageService, IconService iconService)
+ public TemplateService(TemplateRepository templateRepository, AccountService accountService, CategoryService categoryService)
{
this.templateRepository = templateRepository;
this.accountService = accountService;
this.categoryService = categoryService;
- this.imageService = imageService;
- this.iconService = iconService;
createDefaults();
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java b/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
index 0392eb885..908481639 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/DateHelper.java
@@ -7,6 +7,10 @@ import java.util.TimeZone;
public class DateHelper
{
+ private DateHelper()
+ {
+ }
+
public static DateTime getCurrentDate()
{
return DateTime.now(DateTimeZone.forTimeZone(TimeZone.getDefault()));
--
GitLab