From 73790ac3d0ec5cda095c1c1cc8a64211e46677e7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 13 Dec 2022 21:56:08 +0100
Subject: [PATCH] #725 - refactor: converted Budget to record
---
.../budgetmaster/reports/Budget.java | 21 +------------------
.../reports/ReportGeneratorService.java | 10 ++++-----
.../templates/transactions/transactions.ftl | 4 ++--
3 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
index d3cc29a9b..947f190c0 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/Budget.java
@@ -1,26 +1,7 @@
package de.deadlocker8.budgetmaster.reports;
-public class Budget
+public record Budget(int incomeSum, int expenditureSum)
{
- private int incomeSum;
- private int expenditureSum;
-
- public Budget(int incomeSum, int expenditureSum)
- {
- this.incomeSum = incomeSum;
- this.expenditureSum = expenditureSum;
- }
-
- public int getIncomeSum()
- {
- return incomeSum;
- }
-
- public int getExpenditureSum()
- {
- return expenditureSum;
- }
-
public int getRest()
{
return incomeSum + expenditureSum;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
index 2a3403a97..9d0015713 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/reports/ReportGeneratorService.java
@@ -94,8 +94,8 @@ public class ReportGeneratorService
{
PdfPCell cellTotal;
String total = "";
- String totalIncomeString = currencyService.getCurrencyString(reportConfiguration.getBudget().getIncomeSum());
- String totalExpenditureString = currencyService.getCurrencyString(reportConfiguration.getBudget().getExpenditureSum());
+ String totalIncomeString = currencyService.getCurrencyString(reportConfiguration.getBudget().incomeSum());
+ String totalExpenditureString = currencyService.getCurrencyString(reportConfiguration.getBudget().expenditureSum());
switch(amountType)
{
case BOTH:
@@ -189,11 +189,11 @@ public class ReportGeneratorService
Budget budget = reportConfiguration.getBudget();
Paragraph paragraph = new Paragraph();
- paragraph.add(new Chunk(Localization.getString(Strings.REPORT_INCOMES) + currencyService.getCurrencyString(budget.getIncomeSum()), fontGreen));
+ paragraph.add(new Chunk(Localization.getString(Strings.REPORT_INCOMES) + currencyService.getCurrencyString(budget.incomeSum()), fontGreen));
paragraph.add(new Chunk(" "));
- paragraph.add(new Chunk(Localization.getString(Strings.REPORT_PAYMENTS) + currencyService.getCurrencyString(budget.getExpenditureSum()), fontRed));
+ paragraph.add(new Chunk(Localization.getString(Strings.REPORT_PAYMENTS) + currencyService.getCurrencyString(budget.expenditureSum()), fontRed));
paragraph.add(new Chunk(" "));
- paragraph.add(new Chunk(Localization.getString(Strings.REPORT_BUDGET_REST) + currencyService.getCurrencyString(budget.getIncomeSum() + budget.getExpenditureSum()), fontBlack));
+ paragraph.add(new Chunk(Localization.getString(Strings.REPORT_BUDGET_REST) + currencyService.getCurrencyString(budget.incomeSum() + budget.expenditureSum()), fontBlack));
paragraph.setAlignment(Element.ALIGN_JUSTIFIED);
final Paragraph paragraphBudgetHeadline = new Paragraph(Localization.getString(Strings.REPORT_BUDGET), headerFont);
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl
index 009899eac..0715b56c9 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactions.ftl
@@ -26,13 +26,13 @@
<div class="col s4">
<div class="icon-block center-align">
<img class="budget-headline-icon" src="<@s.url '/images/piggy_income.svg'/>">
- <h5 class="budget">${currencyService.getCurrencyString(budget.getIncomeSum())}</h5>
+ <h5 class="budget">${currencyService.getCurrencyString(budget.incomeSum())}</h5>
</div>
</div>
<div class="col s4">
<div class="icon-block center-align">
<img class="budget-headline-icon" src="<@s.url '/images/piggy_expenditure.svg'/>">
- <h5 class="center budget">${currencyService.getCurrencyString(budget.getExpenditureSum())}</h5>
+ <h5 class="center budget">${currencyService.getCurrencyString(budget.expenditureSum())}</h5>
</div>
</div>
<div class="col s4">
--
GitLab