Skip to content
Snippets Groups Projects
Commit 1d4ed36b authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#598 - cleanup unused parameter

parent 10fb7535
No related branches found
No related tags found
No related merge requests found
...@@ -20,12 +20,10 @@ public class DatabaseParser ...@@ -20,12 +20,10 @@ public class DatabaseParser
private final int LATEST_VERSION = 5; private final int LATEST_VERSION = 5;
private final String jsonString; private final String jsonString;
private final Category categoryNone;
public DatabaseParser(String json, Category categoryNone) public DatabaseParser(String json)
{ {
this.jsonString = json; this.jsonString = json;
this.categoryNone = categoryNone;
} }
public Database parseDatabaseFromJSON() throws IllegalArgumentException public Database parseDatabaseFromJSON() throws IllegalArgumentException
......
...@@ -5,7 +5,6 @@ import de.deadlocker8.budgetmaster.Build; ...@@ -5,7 +5,6 @@ import de.deadlocker8.budgetmaster.Build;
import de.deadlocker8.budgetmaster.accounts.AccountService; import de.deadlocker8.budgetmaster.accounts.AccountService;
import de.deadlocker8.budgetmaster.backup.*; import de.deadlocker8.budgetmaster.backup.*;
import de.deadlocker8.budgetmaster.categories.CategoryService; import de.deadlocker8.budgetmaster.categories.CategoryService;
import de.deadlocker8.budgetmaster.categories.CategoryType;
import de.deadlocker8.budgetmaster.controller.BaseController; import de.deadlocker8.budgetmaster.controller.BaseController;
import de.deadlocker8.budgetmaster.database.Database; import de.deadlocker8.budgetmaster.database.Database;
import de.deadlocker8.budgetmaster.database.DatabaseParser; import de.deadlocker8.budgetmaster.database.DatabaseParser;
...@@ -291,7 +290,7 @@ public class SettingsController extends BaseController ...@@ -291,7 +290,7 @@ public class SettingsController extends BaseController
try try
{ {
String jsonString = new String(file.getBytes(), StandardCharsets.UTF_8); 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(); Database database = importer.parseDatabaseFromJSON();
request.setAttribute("database", database, RequestAttributes.SCOPE_SESSION); request.setAttribute("database", database, RequestAttributes.SCOPE_SESSION);
......
package de.deadlocker8.budgetmaster.unit.database; 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.Database;
import de.deadlocker8.budgetmaster.database.DatabaseParser; import de.deadlocker8.budgetmaster.database.DatabaseParser;
import de.thecodelabs.utils.util.Localization; import de.thecodelabs.utils.util.Localization;
...@@ -53,10 +51,7 @@ public class DatabaseParserTest ...@@ -53,10 +51,7 @@ public class DatabaseParserTest
public void test_v5() throws URISyntaxException, IOException public void test_v5() throws URISyntaxException, IOException
{ {
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI()))); String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE); DatabaseParser importer = new DatabaseParser(json);
categoryNone.setID(1);
DatabaseParser importer = new DatabaseParser(json, categoryNone);
final Database database = importer.parseDatabaseFromJSON(); final Database database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions()) assertThat(database.getTransactions())
.hasSize(4); .hasSize(4);
...@@ -66,10 +61,7 @@ public class DatabaseParserTest ...@@ -66,10 +61,7 @@ public class DatabaseParserTest
public void test_v4() throws URISyntaxException, IOException public void test_v4() throws URISyntaxException, IOException
{ {
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v4Test.json").toURI()))); String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v4Test.json").toURI())));
final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE); DatabaseParser importer = new DatabaseParser(json);
categoryNone.setID(1);
DatabaseParser importer = new DatabaseParser(json, categoryNone);
final Database database = importer.parseDatabaseFromJSON(); final Database database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions()) assertThat(database.getTransactions())
.hasSize(4); .hasSize(4);
...@@ -79,10 +71,7 @@ public class DatabaseParserTest ...@@ -79,10 +71,7 @@ public class DatabaseParserTest
public void test_v3() throws URISyntaxException, IOException public void test_v3() throws URISyntaxException, IOException
{ {
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v3Test.json").toURI()))); String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v3Test.json").toURI())));
final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE); DatabaseParser importer = new DatabaseParser(json);
categoryNone.setID(1);
DatabaseParser importer = new DatabaseParser(json, categoryNone);
assertThatThrownBy(importer::parseDatabaseFromJSON) assertThatThrownBy(importer::parseDatabaseFromJSON)
.isInstanceOf(IllegalArgumentException.class) .isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("too old"); .hasMessageContaining("too old");
...@@ -92,10 +81,7 @@ public class DatabaseParserTest ...@@ -92,10 +81,7 @@ public class DatabaseParserTest
public void test_v2() throws URISyntaxException, IOException public void test_v2() throws URISyntaxException, IOException
{ {
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("LegacyParserTest.json").toURI()))); String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("LegacyParserTest.json").toURI())));
final Category categoryNone = new Category("NONE", "#FFFFFF", CategoryType.NONE); DatabaseParser importer = new DatabaseParser(json);
categoryNone.setID(1);
DatabaseParser importer = new DatabaseParser(json, categoryNone);
assertThatThrownBy(importer::parseDatabaseFromJSON) assertThatThrownBy(importer::parseDatabaseFromJSON)
.isInstanceOf(IllegalArgumentException.class) .isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("too old"); .hasMessageContaining("too old");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment