diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/RepeatingOptionRepository.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java similarity index 87% rename from src/main/java/de/deadlocker8/budgetmaster/repositories/RepeatingOptionRepository.java rename to src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java index 2da609239f4743c3c3f8e1fa88ad46e96925ebf5..25e9a63fc2463a30e8b453fbf3ac6df0850dedb4 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repositories/RepeatingOptionRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingOptionRepository.java @@ -1,4 +1,4 @@ -package de.deadlocker8.budgetmaster.repositories; +package de.deadlocker8.budgetmaster.repeating; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java index 4cf89932bd9a2b73db2323352fef2daa374185c7..71e2a47b1f2ad6ccb34c009fe199882be92c5c34 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java +++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/RepeatingTransactionUpdater.java @@ -2,7 +2,6 @@ package de.deadlocker8.budgetmaster.repeating; import de.deadlocker8.budgetmaster.transactions.Transaction; import de.deadlocker8.budgetmaster.transactions.TransactionRepository; -import de.deadlocker8.budgetmaster.repositories.RepeatingOptionRepository; import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.transactions.TransactionService; import org.joda.time.DateTime; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java rename to src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java index ec76d674c2f5dcbebb89ab3e3b59fa889f08a10d..37b54eeb999776710a71f2867c8dadc62cc45c9f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java @@ -1,10 +1,11 @@ -package de.deadlocker8.budgetmaster.controller; +package de.deadlocker8.budgetmaster.settings; 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; +import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.database.Database; import de.deadlocker8.budgetmaster.database.DatabaseParser; import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList; diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java index 3bd6098af38b8d2bd51b2db4b84961e0685fd619..5fa2d0482baf6fa0668ed164e483c750f5456630 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsRepository.java @@ -1,6 +1,5 @@ package de.deadlocker8.budgetmaster.settings; -import de.deadlocker8.budgetmaster.settings.Settings; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java index a5dbcaabdc655320e18e501150f15dddd21f1af2..5af5198091ba40f4417d1526541192c5facc85b1 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java @@ -1,7 +1,5 @@ package de.deadlocker8.budgetmaster.settings; -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/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index f10eb3e169a5c47d4e872ffac4dc867d93e37a87..8494dc9add271262df74164c07b99f9ccd9d638f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -2,6 +2,7 @@ package de.deadlocker8.budgetmaster.transactions; import de.deadlocker8.budgetmaster.categories.CategoryRepository; import de.deadlocker8.budgetmaster.controller.BaseController; +import de.deadlocker8.budgetmaster.repeating.RepeatingOptionRepository; import de.deadlocker8.budgetmaster.settings.Settings; import de.deadlocker8.budgetmaster.settings.SettingsRepository; import de.deadlocker8.budgetmaster.tags.Tag; @@ -11,7 +12,6 @@ import de.deadlocker8.budgetmaster.repeating.RepeatingTransactionUpdater; 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.accounts.AccountService; import de.deadlocker8.budgetmaster.services.FilterHelpersService; import de.deadlocker8.budgetmaster.services.HelpersService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java index 9009297c23ce67feaeee1b9e5c1763b163ff5715..31d3e4234fbb28cfa3977757a6db785cfb7133bd 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java @@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.categories.CategoryType; import de.deadlocker8.budgetmaster.services.Resetable; import de.deadlocker8.budgetmaster.filter.FilterConfiguration; import de.deadlocker8.budgetmaster.categories.CategoryRepository; -import de.deadlocker8.budgetmaster.repositories.RepeatingOptionRepository; +import de.deadlocker8.budgetmaster.repeating.RepeatingOptionRepository; import de.deadlocker8.budgetmaster.utils.Strings; import de.thecodelabs.utils.util.Localization; 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 5f48b9b76864fe2e96494bd7aa90a59e661d9c13..0c702d24e5affc69cb7616c76da58fa8dde37dda 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/TransactionRepositoryTest.java @@ -6,6 +6,7 @@ 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.repeating.RepeatingOptionRepository; import de.deadlocker8.budgetmaster.tags.Tag; import de.deadlocker8.budgetmaster.tags.TagRepository; import de.deadlocker8.budgetmaster.transactions.Transaction; @@ -14,7 +15,6 @@ import de.deadlocker8.budgetmaster.transactions.TransactionSpecifications; import de.deadlocker8.budgetmaster.repeating.RepeatingOption; import de.deadlocker8.budgetmaster.repeating.endoption.RepeatingEndAfterXTimes; import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierDays; -import de.deadlocker8.budgetmaster.repositories.*; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.junit.Before;