From e02b71d9058f130358e411db56e088004e6b3602 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 2 Mar 2019 16:42:32 +0100
Subject: [PATCH] big refactoring: classes related to reports
---
.../budgetmaster/controller/BaseController.java | 2 +-
.../budgetmaster/reports/ReportConfiguration.java | 2 +-
.../reports/ReportConfigurationBuilder.java | 2 +-
.../{controller => reports}/ReportController.java | 13 +++++++------
.../report => reports}/ReportGeneratorService.java | 4 ++--
.../report => reports/columns}/ReportColumn.java | 5 +++--
.../columns}/ReportColumnRepository.java | 3 +--
.../columns}/ReportColumnService.java | 8 ++++----
.../report => reports/settings}/ReportSettings.java | 3 ++-
.../settings}/ReportSettingsRepository.java | 3 +--
.../settings}/ReportSettingsService.java | 10 +++++-----
11 files changed, 28 insertions(+), 27 deletions(-)
rename src/main/java/de/deadlocker8/budgetmaster/{controller => reports}/ReportController.java (91%)
rename src/main/java/de/deadlocker8/budgetmaster/{services/report => reports}/ReportGeneratorService.java (98%)
rename src/main/java/de/deadlocker8/budgetmaster/{entities/report => reports/columns}/ReportColumn.java (91%)
rename src/main/java/de/deadlocker8/budgetmaster/{repositories/report => reports/columns}/ReportColumnRepository.java (71%)
rename src/main/java/de/deadlocker8/budgetmaster/{services/report => reports/columns}/ReportColumnService.java (86%)
rename src/main/java/de/deadlocker8/budgetmaster/{entities/report => reports/settings}/ReportSettings.java (95%)
rename src/main/java/de/deadlocker8/budgetmaster/{repositories/report => reports/settings}/ReportSettingsRepository.java (55%)
rename src/main/java/de/deadlocker8/budgetmaster/{services/report => reports/settings}/ReportSettingsService.java (80%)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/BaseController.java
index ab1dc11ce..f317c20a9 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 e36663215..9ddb3d98f 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 2a7618579..6702e800a 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 776c4ffbe..4ace89620 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 dd663dc77..42f102880 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 1de3e7abb..592e50006 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 cbc6e3930..ed609f2c9 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 903b9c892..bda80eb4d 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 51d8fddd5..9939e192a 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 965ef7d61..3facd66b3 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 8dc4433df..e580690b8 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;
--
GitLab