big refactoring: classes related to reports

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

src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfiguration.java

 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;

src/main/java/de/deadlocker8/budgetmaster/reports/ReportConfigurationBuilder.java

 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;

src/main/java/de/deadlocker8/budgetmaster/controller/ReportController.java → src/main/java/de/deadlocker8/budgetmaster/reports/ReportController.java

-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;

src/main/java/de/deadlocker8/budgetmaster/services/report/ReportGeneratorService.java → src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java

-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;

src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportColumn.java → src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumn.java

-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

src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportColumnRepository.java → src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnRepository.java

-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;

src/main/java/de/deadlocker8/budgetmaster/services/report/ReportColumnService.java → src/main/java/de/deadlocker8/budgetmaster/reports/columns/ReportColumnService.java

-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;

src/main/java/de/deadlocker8/budgetmaster/entities/report/ReportSettings.java → src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettings.java

-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;
 

src/main/java/de/deadlocker8/budgetmaster/repositories/report/ReportSettingsRepository.java → src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsRepository.java

-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;
 
 

src/main/java/de/deadlocker8/budgetmaster/services/report/ReportSettingsService.java → src/main/java/de/deadlocker8/budgetmaster/reports/settings/ReportSettingsService.java

-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;