From de4befc42e5d9722b8c4a0d5e889b0285a0b0f69 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 2 Mar 2019 16:45:44 +0100
Subject: [PATCH] big refactoring: classes related to settings

---
 .../deadlocker8/budgetmaster/advices/SettingsAdvice.java   | 4 ++--
 .../budgetmaster/controller/DatePickerController.java      | 4 ++--
 .../budgetmaster/controller/SettingsController.java        | 4 ++--
 .../deadlocker8/budgetmaster/reports/ReportController.java | 5 +----
 .../deadlocker8/budgetmaster/services/HelpersService.java  | 5 +++--
 .../budgetmaster/services/LocalizationService.java         | 1 +
 .../budgetmaster/{entities => settings}/Settings.java      | 7 +------
 .../{repositories => settings}/SettingsRepository.java     | 4 ++--
 .../{services => settings}/SettingsService.java            | 6 +++---
 .../de/deadlocker8/budgetmaster/tags/TagRepository.java    | 1 -
 .../budgetmaster/transactions/TransactionController.java   | 3 ++-
 .../budgetmaster/update/BudgetMasterUpdateService.java     | 2 +-
 12 files changed, 20 insertions(+), 26 deletions(-)
 rename src/main/java/de/deadlocker8/budgetmaster/{entities => settings}/Settings.java (88%)
 rename src/main/java/de/deadlocker8/budgetmaster/{repositories => settings}/SettingsRepository.java (58%)
 rename src/main/java/de/deadlocker8/budgetmaster/{services => settings}/SettingsService.java (82%)

diff --git a/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java b/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
index 88294ca41..a467906c0 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/advices/SettingsAdvice.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.advices;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ModelAttribute;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
index c7cdfb79b..95300f7dc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/DatePickerController.java
@@ -1,7 +1,7 @@
 package de.deadlocker8.budgetmaster.controller;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.services.HelpersService;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
index d35c5b115..ec76d674c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
@@ -9,8 +9,8 @@ import de.deadlocker8.budgetmaster.database.Database;
 import de.deadlocker8.budgetmaster.database.DatabaseParser;
 import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
 import de.deadlocker8.budgetmaster.categories.CategoryType;
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.services.*;
 import de.deadlocker8.budgetmaster.update.BudgetMasterUpdateService;
 import de.deadlocker8.budgetmaster.utils.LanguageType;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
index 4ace89620..efe0f220a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java
@@ -3,19 +3,16 @@ package de.deadlocker8.budgetmaster.reports;
 import com.itextpdf.text.DocumentException;
 import de.deadlocker8.budgetmaster.categories.CategoryService;
 import de.deadlocker8.budgetmaster.controller.BaseController;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.transactions.Transaction;
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.accounts.AccountType;
 import de.deadlocker8.budgetmaster.reports.columns.ReportColumn;
 import de.deadlocker8.budgetmaster.reports.settings.ReportSettings;
 import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
-import de.deadlocker8.budgetmaster.reports.Budget;
-import de.deadlocker8.budgetmaster.reports.ReportConfiguration;
-import de.deadlocker8.budgetmaster.reports.ReportConfigurationBuilder;
 import de.deadlocker8.budgetmaster.reports.categoryBudget.CategoryBudgetHandler;
 import de.deadlocker8.budgetmaster.services.*;
 import de.deadlocker8.budgetmaster.reports.columns.ReportColumnService;
-import de.deadlocker8.budgetmaster.reports.ReportGeneratorService;
 import de.deadlocker8.budgetmaster.reports.settings.ReportSettingsService;
 import de.deadlocker8.budgetmaster.transactions.TransactionService;
 import de.thecodelabs.utils.util.Localization;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 6024996a5..0de8b5083 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -2,7 +2,8 @@ package de.deadlocker8.budgetmaster.services;
 
 import de.deadlocker8.budgetmaster.accounts.AccountService;
 import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatch;
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.deadlocker8.budgetmaster.tags.Tag;
 import de.deadlocker8.budgetmaster.accounts.Account;
 import de.deadlocker8.budgetmaster.accounts.AccountType;
@@ -12,7 +13,7 @@ import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
 import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType;
 import de.deadlocker8.budgetmaster.accounts.AccountRepository;
 import de.deadlocker8.budgetmaster.categories.CategoryRepository;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.tags.TagRepository;
 import de.deadlocker8.budgetmaster.transactions.TransactionService;
 import de.deadlocker8.budgetmaster.update.BudgetMasterUpdateService;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
index b09d0bd1d..f86a16ae5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
@@ -1,5 +1,6 @@
 package de.deadlocker8.budgetmaster.services;
 
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.thecodelabs.utils.util.Localization;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
similarity index 88%
rename from src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
index e42e868a2..0424e31f6 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/Settings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
@@ -1,14 +1,9 @@
-package de.deadlocker8.budgetmaster.entities;
+package de.deadlocker8.budgetmaster.settings;
 
 import de.deadlocker8.budgetmaster.utils.LanguageType;
-import javafx.scene.paint.Color;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 
 @Entity
 public class Settings
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
similarity index 58%
rename from src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
index 43e2267e6..3bd6098af 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/repositories/SettingsRepository.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java
@@ -1,6 +1,6 @@
-package de.deadlocker8.budgetmaster.repositories;
+package de.deadlocker8.budgetmaster.settings;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
similarity index 82%
rename from src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java
rename to src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
index 43599d987..a5dbcaabd 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/SettingsService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
@@ -1,7 +1,7 @@
-package de.deadlocker8.budgetmaster.services;
+package de.deadlocker8.budgetmaster.settings;
 
-import de.deadlocker8.budgetmaster.entities.Settings;
-import de.deadlocker8.budgetmaster.repositories.SettingsRepository;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java b/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
index 0c4e6205e..49e546d80 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/tags/TagRepository.java
@@ -1,6 +1,5 @@
 package de.deadlocker8.budgetmaster.tags;
 
-import de.deadlocker8.budgetmaster.tags.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index f932af67a..f10eb3e16 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -2,7 +2,8 @@ package de.deadlocker8.budgetmaster.transactions;
 
 import de.deadlocker8.budgetmaster.categories.CategoryRepository;
 import de.deadlocker8.budgetmaster.controller.BaseController;
-import de.deadlocker8.budgetmaster.entities.Settings;
+import de.deadlocker8.budgetmaster.settings.Settings;
+import de.deadlocker8.budgetmaster.settings.SettingsRepository;
 import de.deadlocker8.budgetmaster.tags.Tag;
 import de.deadlocker8.budgetmaster.filter.FilterConfiguration;
 import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
index ae53d6702..bbbc67a8b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/update/BudgetMasterUpdateService.java
@@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.update;
 
 import de.deadlocker8.budgetmaster.Build;
 import de.deadlocker8.budgetmaster.Main;
-import de.deadlocker8.budgetmaster.services.SettingsService;
+import de.deadlocker8.budgetmaster.settings.SettingsService;
 import de.thecodelabs.storage.settings.Storage;
 import de.thecodelabs.storage.settings.StorageTypes;
 import de.thecodelabs.versionizer.VersionizerItem;
-- 
GitLab