From 494099de69ca84d34c8c76b812acf74d240f156e Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 2 Mar 2019 16:39:35 +0100 Subject: [PATCH] big refactoring: classes related to accounts --- .../{entities/account => accounts}/Account.java | 2 +- .../{controller => accounts}/AccountController.java | 8 ++------ .../{repositories => accounts}/AccountRepository.java | 4 +--- .../{services => accounts}/AccountService.java | 6 ++---- .../de/deadlocker8/budgetmaster/accounts/AccountType.java | 7 +++++++ .../{validators => accounts}/AccountValidator.java | 2 +- .../de/deadlocker8/budgetmaster/authentication/User.java | 2 +- .../budgetmaster/authentication/UserService.java | 2 +- .../budgetmaster/controller/ReportController.java | 4 ++-- .../budgetmaster/controller/SettingsController.java | 1 + .../de/deadlocker8/budgetmaster/database/Database.java | 2 +- .../budgetmaster/database/DatabaseParser_v3.java | 2 +- .../database/accountmatches/AccountMatch.java | 2 +- .../budgetmaster/database/legacy/LegacyParser.java | 4 ++-- .../budgetmaster/entities/account/AccountType.java | 7 ------- .../budgetmaster/services/DatabaseService.java | 3 ++- .../deadlocker8/budgetmaster/services/HelpersService.java | 7 ++++--- .../budgetmaster/transactions/Transaction.java | 2 +- .../budgetmaster/transactions/TransactionController.java | 2 +- .../budgetmaster/transactions/TransactionRepository.java | 3 +-- .../budgetmaster/transactions/TransactionService.java | 4 ++-- .../transactions/TransactionSpecifications.java | 2 +- .../budgetmaster/transactions/Transaction_.java | 2 +- .../budgetmaster/TransactionRepositoryTest.java | 5 +++-- .../budgetmaster/database/DatabaseImportTest.java | 4 ++-- .../budgetmaster/database/DatabaseParser_v3Test.java | 4 ++-- .../budgetmaster/database/LegacyParserTest.java | 4 ++-- 27 files changed, 46 insertions(+), 51 deletions(-) rename src/main/java/de/deadlocker8/budgetmaster/{entities/account => accounts}/Account.java (97%) rename src/main/java/de/deadlocker8/budgetmaster/{controller => accounts}/AccountController.java (91%) rename src/main/java/de/deadlocker8/budgetmaster/{repositories => accounts}/AccountRepository.java (68%) rename src/main/java/de/deadlocker8/budgetmaster/{services => accounts}/AccountService.java (92%) create mode 100644 src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java rename src/main/java/de/deadlocker8/budgetmaster/{validators => accounts}/AccountValidator.java (91%) delete mode 100644 src/main/java/de/deadlocker8/budgetmaster/entities/account/AccountType.java diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/account/Account.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java similarity index 97% rename from src/main/java/de/deadlocker8/budgetmaster/entities/account/Account.java rename to src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java index 085260279..c3b8626ae 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/entities/account/Account.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/Account.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.entities.account; +package de.deadlocker8.budgetmaster.accounts; import com.google.gson.annotations.Expose; import de.deadlocker8.budgetmaster.transactions.Transaction; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/AccountController.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java similarity index 91% rename from src/main/java/de/deadlocker8/budgetmaster/controller/AccountController.java rename to src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java index cf8d42317..8b610e239 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/AccountController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java @@ -1,11 +1,7 @@ -package de.deadlocker8.budgetmaster.controller; +package de.deadlocker8.budgetmaster.accounts; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; -import de.deadlocker8.budgetmaster.repositories.AccountRepository; -import de.deadlocker8.budgetmaster.services.AccountService; +import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException; -import de.deadlocker8.budgetmaster.validators.AccountValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/AccountRepository.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java similarity index 68% rename from src/main/java/de/deadlocker8/budgetmaster/repositories/AccountRepository.java rename to src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java index ffd550e3c..e21d50c2b 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repositories/AccountRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountRepository.java @@ -1,7 +1,5 @@ -package de.deadlocker8.budgetmaster.repositories; +package de.deadlocker8.budgetmaster.accounts; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java similarity index 92% rename from src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java rename to src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java index 5c9fe2037..13502eb09 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountService.java @@ -1,10 +1,8 @@ -package de.deadlocker8.budgetmaster.services; +package de.deadlocker8.budgetmaster.accounts; import de.deadlocker8.budgetmaster.authentication.User; import de.deadlocker8.budgetmaster.authentication.UserRepository; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; -import de.deadlocker8.budgetmaster.repositories.AccountRepository; +import de.deadlocker8.budgetmaster.services.Resetable; import de.deadlocker8.budgetmaster.transactions.TransactionRepository; import de.deadlocker8.budgetmaster.utils.Strings; import de.thecodelabs.utils.util.Localization; diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java new file mode 100644 index 000000000..5e92633df --- /dev/null +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountType.java @@ -0,0 +1,7 @@ +package de.deadlocker8.budgetmaster.accounts; + + +public enum AccountType +{ + ALL, CUSTOM +} diff --git a/src/main/java/de/deadlocker8/budgetmaster/validators/AccountValidator.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java similarity index 91% rename from src/main/java/de/deadlocker8/budgetmaster/validators/AccountValidator.java rename to src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java index 70bdbda0f..a284ac619 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/validators/AccountValidator.java +++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountValidator.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.validators; +package de.deadlocker8.budgetmaster.accounts; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.utils.Strings; diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java index 0781ae4ab..c70d64f6f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java +++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/User.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.authentication; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import javax.persistence.*; import javax.validation.constraints.NotNull; diff --git a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java index 4d5b32531..e904e2e03 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/authentication/UserService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.authentication; import de.deadlocker8.budgetmaster.ProgramArgs; -import de.deadlocker8.budgetmaster.services.AccountService; +import de.deadlocker8.budgetmaster.accounts.AccountService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java index 6237f6b00..776c4ffbe 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java @@ -3,8 +3,8 @@ package de.deadlocker8.budgetmaster.controller; import com.itextpdf.text.DocumentException; import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.transactions.Transaction; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.entities.report.ReportColumn; import de.deadlocker8.budgetmaster.entities.report.ReportSettings; import de.deadlocker8.budgetmaster.filter.FilterConfiguration; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java index 11f77dd2a..d35c5b115 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java @@ -1,6 +1,7 @@ package de.deadlocker8.budgetmaster.controller; import de.deadlocker8.budgetmaster.Build; +import de.deadlocker8.budgetmaster.accounts.AccountService; import de.deadlocker8.budgetmaster.authentication.User; import de.deadlocker8.budgetmaster.authentication.UserRepository; import de.deadlocker8.budgetmaster.categories.CategoryService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java b/src/main/java/de/deadlocker8/budgetmaster/database/Database.java index 00fb17d14..c272bed06 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/Database.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database; import com.google.gson.annotations.Expose; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.transactions.Transaction; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java index 428e63687..af8ee9271 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database; import com.google.gson.*; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.entities.tag.Tag; import de.deadlocker8.budgetmaster.transactions.Transaction; diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java b/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java index a3c7a937d..6b0858317 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/accountmatches/AccountMatch.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.database.accountmatches; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; public class AccountMatch { diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/legacy/LegacyParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/legacy/LegacyParser.java index 45435430e..9fd7406fa 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/database/legacy/LegacyParser.java +++ b/src/main/java/de/deadlocker8/budgetmaster/database/legacy/LegacyParser.java @@ -5,8 +5,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import de.deadlocker8.budgetmaster.database.Database; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.transactions.Transaction; diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/account/AccountType.java b/src/main/java/de/deadlocker8/budgetmaster/entities/account/AccountType.java deleted file mode 100644 index b2bc80771..000000000 --- a/src/main/java/de/deadlocker8/budgetmaster/entities/account/AccountType.java +++ /dev/null @@ -1,7 +0,0 @@ -package de.deadlocker8.budgetmaster.entities.account; - - -public enum AccountType -{ - ALL, CUSTOM -} diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java index 6b1bc8e51..34b1ef8f8 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/DatabaseService.java @@ -1,9 +1,10 @@ package de.deadlocker8.budgetmaster.services; import com.google.gson.*; +import de.deadlocker8.budgetmaster.accounts.AccountService; import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.database.Database; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java index bef574862..84f718068 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java @@ -1,15 +1,16 @@ 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.entities.tag.Tag; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.filter.FilterConfiguration; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierType; -import de.deadlocker8.budgetmaster.repositories.AccountRepository; +import de.deadlocker8.budgetmaster.accounts.AccountRepository; import de.deadlocker8.budgetmaster.categories.CategoryRepository; import de.deadlocker8.budgetmaster.repositories.SettingsRepository; import de.deadlocker8.budgetmaster.repositories.TagRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java index 01d7d9dbb..24962d0f6 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java @@ -2,7 +2,7 @@ package de.deadlocker8.budgetmaster.transactions; import com.google.gson.annotations.Expose; import de.deadlocker8.budgetmaster.entities.tag.Tag; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import org.joda.time.DateTime; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index 459050fe9..97f214c17 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -11,7 +11,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.repositories.*; -import de.deadlocker8.budgetmaster.services.AccountService; +import de.deadlocker8.budgetmaster.accounts.AccountService; import de.deadlocker8.budgetmaster.services.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java index c1ba078fe..18c29775f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionRepository.java @@ -1,8 +1,7 @@ package de.deadlocker8.budgetmaster.transactions; import de.deadlocker8.budgetmaster.entities.tag.Tag; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.transactions.Transaction; +import de.deadlocker8.budgetmaster.accounts.Account; import org.joda.time.DateTime; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java index 6cf787632..9009297c2 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.transactions; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.services.Resetable; import de.deadlocker8.budgetmaster.filter.FilterConfiguration; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java index 4ad46d0e7..2a3999bb5 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionSpecifications.java @@ -1,6 +1,6 @@ package de.deadlocker8.budgetmaster.transactions; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import org.joda.time.DateTime; import org.springframework.data.jpa.domain.Specification; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java index 46f82af15..9020515ea 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction_.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.transactions; import de.deadlocker8.budgetmaster.entities.tag.Tag; -import de.deadlocker8.budgetmaster.entities.account.Account; +import de.deadlocker8.budgetmaster.accounts.Account; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import org.joda.time.DateTime; diff --git a/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java b/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java index 16ba74699..740ea316c 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java @@ -1,8 +1,9 @@ package de.deadlocker8.budgetmaster; +import de.deadlocker8.budgetmaster.accounts.AccountRepository; import de.deadlocker8.budgetmaster.categories.CategoryRepository; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.entities.tag.Tag; diff --git a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseImportTest.java b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseImportTest.java index 7d943ddc1..b54e71004 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseImportTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseImportTest.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.entities.tag.Tag; diff --git a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java index 80ded4c3c..a00968459 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java +++ b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.database; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.entities.tag.Tag; diff --git a/src/test/java/de/deadlocker8/budgetmaster/database/LegacyParserTest.java b/src/test/java/de/deadlocker8/budgetmaster/database/LegacyParserTest.java index ff4e76a55..1b7cb4691 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/database/LegacyParserTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/database/LegacyParserTest.java @@ -1,8 +1,8 @@ package de.deadlocker8.budgetmaster.database; import de.deadlocker8.budgetmaster.database.legacy.LegacyParser; -import de.deadlocker8.budgetmaster.entities.account.Account; -import de.deadlocker8.budgetmaster.entities.account.AccountType; +import de.deadlocker8.budgetmaster.accounts.Account; +import de.deadlocker8.budgetmaster.accounts.AccountType; import de.deadlocker8.budgetmaster.categories.Category; import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.entities.tag.Tag; -- GitLab