From 13d5eecd52004c33d88bd00958e80ff08b4203aa Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 29 May 2022 11:05:27 +0200
Subject: [PATCH] fixed deprecation warnings
---
.../budgetmaster/accounts/AccountController.java | 4 ++--
.../de/deadlocker8/budgetmaster/charts/ChartController.java | 4 ++--
.../budgetmaster/templategroup/TemplateGroupController.java | 2 +-
.../budgetmaster/templates/TemplateController.java | 2 +-
.../budgetmaster/templates/TemplateRepository.java | 1 -
.../budgetmaster/transactions/TransactionController.java | 6 +++---
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index c97ea17f2..705bb7484 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -98,7 +98,7 @@ public class AccountController extends BaseController
public String requestDeleteAccount(Model model, @PathVariable("ID") Integer ID)
{
model.addAttribute(ModelAttributes.ALL_ENTITIES, accountService.getAllEntitiesAsc());
- model.addAttribute(ModelAttributes.ENTITY_TO_DELETE, accountService.getRepository().getById(ID));
+ model.addAttribute(ModelAttributes.ENTITY_TO_DELETE, accountService.getRepository().getReferenceById(ID));
return ReturnValues.DELETE_ENTITY;
}
@@ -106,7 +106,7 @@ public class AccountController extends BaseController
public String deleteAccountAndReferringTransactions(WebRequest request, Model model, @PathVariable("ID") Integer ID)
{
// at least one account is required (to delete a sole account another one has to be created first)
- final Account accountToDelete = accountService.getRepository().getById(ID);
+ final Account accountToDelete = accountService.getRepository().getReferenceById(ID);
if(accountService.getRepository().findAllByType(AccountType.CUSTOM).size() > 1)
{
accountService.deleteAccount(ID);
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
index 88e4d83a2..4f2376475 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
@@ -243,7 +243,7 @@ public class ChartController extends BaseController
}
model.addAttribute(ModelAttributes.ALL_ENTITIES, chartService.getAllEntitiesAsc());
- model.addAttribute(ModelAttributes.ENTITY_TO_DELETE, chartService.getRepository().getById(ID));
+ model.addAttribute(ModelAttributes.ENTITY_TO_DELETE, chartService.getRepository().getReferenceById(ID));
return ReturnValues.DELETE_ENTITY;
}
@@ -252,7 +252,7 @@ public class ChartController extends BaseController
{
if(chartService.isDeletable(ID))
{
- final Chart chartToDelete = chartService.getRepository().getById(ID);
+ final Chart chartToDelete = chartService.getRepository().getReferenceById(ID);
chartService.getRepository().deleteById(ID);
WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.chart.delete.success", chartToDelete.getName()), NotificationType.SUCCESS));
}
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
index da470d698..0f4ad11cb 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templategroup/TemplateGroupController.java
@@ -75,7 +75,7 @@ public class TemplateGroupController extends BaseController
@GetMapping("/{ID}/delete")
public String deleteTemplateGroup(WebRequest request, @PathVariable("ID") Integer ID)
{
- final TemplateGroup templateGroupToDelete = templateGroupService.getRepository().getById(ID);
+ final TemplateGroup templateGroupToDelete = templateGroupService.getRepository().getReferenceById(ID);
templateGroupService.deleteTemplateGroup(ID);
WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.template.group.delete.success", templateGroupToDelete.getName()), NotificationType.SUCCESS));
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index 8e8dfe510..d56959c70 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -125,7 +125,7 @@ public class TemplateController extends BaseController
@GetMapping("/{ID}/delete")
public String deleteTemplate(WebRequest request, @PathVariable("ID") Integer ID)
{
- final Template templateToDelete = templateService.getRepository().getById(ID);
+ final Template templateToDelete = templateService.getRepository().getReferenceById(ID);
templateService.getRepository().deleteById(ID);
WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.template.delete.success", templateToDelete.getTemplateName()), NotificationType.SUCCESS));
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
index 9b0607e1c..65671c46e 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateRepository.java
@@ -2,7 +2,6 @@ package de.deadlocker8.budgetmaster.templates;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.tags.Tag;
-import de.deadlocker8.budgetmaster.transactions.Transaction;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index 3c0eb8f48..c8f919d1f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -103,7 +103,7 @@ public class TransactionController extends BaseController
LocalDate date = dateService.getDateTimeFromCookie(cookieDate);
prepareModelTransactions(filterHelpers.getFilterConfiguration(request), model, date);
- model.addAttribute(TransactionModelAttributes.ENTITY_TO_DELETE, transactionService.getRepository().getById(ID));
+ model.addAttribute(TransactionModelAttributes.ENTITY_TO_DELETE, transactionService.getRepository().getReferenceById(ID));
return ReturnValues.DELETE_ENTITY;
}
@@ -123,7 +123,7 @@ public class TransactionController extends BaseController
@GetMapping("/{ID}/delete")
public String deleteTransaction(WebRequest request, @PathVariable("ID") Integer ID)
{
- final Transaction transactionToDelete = transactionService.getRepository().getById(ID);
+ final Transaction transactionToDelete = transactionService.getRepository().getReferenceById(ID);
transactionService.deleteTransaction(ID);
WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.transaction.delete.success", transactionToDelete.getName()), NotificationType.SUCCESS));
@@ -289,7 +289,7 @@ public class TransactionController extends BaseController
@GetMapping("/{ID}/highlight")
public String highlight(Model model, @PathVariable("ID") Integer ID)
{
- Transaction transaction = transactionService.getRepository().getById(ID);
+ Transaction transaction = transactionService.getRepository().getReferenceById(ID);
Account currentAccount = helpers.getCurrentAccount();
if(currentAccount.getType() != AccountType.ALL || transaction.isTransfer())
--
GitLab