From 7abda0caaeb0cdb2790fc4224fe245a1081e3e31 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 2 Mar 2019 16:48:16 +0100 Subject: [PATCH] big refactoring: classes related to filter and database --- .../budgetmaster/{services => database}/DatabaseService.java | 2 +- .../{controller => filter}/FilterController.java | 5 ++--- .../{services => filter}/FilterHelpersService.java | 2 +- .../deadlocker8/budgetmaster/reports/ReportController.java | 1 + .../budgetmaster/settings/SettingsController.java | 3 +-- .../budgetmaster/transactions/TransactionController.java | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) rename src/main/java/de/deadlocker8/budgetmaster/{services => database}/DatabaseService.java (98%) rename src/main/java/de/deadlocker8/budgetmaster/{controller => filter}/FilterController.java (90%) rename src/main/java/de/deadlocker8/budgetmaster/{services => filter}/FilterHelpersService.java (98%) diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java rename to src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java index 602d18ee7..a9d11fcb1 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.services; +package de.deadlocker8.budgetmaster.database; import com.google.gson.*; import de.deadlocker8.budgetmaster.accounts.AccountService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java similarity index 90% rename from src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java rename to src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java index 2a9a9a125..8c7604434 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/FilterController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterController.java @@ -1,8 +1,7 @@ -package de.deadlocker8.budgetmaster.controller; +package de.deadlocker8.budgetmaster.filter; -import de.deadlocker8.budgetmaster.filter.FilterConfiguration; +import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.categories.CategoryService; -import de.deadlocker8.budgetmaster.services.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.transactions.TransactionService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java rename to src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java index 90ff0776b..7f1069c78 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/FilterHelpersService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/filter/FilterHelpersService.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.services; +package de.deadlocker8.budgetmaster.filter; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java index efe0f220a..8d6fc8481 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java @@ -3,6 +3,7 @@ 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.filter.FilterHelpersService; import de.deadlocker8.budgetmaster.settings.SettingsService; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.accounts.Account; diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java index 37b54eeb9..17083fab9 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java @@ -8,10 +8,9 @@ import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.database.Database; import de.deadlocker8.budgetmaster.database.DatabaseParser; +import de.deadlocker8.budgetmaster.database.DatabaseService; import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList; import de.deadlocker8.budgetmaster.categories.CategoryType; -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/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index 8494dc9ad..5510bbee6 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -13,7 +13,7 @@ import de.deadlocker8.budgetmaster.repeating.endoption.*; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifier; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType; import de.deadlocker8.budgetmaster.accounts.AccountService; -import de.deadlocker8.budgetmaster.services.FilterHelpersService; +import de.deadlocker8.budgetmaster.filter.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.tags.TagRepository; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException; -- GitLab