From 1d4ed36bec313d267da17bc0f70624b0cfe47833 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 22 May 2021 22:43:05 +0200
Subject: [PATCH] #598 - cleanup unused parameter
---
.../budgetmaster/database/DatabaseParser.java | 4 +---
.../settings/SettingsController.java | 3 +--
.../unit/database/DatabaseParserTest.java | 22 ++++---------------
3 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
index 48f6140d9..5917e691f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
@@ -20,12 +20,10 @@ public class DatabaseParser
private final int LATEST_VERSION = 5;
private final String jsonString;
- private final Category categoryNone;
- public DatabaseParser(String json, Category categoryNone)
+ public DatabaseParser(String json)
{
this.jsonString = json;
- this.categoryNone = categoryNone;
}
public Database parseDatabaseFromJSON() throws IllegalArgumentException
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index b03c5b032..2b54747d3 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -5,7 +5,6 @@ import de.deadlocker8.budgetmaster.Build;
import de.deadlocker8.budgetmaster.accounts.AccountService;
import de.deadlocker8.budgetmaster.backup.*;
import de.deadlocker8.budgetmaster.categories.CategoryService;
-import de.deadlocker8.budgetmaster.categories.CategoryType;
import de.deadlocker8.budgetmaster.controller.BaseController;
import de.deadlocker8.budgetmaster.database.Database;
import de.deadlocker8.budgetmaster.database.DatabaseParser;
@@ -291,7 +290,7 @@ public class SettingsController extends BaseController
try
{
String jsonString = new String(file.getBytes(), StandardCharsets.UTF_8);
- DatabaseParser importer = new DatabaseParser(jsonString, categoryService.findByType(CategoryType.NONE));
+ DatabaseParser importer = new DatabaseParser(jsonString);
Database database = importer.parseDatabaseFromJSON();
request.setAttribute("database", database, RequestAttributes.SCOPE_SESSION);
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
index 24773d665..076110a2a 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
@@ -1,7 +1,5 @@
package de.deadlocker8.budgetmaster.unit.database;
-import de.deadlocker8.budgetmaster.categories.Category;
-import de.deadlocker8.budgetmaster.categories.CategoryType;
import de.deadlocker8.budgetmaster.database.Database;
import de.deadlocker8.budgetmaster.database.DatabaseParser;
import de.thecodelabs.utils.util.Localization;
@@ -53,10 +51,7 @@ public class DatabaseParserTest
public void test_v5() throws URISyntaxException, IOException
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
- final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE);
- categoryNone.setID(1);
-
- DatabaseParser importer = new DatabaseParser(json, categoryNone);
+ DatabaseParser importer = new DatabaseParser(json);
final Database database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions())
.hasSize(4);
@@ -66,10 +61,7 @@ public class DatabaseParserTest
public void test_v4() throws URISyntaxException, IOException
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v4Test.json").toURI())));
- final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE);
- categoryNone.setID(1);
-
- DatabaseParser importer = new DatabaseParser(json, categoryNone);
+ DatabaseParser importer = new DatabaseParser(json);
final Database database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions())
.hasSize(4);
@@ -79,10 +71,7 @@ public class DatabaseParserTest
public void test_v3() throws URISyntaxException, IOException
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v3Test.json").toURI())));
- final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE);
- categoryNone.setID(1);
-
- DatabaseParser importer = new DatabaseParser(json, categoryNone);
+ DatabaseParser importer = new DatabaseParser(json);
assertThatThrownBy(importer::parseDatabaseFromJSON)
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("too old");
@@ -92,10 +81,7 @@ public class DatabaseParserTest
public void test_v2() throws URISyntaxException, IOException
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("LegacyParserTest.json").toURI())));
- final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE);
- categoryNone.setID(1);
-
- DatabaseParser importer = new DatabaseParser(json, categoryNone);
+ DatabaseParser importer = new DatabaseParser(json);
assertThatThrownBy(importer::parseDatabaseFromJSON)
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("too old");
--
GitLab