diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
index 79626cec8058d374c9f335e5b14c311695bccc54..c8da102b5278216dad10af71f35deb36980348b4 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
@@ -25,7 +25,7 @@ public class DatabaseParser
this.jsonString = json;
}
- public Database parseDatabaseFromJSON() throws IllegalArgumentException
+ public InternalDatabase parseDatabaseFromJSON() throws IllegalArgumentException
{
int version = parseVersion();
@@ -80,7 +80,7 @@ public class DatabaseParser
}
}
- private Database upgradeDatabase(BackupDatabase importedDatabase)
+ private InternalDatabase upgradeDatabase(BackupDatabase importedDatabase)
{
BackupDatabase upgradedDatabase = importedDatabase;
while(upgradedDatabase.getVersion() < LATEST_VERSION)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
index bb6ebd041da0d88faa14201b4080aea4916318a5..c2a6bbc8ccc48268b1aedc29f7c431037d8678ad 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseService.java
@@ -253,7 +253,7 @@ public class DatabaseService
List<Image> images = imageService.getRepository().findAll();
LOGGER.debug(MessageFormat.format("Reduced {0} transactions to {1}", transactions.size(), filteredTransactions.size()));
- Database database = new Database(categories, accounts, filteredTransactions, templates, charts, images);
+ InternalDatabase database = new InternalDatabase(categories, accounts, filteredTransactions, templates, charts, images);
LOGGER.debug(MessageFormat.format("Created database for JSON with {0} transactions, {1} categories, {2} accounts, {3} templates, {4} charts and {5} images", database.getTransactions().size(), database.getCategories().size(), database.getAccounts().size(), database.getTemplates().size(), database.getCharts().size(), database.getImages()));
BackupDatabase_v5 databaseInExternalForm = BackupDatabase_v5.createFromInternalEntities(database);
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java b/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
similarity index 90%
rename from src/main/java/de/deadlocker8/budgetmaster/database/Database.java
rename to src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
index 15ead6533389c1255a8ee1378ca04be99627cd6c..9d74f5418bd77f7eaf706911324daf06caa4f526 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/Database.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/InternalDatabase.java
@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-public class Database
+public class InternalDatabase
{
@Expose
private final String TYPE = "BUDGETMASTER_DATABASE";
@@ -41,11 +41,11 @@ public class Database
@Expose
private List<Image> images;
- public Database()
+ public InternalDatabase()
{
}
- public Database(List<Category> categories, List<Account> accounts, List<Transaction> transactions, List<Template> templates, List<Chart> charts, List<Image> images)
+ public InternalDatabase(List<Category> categories, List<Account> accounts, List<Transaction> transactions, List<Template> templates, List<Chart> charts, List<Image> images)
{
this.categories = categories;
this.accounts = accounts;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
index 73f73d9ac4820a964f3bd63e724c851490c9397f..fdb8d0678e9820b7a88110745a819ff741b9208e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/BackupDatabase.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.database.model;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
public interface BackupDatabase
{
@@ -8,5 +8,5 @@ public interface BackupDatabase
BackupDatabase upgrade();
- Database convertToInternal();
+ InternalDatabase convertToInternal();
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
index 9fa806dc9b4a68bd54b8f33595971bc53271ed5e..c53a39c03e135ce6c92c3443bd06d4f9b70fc43b 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v4/BackupDatabase_v4.java
@@ -1,10 +1,8 @@
package de.deadlocker8.budgetmaster.database.model.v4;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
import de.deadlocker8.budgetmaster.database.model.Upgradeable;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupAccount_v5;
-import de.deadlocker8.budgetmaster.database.model.v5.BackupCategory_v5;
import de.deadlocker8.budgetmaster.database.model.v5.BackupDatabase_v5;
import java.util.ArrayList;
@@ -102,7 +100,7 @@ public class BackupDatabase_v4 implements BackupDatabase
}
@Override
- public Database convertToInternal()
+ public InternalDatabase convertToInternal()
{
return null;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
index 7040a7e28e8e5593e912f6e7fa9d9e4cb6ba7fa2..7582b7ef473294852ae33f2b8831b9d84ec35a65 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/model/v5/BackupDatabase_v5.java
@@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.database.model.v5;
import de.deadlocker8.budgetmaster.accounts.Account;
import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.charts.Chart;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.model.BackupDatabase;
import de.deadlocker8.budgetmaster.database.model.Converter;
import de.deadlocker8.budgetmaster.database.model.v5.converter.*;
@@ -99,7 +99,7 @@ public class BackupDatabase_v5 implements BackupDatabase
this.images = images;
}
- public Database convertToInternal()
+ public InternalDatabase convertToInternal()
{
final List<Category> convertedCategories = convertItemsToInternal(categories, new CategoryConverter_v5());
final List<Account> convertedAccounts = convertItemsToInternal(accounts, new AccountConverter_v5());
@@ -108,7 +108,7 @@ public class BackupDatabase_v5 implements BackupDatabase
final List<Chart> convertedCharts = convertItemsToInternal(this.charts, new ChartConverter_v5());
final List<Image> convertedImages = convertItemsToInternal(this.images, new ImageConverter_v5());
- return new Database(convertedCategories, convertedAccounts, convertedTransactions, convertedTemplates, convertedCharts, convertedImages);
+ return new InternalDatabase(convertedCategories, convertedAccounts, convertedTransactions, convertedTemplates, convertedCharts, convertedImages);
}
private <T, S> List<T> convertItemsToInternal(List<S> backupItems, Converter<T, S> converter)
@@ -133,7 +133,7 @@ public class BackupDatabase_v5 implements BackupDatabase
return null;
}
- public static BackupDatabase_v5 createFromInternalEntities(Database database)
+ public static BackupDatabase_v5 createFromInternalEntities(InternalDatabase database)
{
final List<BackupCategory_v5> convertedCategories = convertItemsToExternal(database.getCategories(), new CategoryConverter_v5());
final List<BackupAccount_v5> convertedAccounts = convertItemsToExternal(database.getAccounts(), new AccountConverter_v5());
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
index 67ee1c9d14be4bf840f25f4702b65916a44cd3a2..a8671a0f3cacf463f01da4d878febae279ebd0c1 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/ImportService.java
@@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.categories.CategoryRepository;
import de.deadlocker8.budgetmaster.categories.CategoryType;
import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.charts.ChartService;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatch;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
import de.deadlocker8.budgetmaster.images.Image;
@@ -42,7 +42,7 @@ public class ImportService
private final ImageService imageService;
private final RepeatingTransactionUpdater repeatingTransactionUpdater;
- private Database database;
+ private InternalDatabase database;
private List<String> collectedErrorMessages;
@Autowired
@@ -58,7 +58,7 @@ public class ImportService
this.repeatingTransactionUpdater = repeatingTransactionUpdater;
}
- public List<ImportResultItem> importDatabase(Database database, AccountMatchList accountMatchList, Boolean importTemplates, Boolean importCharts)
+ public List<ImportResultItem> importDatabase(InternalDatabase database, AccountMatchList accountMatchList, Boolean importTemplates, Boolean importCharts)
{
this.database = database;
this.collectedErrorMessages = new ArrayList<>();
@@ -97,7 +97,7 @@ public class ImportService
return importResultItems;
}
- public Database getDatabase()
+ public InternalDatabase getDatabase()
{
return database;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index dca501e392cf9db5887eeb49043ba9163683ad04..58eb4379229d996f06fa55f2854aec0a43842368 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.accounts.AccountService;
import de.deadlocker8.budgetmaster.backup.*;
import de.deadlocker8.budgetmaster.categories.CategoryService;
import de.deadlocker8.budgetmaster.controller.BaseController;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.DatabaseParser;
import de.deadlocker8.budgetmaster.database.DatabaseService;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
@@ -292,7 +292,7 @@ public class SettingsController extends BaseController
{
String jsonString = new String(file.getBytes(), StandardCharsets.UTF_8);
DatabaseParser importer = new DatabaseParser(jsonString);
- Database database = importer.parseDatabaseFromJSON();
+ InternalDatabase database = importer.parseDatabaseFromJSON();
request.setAttribute("database", database, RequestAttributes.SCOPE_SESSION);
return "redirect:/settings/database/import/step1";
@@ -338,7 +338,7 @@ public class SettingsController extends BaseController
@PostMapping("/database/import/step3")
public String importDatabase(WebRequest request, @ModelAttribute("Import") AccountMatchList accountMatchList, Model model)
{
- final Database database = (Database) request.getAttribute("database", RequestAttributes.SCOPE_SESSION);
+ final InternalDatabase database = (InternalDatabase) request.getAttribute("database", RequestAttributes.SCOPE_SESSION);
request.removeAttribute("database", RequestAttributes.SCOPE_SESSION);
final Boolean importTemplates = (Boolean) request.getAttribute("importTemplates", RequestAttributes.SCOPE_SESSION);
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseImportTest.java b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseImportTest.java
index 157aced05cf12a4a3c62a946a3217da1ad330b92..7de5e8ed38edbf0fcef44adceb5ebded5e6c2f8b 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseImportTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseImportTest.java
@@ -9,7 +9,7 @@ import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.charts.ChartRepository;
import de.deadlocker8.budgetmaster.charts.ChartService;
import de.deadlocker8.budgetmaster.charts.ChartType;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatch;
import de.deadlocker8.budgetmaster.database.accountmatches.AccountMatchList;
import de.deadlocker8.budgetmaster.images.Image;
@@ -424,7 +424,7 @@ public class DatabaseImportTest
chart.setScript("/* This list will be dynamically filled with all the transactions between\r\n* the start and and date you select on the \"Show Chart\" page\r\n* and filtered according to your specified filter.\r\n* An example entry for this list and tutorial about how to create custom charts ca be found in the BudgetMaster wiki:\r\n* https://github.com/deadlocker8/BudgetMaster/wiki/How-to-create-custom-charts\r\n*/\r\nvar transactionData \u003d [];\r\n\r\n// Prepare your chart settings here (mandatory)\r\nvar plotlyData \u003d [{\r\n x: [],\r\n y: [],\r\n type: \u0027bar\u0027\r\n}];\r\n\r\n// Add your Plotly layout settings here (optional)\r\nvar plotlyLayout \u003d {};\r\n\r\n// Add your Plotly configuration settings here (optional)\r\nvar plotlyConfig \u003d {\r\n showSendToCloud: false,\r\n displaylogo: false,\r\n showLink: false,\r\n responsive: true\r\n};\r\n\r\n// Don\u0027t touch this line\r\nPlotly.newPlot(\"containerID\", plotlyData, plotlyLayout, plotlyConfig);\r\n");
// database
- Database database = new Database(new ArrayList<>(), accounts, transactions, templates, List.of(chart), List.of());
+ InternalDatabase database = new InternalDatabase(new ArrayList<>(), accounts, transactions, templates, List.of(chart), List.of());
// account matches
AccountMatch match1 = new AccountMatch(sourceAccount1);
@@ -476,7 +476,7 @@ public class DatabaseImportTest
Mockito.when(chartService.getRepository()).thenReturn(chartRepositoryMock);
importService.importDatabase(database, accountMatchList, true, true);
- Database databaseResult = importService.getDatabase();
+ InternalDatabase databaseResult = importService.getDatabase();
// assert
assertThat(databaseResult.getTransactions())
@@ -502,7 +502,7 @@ public class DatabaseImportTest
chart.setScript("/* This list will be dynamically filled with all the transactions between\r\n* the start and and date you select on the \"Show Chart\" page\r\n* and filtered according to your specified filter.\r\n* An example entry for this list and tutorial about how to create custom charts ca be found in the BudgetMaster wiki:\r\n* https://github.com/deadlocker8/BudgetMaster/wiki/How-to-create-custom-charts\r\n*/\r\nvar transactionData \u003d [];\r\n\r\n// Prepare your chart settings here (mandatory)\r\nvar plotlyData \u003d [{\r\n x: [],\r\n y: [],\r\n type: \u0027bar\u0027\r\n}];\r\n\r\n// Add your Plotly layout settings here (optional)\r\nvar plotlyLayout \u003d {};\r\n\r\n// Add your Plotly configuration settings here (optional)\r\nvar plotlyConfig \u003d {\r\n showSendToCloud: false,\r\n displaylogo: false,\r\n showLink: false,\r\n responsive: true\r\n};\r\n\r\n// Don\u0027t touch this line\r\nPlotly.newPlot(\"containerID\", plotlyData, plotlyLayout, plotlyConfig);\r\n");
// database
- Database database = new Database(List.of(), List.of(), List.of(), List.of(), List.of(chart), List.of());
+ InternalDatabase database = new InternalDatabase(List.of(), List.of(), List.of(), List.of(), List.of(chart), List.of());
// act
int highestUsedID = 22;
@@ -511,7 +511,7 @@ public class DatabaseImportTest
Mockito.when(chartService.getRepository()).thenReturn(chartRepositoryMock);
importService.importDatabase(database, new AccountMatchList(List.of()), true, true);
- Database databaseResult = importService.getDatabase();
+ InternalDatabase databaseResult = importService.getDatabase();
// assert
assertThat(databaseResult.getCharts().get(0))
@@ -552,7 +552,7 @@ public class DatabaseImportTest
Mockito.when(imageService.getRepository()).thenReturn(imageRepositoryMock);
Mockito.when(imageRepositoryMock.save(Mockito.any())).thenReturn(newImage);
- Database database = new Database(List.of(), List.of(), List.of(), List.of(), List.of(), List.of(image));
+ InternalDatabase database = new InternalDatabase(List.of(), List.of(), List.of(), List.of(), List.of(), List.of(image));
importService.importDatabase(database, new AccountMatchList(List.of()), true, true);
Image expectedImage = new Image(image.getImage(), image.getFileName(), image.getFileExtension());
@@ -572,7 +572,7 @@ public class DatabaseImportTest
Mockito.when(imageService.getRepository()).thenReturn(imageRepositoryMock);
Mockito.when(imageRepositoryMock.save(Mockito.any())).thenReturn(newImage);
- Database database = new Database(List.of(), List.of(), List.of(), List.of(), List.of(), List.of(image));
+ InternalDatabase database = new InternalDatabase(List.of(), List.of(), List.of(), List.of(), List.of(), List.of(image));
importService.importDatabase(database, new AccountMatchList(List.of()), true, true);
Image expectedImage = new Image(image.getImage(), image.getFileName(), image.getFileExtension());
@@ -619,7 +619,7 @@ public class DatabaseImportTest
template.setTags(new ArrayList<>());
// database
- Database database = new Database(List.of(), List.of(), List.of(), List.of(template), List.of(), List.of());
+ InternalDatabase database = new InternalDatabase(List.of(), List.of(), List.of(), List.of(template), List.of(), List.of());
// act
importService.importDatabase(database, new AccountMatchList(List.of()), false, true);
@@ -638,7 +638,7 @@ public class DatabaseImportTest
chart.setVersion(7);
// database
- Database database = new Database(List.of(), List.of(), List.of(), List.of(), List.of(chart), List.of());
+ InternalDatabase database = new InternalDatabase(List.of(), List.of(), List.of(), List.of(), List.of(chart), List.of());
Mockito.when(chartService.getHighestUsedID()).thenReturn(8);
final ChartRepository chartRepositoryMock = Mockito.mock(ChartRepository.class);
@@ -664,7 +664,7 @@ public class DatabaseImportTest
Mockito.when(categoryRepository.findByNameAndColorAndType(Mockito.eq("Category1"), Mockito.any(), Mockito.any())).thenThrow(new NullPointerException());
Mockito.when(categoryRepository.findByNameAndColorAndType(Mockito.eq("Category2"), Mockito.any(), Mockito.any())).thenReturn(category2);
- Database database = new Database(List.of(category1, category2), List.of(), List.of(), List.of(), List.of(), List.of());
+ InternalDatabase database = new InternalDatabase(List.of(category1, category2), List.of(), List.of(), List.of(), List.of(), List.of());
final List<ImportResultItem> importResultItems = importService.importDatabase(database, new AccountMatchList(List.of()), false, false);
assertThat(importResultItems).hasSize(6)
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 076110a2aa399bbfa15a000c680a838c4fa34b2d..ffcdd5935d267df7cd1c7078f073875adfaa4777 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParserTest.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.unit.database;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.DatabaseParser;
import de.thecodelabs.utils.util.Localization;
import de.thecodelabs.utils.util.Localization.LocalizationDelegate;
@@ -52,7 +52,7 @@ public class DatabaseParserTest
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser importer = new DatabaseParser(json);
- final Database database = importer.parseDatabaseFromJSON();
+ final InternalDatabase database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions())
.hasSize(4);
}
@@ -62,7 +62,7 @@ public class DatabaseParserTest
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v4Test.json").toURI())));
DatabaseParser importer = new DatabaseParser(json);
- final Database database = importer.parseDatabaseFromJSON();
+ final InternalDatabase database = importer.parseDatabaseFromJSON();
assertThat(database.getTransactions())
.hasSize(4);
}
diff --git a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
index 6bf49d2b1308a1961dab731aed8dc5a7f1349ac5..5c4c0acbb3f911753b6878649858d7fd6715807b 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v5Test.java
@@ -6,7 +6,7 @@ import de.deadlocker8.budgetmaster.categories.Category;
import de.deadlocker8.budgetmaster.categories.CategoryType;
import de.deadlocker8.budgetmaster.charts.Chart;
import de.deadlocker8.budgetmaster.charts.ChartType;
-import de.deadlocker8.budgetmaster.database.Database;
+import de.deadlocker8.budgetmaster.database.InternalDatabase;
import de.deadlocker8.budgetmaster.database.DatabaseParser_v5;
import de.deadlocker8.budgetmaster.images.Image;
import de.deadlocker8.budgetmaster.images.ImageFileExtension;
@@ -63,7 +63,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final Chart chart = new Chart("The best chart", "/* This list will be dynamically filled with all the transactions between\r\n* the start and and date you select on the \"Show Chart\" page\r\n* and filtered according to your specified filter.\r\n* An example entry for this list and tutorial about how to create custom charts ca be found in the BudgetMaster wiki:\r\n* https://github.com/deadlocker8/BudgetMaster/wiki/How-to-create-custom-charts\r\n*/\r\nvar transactionData \u003d [];\r\n\r\n// Prepare your chart settings here (mandatory)\r\nvar plotlyData \u003d [{\r\n x: [],\r\n y: [],\r\n type: \u0027bar\u0027\r\n}];\r\n\r\n// Add your Plotly layout settings here (optional)\r\nvar plotlyLayout \u003d {};\r\n\r\n// Add your Plotly configuration settings here (optional)\r\nvar plotlyConfig \u003d {\r\n showSendToCloud: false,\r\n displaylogo: false,\r\n showLink: false,\r\n responsive: true\r\n};\r\n\r\n// Don\u0027t touch this line\r\nPlotly.newPlot(\"containerID\", plotlyData, plotlyLayout, plotlyConfig);\r\n", ChartType.CUSTOM, 7);
chart.setID(9);
@@ -84,7 +84,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final Category category = new Category("0815", "#ffcc00", CategoryType.CUSTOM, "fas fa-icons");
category.setID(3);
@@ -105,7 +105,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final Image accountImage = new Image(new Byte[0], "awesomeIcon.png", ImageFileExtension.PNG);
accountImage.setID(1);
@@ -131,7 +131,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final Image image = new Image(new Byte[0], "awesomeIcon.png", ImageFileExtension.PNG);
image.setID(1);
@@ -155,7 +155,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final Image templateImage = new Image(new Byte[0], "awesomeIcon.png", ImageFileExtension.PNG);
templateImage.setID(1);
@@ -184,7 +184,7 @@ public class DatabaseParser_v5Test
{
String json = new String(Files.readAllBytes(Paths.get(getClass().getClassLoader().getResource("DatabaseParser_v5Test.json").toURI())));
DatabaseParser_v5 importer = new DatabaseParser_v5(json);
- Database database = importer.parseDatabaseFromJSON().convertToInternal();
+ InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
Account account1 = new Account("Default", AccountType.CUSTOM);
account1.setID(2);