diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java index 2421aa373ba4f6c906a2450d738e01a2c7892e1a..8aaee465fbe3d63ff0ca80fe24392fa920ebc939 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java +++ b/src/main/java/de/deadlocker8/budgetmaster/charts/DefaultCharts.java @@ -7,7 +7,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.URL; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; public class DefaultCharts @@ -50,6 +49,9 @@ public class DefaultCharts getChartFromFile("charts/IncomesAndExpendituresPerYearBar.js"), ChartType.DEFAULT, 2); + private DefaultCharts() + { + } public static List<Chart> getDefaultCharts() { diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java index 6238fd52715e37ab1d6f3acaaba2b5323018c1c4..26f437d33982551eb50043ab0d9844b3d5f196ac 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java @@ -15,7 +15,7 @@ import java.util.Optional; public class SettingsService { private final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private SettingsRepository settingsRepository; + private final SettingsRepository settingsRepository; @Autowired private SettingsService settingsService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java b/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java index 79735537adfe0bba97c42e4f647d2bb0619f5822..18ba745530393602270bd22a69dd2dcb98b375d6 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java +++ b/src/main/java/de/deadlocker8/budgetmaster/tags/TagScheduler.java @@ -16,9 +16,9 @@ public class TagScheduler { private final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); - private TagRepository tagRepository; - private TransactionRepository transactionRepository; - private TemplateRepository templateRepository; + private final TagRepository tagRepository; + private final TransactionRepository transactionRepository; + private final TemplateRepository templateRepository; @Autowired public TagScheduler(TagRepository tagRepository, TransactionRepository transactionRepository, TemplateRepository templateRepository) diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java index bb59ed57afa5d00552a64c943d0eab9c5ab2eae5..16b449615dd68baa385551bcff5fb43a05657cad 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java @@ -2,10 +2,7 @@ package de.deadlocker8.budgetmaster.templates; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.accounts.AccountService; -import de.deadlocker8.budgetmaster.categories.CategoryService; -import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.services.DateService; import de.deadlocker8.budgetmaster.settings.SettingsService; @@ -37,17 +34,15 @@ public class TemplateController extends BaseController private final TransactionService transactionService; private final DateService dateService; private final AccountService accountService; - private final CategoryService categoryService; @Autowired - public TemplateController(TemplateService templateService, SettingsService settingsService, TransactionService transactionService, DateService dateService, AccountService accountService, CategoryService categoryService) + public TemplateController(TemplateService templateService, SettingsService settingsService, TransactionService transactionService, DateService dateService, AccountService accountService) { this.templateService = templateService; this.settingsService = settingsService; this.transactionService = transactionService; this.dateService = dateService; this.accountService = accountService; - this.categoryService = categoryService; } @GetMapping("/templates") diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java index f7733c9d76a187016b1057b236031b4ad0d53dcf..854f8e4a0df44a702da3f82eb6cc6a907be8a2da 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java @@ -1,8 +1,6 @@ package de.deadlocker8.budgetmaster.templates; -import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.tags.Tag; -import de.deadlocker8.budgetmaster.transactions.Transaction; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; @@ -11,8 +9,6 @@ import java.util.List; public interface TemplateRepository extends JpaRepository<Template, Integer>, JpaSpecificationExecutor<Template> { - List<Template> findAllByAccount(Account account); - List<Template> findAllByOrderByTemplateNameAsc(); List<Template> findAllByTagsContaining(Tag tag); diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java index e1204065bcdac6c63a17cb4625cd91cfbeb20886..103e3ca0bdcaf5ad1f91665a8d605d782a44bb24 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java @@ -5,7 +5,6 @@ import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.tags.Tag; import java.util.List; -import java.util.Optional; public interface TransactionBase { diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java index e01e139db02e597096ca78897230c2df6b4e857a..4da6e8dabcbf7ecbd0bef17b8ba729cfe8764ad8 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSearchSpecifications.java @@ -14,6 +14,10 @@ import java.util.List; public class TransactionSearchSpecifications { + private TransactionSearchSpecifications() + { + } + public static Specification<Transaction> withDynamicQuery(final Search search) { return (transaction, query, builder) -> { diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSubmitAction.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSubmitAction.java deleted file mode 100644 index 8923f459d03a29cef969ad7570e4566a5815a3c1..0000000000000000000000000000000000000000 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSubmitAction.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.deadlocker8.budgetmaster.transactions; - -public enum TransactionSubmitAction -{ - SAVE("save"), - TEMPLATE("template"); - - private String actionName; - - TransactionSubmitAction(String actionName) - { - this.actionName = actionName; - } - - public String getActionName() - { - return actionName; - } - - @Override - public String toString() - { - return "TransactionSubmitAction{" + - "actionName='" + actionName + '\'' + - '}'; - } -} diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java index e55e2c5b64a279f19a4ecefb04acf21d7112d2c3..dad14fa6a4c47d97a7665ea881bdba2fe08b19e9 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Colors.java @@ -2,24 +2,28 @@ package de.deadlocker8.budgetmaster.utils; import de.thecodelabs.utils.util.Color; -public class Colors +public class Colors { - // CATEGORIES - public static final Color CATEGORIES_LIGHT_GREY = new Color("#EEEEEE"); - public static final Color CATEGORIES_GREY = new Color("#888888"); - public static final Color CATEGORIES_DARK_GREY = new Color("#333333"); - public static final Color CATEGORIES_LIGHT_YELLOW = new Color(255,241,119); - public static final Color CATEGORIES_YELLOW = new Color(255,204,0); - public static final Color CATEGORIES_ORANGE = new Color(255,149,0); - public static final Color CATEGORIES_RED = new Color(255,59,48); - public static final Color CATEGORIES_DARK_RED = new Color(169,3,41); - public static final Color CATEGORIES_PINK = new Color(255,81,151); - public static final Color CATEGORIES_PURPLE = new Color(155,89,182); - public static final Color CATEGORIES_DARK_PURPLE = new Color(88,86,214); - public static final Color CATEGORIES_BLUE = new Color(0,122,250); - public static final Color CATEGORIES_SOFT_BLUE = new Color("#4F85D6"); - public static final Color CATEGORIES_LIGHT_BLUE = new Color(90,200,250); - public static final Color CATEGORIES_LIGHT_GREEN = new Color(76,217,100); - public static final Color CATEGORIES_LIME_GREEN = new Color("#ABDB64"); - public static final Color CATEGORIES_DARK_GREEN = new Color(46,124,43); + // CATEGORIES + public static final Color CATEGORIES_LIGHT_GREY = new Color("#EEEEEE"); + public static final Color CATEGORIES_GREY = new Color("#888888"); + public static final Color CATEGORIES_DARK_GREY = new Color("#333333"); + public static final Color CATEGORIES_LIGHT_YELLOW = new Color(255, 241, 119); + public static final Color CATEGORIES_YELLOW = new Color(255, 204, 0); + public static final Color CATEGORIES_ORANGE = new Color(255, 149, 0); + public static final Color CATEGORIES_RED = new Color(255, 59, 48); + public static final Color CATEGORIES_DARK_RED = new Color(169, 3, 41); + public static final Color CATEGORIES_PINK = new Color(255, 81, 151); + public static final Color CATEGORIES_PURPLE = new Color(155, 89, 182); + public static final Color CATEGORIES_DARK_PURPLE = new Color(88, 86, 214); + public static final Color CATEGORIES_BLUE = new Color(0, 122, 250); + public static final Color CATEGORIES_SOFT_BLUE = new Color("#4F85D6"); + public static final Color CATEGORIES_LIGHT_BLUE = new Color(90, 200, 250); + public static final Color CATEGORIES_LIGHT_GREEN = new Color(76, 217, 100); + public static final Color CATEGORIES_LIME_GREEN = new Color("#ABDB64"); + public static final Color CATEGORIES_DARK_GREEN = new Color(46, 124, 43); + + private Colors() + { + } } \ No newline at end of file diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java b/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java index 66c88f1c038d3094fa0121c236f44ad44e4d4a3a..2b23c6dac11d2ba3f54d88e34fb702c21d203466 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/LanguageType.java @@ -7,9 +7,9 @@ public enum LanguageType GERMAN("Deutsch", Locale.GERMAN, "german"), ENGLISH("English", Locale.ENGLISH, "english"); - private String name; - private Locale locale; - private String iconName; + private final String name; + private final Locale locale; + private final String iconName; LanguageType(String name, Locale locale, String iconName) { diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java index ed9bc12edf3936c7f0ef4bbaef305ebcc4d98770..2fc6204d21563bfe54a75fcecc6e21e12c571350 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java +++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java @@ -1,57 +1,61 @@ package de.deadlocker8.budgetmaster.utils; -public class Strings -{ - //MISC - public static final String CATEGORY_NONE = "category.none"; - public static final String CATEGORY_REST = "category.rest"; - public static final String VERSION = "version"; - public static final String TITLE_INCOMES = "title.incomes"; - public static final String TITLE_EXPENDITURES = "title.expenditures"; - public static final String TITLE_CATEGORY_BUDGETS = "title.category.budgets"; +public class Strings +{ + //MISC + public static final String CATEGORY_NONE = "category.none"; + public static final String CATEGORY_REST = "category.rest"; + public static final String VERSION = "version"; + public static final String TITLE_INCOMES = "title.incomes"; + public static final String TITLE_EXPENDITURES = "title.expenditures"; + public static final String TITLE_CATEGORY_BUDGETS = "title.category.budgets"; - //ACCOUNT - public static final String ACCOUNT_DEFAULT_NAME = "account.default.name"; + //ACCOUNT + public static final String ACCOUNT_DEFAULT_NAME = "account.default.name"; - //WARNING - public static final String WARNING_EMPTY_CATEGORY_NAME = "warning.empty.category.name"; - public static final String WARNING_EMPTY_ACCOUNT_NAME = "warning.empty.account.name"; - public static final String WARNING_EMPTY_CATEGORY_COLOR = "warning.empty.category.color"; - public static final String WARNING_EMPTY_TRANSACTION_NAME = "warning.empty.transaction.name"; - public static final String WARNING_TRANSACTION_AMOUNT = "warning.transaction.amount"; - public static final String WARNING_EMPTY_TRANSACTION_DATE = "warning.empty.transaction.date"; - public static final String WARNING_SETTINGS_PASSWORD_EMPTY = "warning.settings.password.empty"; - public static final String WARNING_SETTINGS_PASSWORD_LENGTH = "warning.settings.password.length"; - public static final String WARNING_SETTINGS_PASSWORD_CONFIRMATION_EMPTY = "warning.settings.password.confirmation.empty"; - public static final String WARNING_SETTINGS_PASSWORD_CONFIRMATION_WRONG = "warning.settings.password.confirmation.wrong"; - public static final String WARNING_EMPTY_CHART_NAME = "warning.empty.chart.name"; - public static final String WARNING_EMPTY_CHART_SCRIPT = "warning.empty.chart.script"; - public static final String WARNING_EMPTY_NUMBER = "warning.empty.number"; - public static final String WARNING_EMPTY_NUMBER_ZERO_ALLOWED = "warning.empty.number.zero.allowed"; + //WARNING + public static final String WARNING_EMPTY_CATEGORY_NAME = "warning.empty.category.name"; + public static final String WARNING_EMPTY_ACCOUNT_NAME = "warning.empty.account.name"; + public static final String WARNING_EMPTY_CATEGORY_COLOR = "warning.empty.category.color"; + public static final String WARNING_EMPTY_TRANSACTION_NAME = "warning.empty.transaction.name"; + public static final String WARNING_TRANSACTION_AMOUNT = "warning.transaction.amount"; + public static final String WARNING_EMPTY_TRANSACTION_DATE = "warning.empty.transaction.date"; + public static final String WARNING_SETTINGS_PASSWORD_EMPTY = "warning.settings.password.empty"; + public static final String WARNING_SETTINGS_PASSWORD_LENGTH = "warning.settings.password.length"; + public static final String WARNING_SETTINGS_PASSWORD_CONFIRMATION_EMPTY = "warning.settings.password.confirmation.empty"; + public static final String WARNING_SETTINGS_PASSWORD_CONFIRMATION_WRONG = "warning.settings.password.confirmation.wrong"; + public static final String WARNING_EMPTY_CHART_NAME = "warning.empty.chart.name"; + public static final String WARNING_EMPTY_CHART_SCRIPT = "warning.empty.chart.script"; + public static final String WARNING_EMPTY_NUMBER = "warning.empty.number"; + public static final String WARNING_EMPTY_NUMBER_ZERO_ALLOWED = "warning.empty.number.zero.allowed"; - //REPORT - public static final String REPORT_FOOTER_LEFT = "report.footer.left"; - public static final String REPORT_FOOTER_CENTER = "report.footer.center"; - public static final String REPORT_POSITION = "report.position"; - public static final String REPORT_DATE = "report.date"; - public static final String REPORT_REPEATING = "report.repeating"; - public static final String REPORT_TRANSFER = "report.transfer"; - public static final String REPORT_CATEGORY = "report.category"; - public static final String REPORT_NAME = "report.name"; - public static final String REPORT_DESCRIPTION = "report.description"; - public static final String REPORT_TAGS = "report.tags"; - public static final String REPORT_ACCOUNT = "report.account"; - public static final String REPORT_RATING = "report.rating"; - public static final String REPORT_AMOUNT = "report.amount"; - public static final String REPORT_HEADLINE = "report.headline"; - public static final String REPORT_HEADLINE_ACCOUNT = "report.headline.account"; - public static final String REPORT_HEADLINE_TRANSACTIONS_OVERVIEW = "report.headline.transactions.overview"; - public static final String REPORT_SUM_TOTAL = "report.sum.total"; - public static final String REPORT_SUM = "report.sum"; - public static final String REPORT_REPEATING_YES ="report.repeating.yes"; - public static final String REPORT_REPEATING_NO ="report.repeating.no"; - public static final String REPORT_BUDGET = "report.budget"; - public static final String REPORT_INCOMES = "report.incomes"; - public static final String REPORT_PAYMENTS = "report.expenditures"; - public static final String REPORT_BUDGET_REST = "report.budget.rest"; + //REPORT + public static final String REPORT_FOOTER_LEFT = "report.footer.left"; + public static final String REPORT_FOOTER_CENTER = "report.footer.center"; + public static final String REPORT_POSITION = "report.position"; + public static final String REPORT_DATE = "report.date"; + public static final String REPORT_REPEATING = "report.repeating"; + public static final String REPORT_TRANSFER = "report.transfer"; + public static final String REPORT_CATEGORY = "report.category"; + public static final String REPORT_NAME = "report.name"; + public static final String REPORT_DESCRIPTION = "report.description"; + public static final String REPORT_TAGS = "report.tags"; + public static final String REPORT_ACCOUNT = "report.account"; + public static final String REPORT_RATING = "report.rating"; + public static final String REPORT_AMOUNT = "report.amount"; + public static final String REPORT_HEADLINE = "report.headline"; + public static final String REPORT_HEADLINE_ACCOUNT = "report.headline.account"; + public static final String REPORT_HEADLINE_TRANSACTIONS_OVERVIEW = "report.headline.transactions.overview"; + public static final String REPORT_SUM_TOTAL = "report.sum.total"; + public static final String REPORT_SUM = "report.sum"; + public static final String REPORT_REPEATING_YES = "report.repeating.yes"; + public static final String REPORT_REPEATING_NO = "report.repeating.no"; + public static final String REPORT_BUDGET = "report.budget"; + public static final String REPORT_INCOMES = "report.incomes"; + public static final String REPORT_PAYMENTS = "report.expenditures"; + public static final String REPORT_BUDGET_REST = "report.budget.rest"; + + private Strings() + { + } } \ No newline at end of file