From 83fa643c3eb14f2219398ecb3153eebd6ac95bd1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 3 Aug 2021 23:07:15 +0200
Subject: [PATCH] replaced deprecated methods

---
 .../budgetmaster/accounts/AccountController.java            | 4 ++--
 .../de/deadlocker8/budgetmaster/charts/ChartController.java | 4 ++--
 .../budgetmaster/templates/TemplateController.java          | 2 +-
 .../budgetmaster/transactions/TransactionController.java    | 6 +++---
 .../budgetmaster/unit/TransactionServiceDatabaseTest.java   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
index 79a913970..d4942b683 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/accounts/AccountController.java
@@ -76,7 +76,7 @@ public class AccountController extends BaseController
 	public String requestDeleteAccount(Model model, @PathVariable("ID") Integer ID)
 	{
 		model.addAttribute("accounts", accountService.getAllEntitiesAsc());
-		model.addAttribute("accountToDelete", accountService.getRepository().getOne(ID));
+		model.addAttribute("accountToDelete", accountService.getRepository().getById(ID));
 		return "accounts/deleteAccountModal";
 	}
 
@@ -84,7 +84,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().getOne(ID);
+		final Account accountToDelete = accountService.getRepository().getById(ID);
 		if(accountService.getRepository().findAllByType(AccountType.CUSTOM).size() > 1)
 		{
 			accountService.deleteAccount(ID);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
index a0d26a869..f987972bb 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/charts/ChartController.java
@@ -170,7 +170,7 @@ public class ChartController extends BaseController
 		}
 
 		model.addAttribute("charts", chartService.getAllEntitiesAsc());
-		model.addAttribute("chartToDelete", chartService.getRepository().getOne(ID));
+		model.addAttribute("chartToDelete", chartService.getRepository().getById(ID));
 		return "charts/deleteChartModal";
 	}
 
@@ -179,7 +179,7 @@ public class ChartController extends BaseController
 	{
 		if(chartService.isDeletable(ID))
 		{
-			final Chart chartToDelete = chartService.getRepository().getOne(ID);
+			final Chart chartToDelete = chartService.getRepository().getById(ID);
 			chartService.getRepository().deleteById(ID);
 			WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.chart.delete.success", chartToDelete.getName()), NotificationType.SUCCESS));
 		}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index d5206a55c..f2ffc45f2 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -108,7 +108,7 @@ public class TemplateController extends BaseController
 	@GetMapping("/{ID}/delete")
 	public String deleteTemplate(WebRequest request, @PathVariable("ID") Integer ID)
 	{
-		final Template templateToDelete = templateService.getRepository().getOne(ID);
+		final Template templateToDelete = templateService.getRepository().getById(ID);
 		templateService.getRepository().deleteById(ID);
 
 		WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.template.delete.success", templateToDelete.getTemplateName()), NotificationType.SUCCESS));
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
index b3c68ce7c..6fc12e7d3 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java
@@ -86,7 +86,7 @@ public class TransactionController extends BaseController
 
 		DateTime date = dateService.getDateTimeFromCookie(cookieDate);
 		prepareModelTransactions(filterHelpers.getFilterConfiguration(request), model, date);
-		model.addAttribute("transactionToDelete", transactionService.getRepository().getOne(ID));
+		model.addAttribute("transactionToDelete", transactionService.getRepository().getById(ID));
 
 		return "transactions/deleteTransactionModal";
 	}
@@ -106,7 +106,7 @@ public class TransactionController extends BaseController
 	@GetMapping("/{ID}/delete")
 	public String deleteTransaction(WebRequest request, @PathVariable("ID") Integer ID)
 	{
-		final Transaction transactionToDelete = transactionService.getRepository().getOne(ID);
+		final Transaction transactionToDelete = transactionService.getRepository().getById(ID);
 		transactionService.deleteTransaction(ID);
 
 		WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.transaction.delete.success", transactionToDelete.getName()), NotificationType.SUCCESS));
@@ -285,7 +285,7 @@ public class TransactionController extends BaseController
 	@GetMapping("/{ID}/highlight")
 	public String highlight(Model model, @PathVariable("ID") Integer ID)
 	{
-		Transaction transaction = transactionService.getRepository().getOne(ID);
+		Transaction transaction = transactionService.getRepository().getById(ID);
 
 		Account currentAccount = helpers.getCurrentAccount();
 		if(currentAccount.getType() != AccountType.ALL || transaction.isTransfer())
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
index 0c6f2eb89..04b5c605d 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/TransactionServiceDatabaseTest.java
@@ -71,8 +71,8 @@ class TransactionServiceDatabaseTest
 		DateTime date1 = DateTime.parse("2020-04-30", DateTimeFormat.forPattern("yyyy-MM-dd"));
 		FilterConfiguration filterConfiguration = new FilterConfiguration(true, true, true, true, true, null, null, "");
 
-		Transaction transaction1 = transactionService.getRepository().getOne(37);  // normal transaction
-		Transaction transaction2 = transactionService.getRepository().getOne(9);  //transfer
+		Transaction transaction1 = transactionService.getRepository().getById(37);  // normal transaction
+		Transaction transaction2 = transactionService.getRepository().getById(9);  // transfer
 
 		List<Transaction> transactions = transactionService.getTransactionsForAccount(accountService.getRepository().findByName("Second Account"), date1, DateTime.now(), filterConfiguration);
 		assertThat(transactions).hasSize(2)
-- 
GitLab