diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java index ab1dc11ceb5eea08e218fa47d913b9804f438621..f317c20a9451a447c473e599e8ac2860cf71859a 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java @@ -5,5 +5,5 @@ import org.slf4j.LoggerFactory; public abstract class BaseController { - final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + public final Logger LOGGER = LoggerFactory.getLogger(this.getClass()); } \ No newline at end of file diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java index e36663215f56f294db3823ffa701f61baa933e58..9ddb3d98f72f089e31f38ae9222da8b11c40d258 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.reports; +import de.deadlocker8.budgetmaster.reports.settings.ReportSettings; import de.deadlocker8.budgetmaster.transactions.Transaction; -import de.deadlocker8.budgetmaster.entities.report.ReportSettings; import de.deadlocker8.budgetmaster.reports.categoryBudget.CategoryBudget; import java.util.List; diff --git a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java index 2a7618579187f932f811113c5469050e06bae7d2..6702e800a54af1141b65d64855ac8e4b0fe9a3d5 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java @@ -1,7 +1,7 @@ package de.deadlocker8.budgetmaster.reports; +import de.deadlocker8.budgetmaster.reports.settings.ReportSettings; import de.deadlocker8.budgetmaster.transactions.Transaction; -import de.deadlocker8.budgetmaster.entities.report.ReportSettings; import de.deadlocker8.budgetmaster.reports.categoryBudget.CategoryBudget; import java.util.List; diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java similarity index 91% rename from src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java index 776c4ffbebe59839ac57e89bf5e202fa2a7db489..4ace89620fade084f6ca670f132f0cf508910c32 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java @@ -1,21 +1,22 @@ -package de.deadlocker8.budgetmaster.controller; +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.transactions.Transaction; 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.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.services.report.ReportColumnService; -import de.deadlocker8.budgetmaster.services.report.ReportGeneratorService; -import de.deadlocker8.budgetmaster.services.report.ReportSettingsService; +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; import org.joda.time.DateTime; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportGeneratorService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java similarity index 98% rename from src/main/java/de/deadlocker8/budgetmaster/services/report/ReportGeneratorService.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java index dd663dc771f4dd35f6b3f41fd4711b673039f40f..42f102880fff1512b0f083db37515c657b7b990f 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportGeneratorService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java @@ -1,10 +1,10 @@ -package de.deadlocker8.budgetmaster.services.report; +package de.deadlocker8.budgetmaster.reports; import com.itextpdf.text.*; import com.itextpdf.text.pdf.*; import de.deadlocker8.budgetmaster.entities.tag.Tag; import de.deadlocker8.budgetmaster.transactions.Transaction; -import de.deadlocker8.budgetmaster.entities.report.ReportColumn; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumn; import de.deadlocker8.budgetmaster.reports.*; import de.deadlocker8.budgetmaster.reports.categoryBudget.CategoryBudget; import de.deadlocker8.budgetmaster.services.HelpersService; diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportColumn.java b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java similarity index 91% rename from src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportColumn.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java index 1de3e7abb543ba4b46311b3957b86214ee371051..592e500068f0c841873075f7be7fc891f08c79d3 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportColumn.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java @@ -1,7 +1,8 @@ -package de.deadlocker8.budgetmaster.entities.report; +package de.deadlocker8.budgetmaster.reports.columns; + +import de.deadlocker8.budgetmaster.reports.settings.ReportSettings; import javax.persistence.*; -import java.util.List; @Entity public class ReportColumn diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportColumnRepository.java b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java similarity index 71% rename from src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportColumnRepository.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java index cbc6e393053ef25dfbcddf50ba049e23c8500a5b..ed609f2c9c5106d8338e8dc2199ff9a2419b4b3d 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportColumnRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java @@ -1,6 +1,5 @@ -package de.deadlocker8.budgetmaster.repositories.report; +package de.deadlocker8.budgetmaster.reports.columns; -import de.deadlocker8.budgetmaster.entities.report.ReportColumn; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportColumnService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java similarity index 86% rename from src/main/java/de/deadlocker8/budgetmaster/services/report/ReportColumnService.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java index 903b9c892c9f1a8bb6bb4db09566f21b83b579e5..bda80eb4d445a3eedc205e8b5ebb16cb7c264132 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportColumnService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java @@ -1,8 +1,8 @@ -package de.deadlocker8.budgetmaster.services.report; +package de.deadlocker8.budgetmaster.reports.columns; -import de.deadlocker8.budgetmaster.entities.report.ReportColumn; -import de.deadlocker8.budgetmaster.entities.report.ReportSettings; -import de.deadlocker8.budgetmaster.repositories.report.ReportColumnRepository; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumn; +import de.deadlocker8.budgetmaster.reports.settings.ReportSettings; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumnRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportSettings.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java similarity index 95% rename from src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportSettings.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java index 51d8fddd5084377735fa755dabef7f40a2cc778c..9939e192a9b40e1ce7911819b62289d08892510b 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportSettings.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java @@ -1,5 +1,6 @@ -package de.deadlocker8.budgetmaster.entities.report; +package de.deadlocker8.budgetmaster.reports.settings; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumn; import org.joda.time.DateTime; import org.springframework.format.annotation.DateTimeFormat; diff --git a/src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportSettingsRepository.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java similarity index 55% rename from src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportSettingsRepository.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java index 965ef7d61f2315e2a59580108bb8296786c6a8f0..3facd66b3270dceb91386e3d288b47836816978b 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportSettingsRepository.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java @@ -1,6 +1,5 @@ -package de.deadlocker8.budgetmaster.repositories.report; +package de.deadlocker8.budgetmaster.reports.settings; -import de.deadlocker8.budgetmaster.entities.report.ReportSettings; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportSettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java similarity index 80% rename from src/main/java/de/deadlocker8/budgetmaster/services/report/ReportSettingsService.java rename to src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java index 8dc4433df9c7f695d0e092e27dec1bdf49e68b7f..e580690b8ee42c4b6ba7cb29f2913ab09b403048 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/services/report/ReportSettingsService.java +++ b/src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java @@ -1,9 +1,9 @@ -package de.deadlocker8.budgetmaster.services.report; +package de.deadlocker8.budgetmaster.reports.settings; -import de.deadlocker8.budgetmaster.entities.report.ReportColumn; -import de.deadlocker8.budgetmaster.entities.report.ReportSettings; -import de.deadlocker8.budgetmaster.repositories.report.ReportColumnRepository; -import de.deadlocker8.budgetmaster.repositories.report.ReportSettingsRepository; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumn; +import de.deadlocker8.budgetmaster.reports.columns.ReportColumnService; +import de.deadlocker8.budgetmaster.reports.settings.ReportSettings; +import de.deadlocker8.budgetmaster.reports.settings.ReportSettingsRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired;