From bed4c7fcfca1903d21b60d51908dc7d6c41b9e0b Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Sat, 25 Feb 2023 16:44:50 +0100
Subject: [PATCH] #732 - Rename seperator because it is a reserved keyword in
mysql
---
.../converter/CsvImportSettingsConverter.java | 4 ++--
.../csvimport/CsvImportSettings.java | 18 +++++++++---------
.../csvimport/CsvImportSettingsService.java | 6 +++---
.../transactions/transactionImport.ftl | 2 +-
...tabaseParser_v10_convertToInternalTest.java | 2 +-
.../unit/database/ImportServiceTest.java | 2 +-
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CsvImportSettingsConverter.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CsvImportSettingsConverter.java
index fede3a1ce..95e6e4726 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CsvImportSettingsConverter.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/database/model/converter/CsvImportSettingsConverter.java
@@ -14,7 +14,7 @@ public class CsvImportSettingsConverter implements Converter<CsvImportSettings,
}
final CsvImportSettings settings = new CsvImportSettings();
- settings.setSeparator(backupCsvImportSettings.getSeparator());
+ settings.setSeparatorChar(backupCsvImportSettings.getSeparator());
settings.setEncoding(backupCsvImportSettings.getEncoding());
settings.setNumberOfLinesToSkip(backupCsvImportSettings.getNumberOfLinesToSkip());
@@ -37,7 +37,7 @@ public class CsvImportSettingsConverter implements Converter<CsvImportSettings,
}
final BackupCsvImportSettings_v10 settings = new BackupCsvImportSettings_v10();
- settings.setSeparator(internalItem.getSeparator());
+ settings.setSeparator(internalItem.getSeparatorChar());
settings.setEncoding(internalItem.getEncoding());
settings.setNumberOfLinesToSkip(internalItem.getNumberOfLinesToSkip());
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
index 38336fa8b..dfda7609f 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettings.java
@@ -12,7 +12,7 @@ public class CsvImportSettings implements ProvidesID
{
@Id
private Integer ID = 1;
- private String separator;
+ private String separatorChar;
private String encoding;
private int numberOfLinesToSkip;
@@ -33,7 +33,7 @@ public class CsvImportSettings implements ProvidesID
public static CsvImportSettings getDefault()
{
CsvImportSettings defaultSettings = new CsvImportSettings();
- defaultSettings.setSeparator(";");
+ defaultSettings.setSeparatorChar(";");
defaultSettings.setEncoding("UTF-8");
defaultSettings.setNumberOfLinesToSkip(0);
@@ -60,14 +60,14 @@ public class CsvImportSettings implements ProvidesID
this.ID = ID;
}
- public String getSeparator()
+ public String getSeparatorChar()
{
- return separator;
+ return separatorChar;
}
- public void setSeparator(String separator)
+ public void setSeparatorChar(String separator)
{
- this.separator = separator;
+ this.separatorChar = separator;
}
public String getEncoding()
@@ -166,13 +166,13 @@ public class CsvImportSettings implements ProvidesID
if(this == o) return true;
if(o == null || getClass() != o.getClass()) return false;
CsvImportSettings settings = (CsvImportSettings) o;
- return ID == settings.ID && numberOfLinesToSkip == settings.numberOfLinesToSkip && Objects.equals(separator, settings.separator) && Objects.equals(encoding, settings.encoding) && Objects.equals(columnDate, settings.columnDate) && Objects.equals(datePattern, settings.datePattern) && Objects.equals(columnName, settings.columnName) && Objects.equals(columnAmount, settings.columnAmount) && Objects.equals(decimalSeparator, settings.decimalSeparator) && Objects.equals(groupingSeparator, settings.groupingSeparator) && Objects.equals(columnDescription, settings.columnDescription);
+ return ID == settings.ID && numberOfLinesToSkip == settings.numberOfLinesToSkip && Objects.equals(separatorChar, settings.separatorChar) && Objects.equals(encoding, settings.encoding) && Objects.equals(columnDate, settings.columnDate) && Objects.equals(datePattern, settings.datePattern) && Objects.equals(columnName, settings.columnName) && Objects.equals(columnAmount, settings.columnAmount) && Objects.equals(decimalSeparator, settings.decimalSeparator) && Objects.equals(groupingSeparator, settings.groupingSeparator) && Objects.equals(columnDescription, settings.columnDescription);
}
@Override
public int hashCode()
{
- return Objects.hash(ID, separator, encoding, numberOfLinesToSkip, columnDate, datePattern, columnName, columnAmount, decimalSeparator, groupingSeparator, columnDescription);
+ return Objects.hash(ID, separatorChar, encoding, numberOfLinesToSkip, columnDate, datePattern, columnName, columnAmount, decimalSeparator, groupingSeparator, columnDescription);
}
@Override
@@ -180,7 +180,7 @@ public class CsvImportSettings implements ProvidesID
{
return "CsvImportSettings{" +
"ID=" + ID +
- ", separator='" + separator + '\'' +
+ ", separator='" + separatorChar + '\'' +
", encoding='" + encoding + '\'' +
", numberOfLinesToSkip=" + numberOfLinesToSkip +
", columnDate=" + columnDate +
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
index f2fcfb2ae..de0bb0125 100644
--- a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
+++ b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/transactions/csvimport/CsvImportSettingsService.java
@@ -32,7 +32,7 @@ public class CsvImportSettingsService
if(csvImportSettingsRepository.findById(1).isEmpty())
{
csvImportSettingsRepository.save(CsvImportSettings.getDefault());
- LOGGER.debug("Created default settings");
+ LOGGER.debug("Created default csv import settings");
}
}
@@ -47,7 +47,7 @@ public class CsvImportSettingsService
final CsvImportSettings settings = getCsvImportSettings();
if(hasContent(csvImport.separator()))
{
- settings.setSeparator(csvImport.separator());
+ settings.setSeparatorChar(csvImport.separator());
}
if(hasContent(csvImport.encoding()))
@@ -90,7 +90,7 @@ public class CsvImportSettingsService
{
final CsvImportSettings settings = getCsvImportSettings();
- settings.setSeparator(newSettings.getSeparator());
+ settings.setSeparatorChar(newSettings.getSeparatorChar());
settings.setEncoding(newSettings.getEncoding());
settings.setNumberOfLinesToSkip(newSettings.getNumberOfLinesToSkip());
settings.setColumnDate(newSettings.getColumnDate());
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
index 9960c36bb..f963b0f5b 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
@@ -90,7 +90,7 @@
<div class="row">
<div class="input-field col s4 l2 offset-l3">
- <input id="separator" type="text" name="separator" <@validation.validation "separator" "center-align"/> value="<#if csvImportSettings.getSeparator()??>${csvImportSettings.getSeparator()}</#if>">
+ <input id="separator" type="text" name="separator" <@validation.validation "separator" "center-align"/> value="<#if csvImportSettings.getSeparatorChar()??>${csvImportSettings.getSeparatorChar()}</#if>">
<label class="input-label" for="separator">${locale.getString("transactions.import.separator")}</label>
</div>
<div class="input-field col s4 l2">
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v10_convertToInternalTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v10_convertToInternalTest.java
index 1b723f189..77af31bea 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v10_convertToInternalTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/DatabaseParser_v10_convertToInternalTest.java
@@ -363,7 +363,7 @@ class DatabaseParser_v10_convertToInternalTest
InternalDatabase database = importer.parseDatabaseFromJSON().convertToInternal();
final CsvImportSettings expectedSettings = new CsvImportSettings();
- expectedSettings.setSeparator(";");
+ expectedSettings.setSeparatorChar(";");
expectedSettings.setEncoding("UTF-8");
expectedSettings.setNumberOfLinesToSkip(1);
diff --git a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
index 32c43f8b2..b99497a74 100644
--- a/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
+++ b/BudgetMasterServer/src/test/java/de/deadlocker8/budgetmaster/unit/database/ImportServiceTest.java
@@ -422,7 +422,7 @@ class ImportServiceTest
// csv import settings
final CsvImportSettings expectedSettings = new CsvImportSettings();
- expectedSettings.setSeparator(",");
+ expectedSettings.setSeparatorChar(",");
expectedSettings.setEncoding("cp1252");
expectedSettings.setNumberOfLinesToSkip(12);
expectedSettings.setColumnDate(3);
--
GitLab