frosch95/SmartCSV.fx
1
0
Fork 0
mirror of https://github.com/frosch95/SmartCSV.fx.git synced 2026-04-11 21:48:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

reorganized storage of models

Browse Source
This commit is contained in:
Andreas Billmann
2016-07-22 20:45:26 +02:00
parent 6e7c3226ab
commit 64d5000b62
14 changed files with 191 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ninja/javafx/smartcsv/FileReader.java
View File

@@ -32,6 +32,7 @@ import java.io.IOException;
/**
* read some file
*/
public interface FileReader {
public interface FileReader<E> {
E getContent();
void read(File filename) throws IOException;
}

3
src/main/java/ninja/javafx/smartcsv/FileWriter.java
View File

@@ -32,6 +32,7 @@ import java.io.IOException;
/**
* write some file
*/
public interface FileWriter {
public interface FileWriter<E> {
void setContent(E content);
void write(File filename) throws IOException;
}

5
src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
View File

@@ -40,8 +40,7 @@ import java.util.Map;
/**
* reads the csv file and stores the values in csv model
*/
@Service
public class CSVFileReader extends CSVConfigurable implements FileReader {
public class CSVFileReader extends CSVConfigurable implements FileReader<CSVModel> {
private CSVModel model;
@@ -72,7 +71,7 @@ public class CSVFileReader extends CSVConfigurable implements FileReader {
}
}
public CSVModel getData() {
public CSVModel getContent() {
return model;
}

5
src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
View File

@@ -42,12 +42,11 @@ import static java.util.stream.Collectors.toMap;
/**
* filewriter for the csv
*/
@Service
public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smartcsv.FileWriter {
public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smartcsv.FileWriter<CSVModel> {
private CSVModel model;
public void setModel(CSVModel model) {
public void setContent(CSVModel model) {
this.model = model;
}

78
src/main/java/ninja/javafx/smartcsv/files/FileStorage.java Normal file
View File

@@ -0,0 +1,78 @@
package ninja.javafx.smartcsv.files;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import ninja.javafx.smartcsv.FileReader;
import ninja.javafx.smartcsv.FileWriter;
import java.io.File;
import java.io.IOException;
/**
* This class stores files and there state
* @author abi
*/
public class FileStorage<E> {
private FileReader<E> reader;
private FileWriter<E> writer;
public FileStorage(FileReader<E> reader, FileWriter<E> writer) {
this.reader = reader;
this.writer = writer;
}
private BooleanProperty fileChanged = new SimpleBooleanProperty(true);
private ObjectProperty<File> file = new SimpleObjectProperty<>();
private ObjectProperty<E> content = new SimpleObjectProperty<E>();
public boolean isFileChanged() {
return fileChanged.get();
}
public BooleanProperty fileChangedProperty() {
return fileChanged;
}
public void setFileChanged(boolean fileChanged) {
this.fileChanged.set(fileChanged);
}
public File getFile() {
return file.get();
}
public ObjectProperty<File> fileProperty() {
return file;
}
public void setFile(File file) {
this.file.set(file);
}
public E getContent() {
return content.get();
}
public ObjectProperty<E> contentProperty() {
return content;
}
public void setContent(E content) {
this.content.set(content);
}
public void load() throws IOException {
reader.read(file.get());
setContent(reader.getContent());
setFileChanged(false);
}
public void save() throws IOException {
writer.setContent(content.get());
writer.write(file.get());
setFileChanged(false);
}
}

187
src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
View File

@@ -26,10 +26,6 @@
package ninja.javafx.smartcsv.fx;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.ListChangeListener;
import javafx.collections.WeakListChangeListener;
import javafx.concurrent.WorkerStateEvent;
@@ -41,10 +37,9 @@ import javafx.scene.control.*;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.BorderPane;
import javafx.stage.FileChooser;
import ninja.javafx.smartcsv.FileReader;
import ninja.javafx.smartcsv.FileWriter;
import ninja.javafx.smartcsv.csv.CSVFileReader;
import ninja.javafx.smartcsv.csv.CSVFileWriter;
import ninja.javafx.smartcsv.files.FileStorage;
import ninja.javafx.smartcsv.fx.about.AboutController;
import ninja.javafx.smartcsv.fx.list.ErrorSideBar;
import ninja.javafx.smartcsv.fx.preferences.PreferencesController;
@@ -58,6 +53,7 @@ import ninja.javafx.smartcsv.fx.util.SaveFileService;
import ninja.javafx.smartcsv.fx.validation.ValidationEditorController;
import ninja.javafx.smartcsv.preferences.PreferencesFileReader;
import ninja.javafx.smartcsv.preferences.PreferencesFileWriter;
import ninja.javafx.smartcsv.validation.ValidationConfiguration;
import ninja.javafx.smartcsv.validation.ValidationError;
import ninja.javafx.smartcsv.validation.ValidationFileReader;
import ninja.javafx.smartcsv.validation.ValidationFileWriter;
@@ -103,24 +99,6 @@ public class SmartCSVController extends FXMLController {
// injections
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@Autowired
private PreferencesFileReader preferencesLoader;
@Autowired
private PreferencesFileWriter preferencesWriter;
@Autowired
private CSVFileReader csvLoader;
@Autowired
private ValidationFileReader validationLoader;
@Autowired
private CSVFileWriter csvFileWriter;
@Autowired
private ValidationFileWriter validationFileWriter;
@Autowired
private AboutController aboutController;
@@ -134,7 +112,7 @@ public class SmartCSVController extends FXMLController {
private LoadFileService loadFileService;
@Autowired
private SaveFileService saveFileService;;
private SaveFileService saveFileService;
@FXML
private BorderPane applicationPane;
@@ -199,13 +177,13 @@ public class SmartCSVController extends FXMLController {
private ValidationCellFactory cellFactory;
private CSVModel model;
private TableView<CSVRow> tableView;
private ErrorSideBar errorSideBar;
private BooleanProperty fileChanged = new SimpleBooleanProperty(true);
private ResourceBundle resourceBundle;
private ObjectProperty<File> currentCsvFile = new SimpleObjectProperty<>();
private ObjectProperty<File> currentConfigFile= new SimpleObjectProperty<>();
private FileStorage<CSVModel> currentCsvFile = new FileStorage<>(new CSVFileReader(), new CSVFileWriter());
private FileStorage<ValidationConfiguration> currentConfigFile = new FileStorage<>(new ValidationFileReader(), new ValidationFileWriter());
private FileStorage<CsvPreference> csvPreferenceFile = new FileStorage<>(new PreferencesFileReader(), new PreferencesFileWriter());
private ListChangeListener<ValidationError> errorListListener = c -> tableView.refresh();
private WeakListChangeListener<ValidationError> weakErrorListListener = new WeakListChangeListener<>(errorListListener);
@@ -230,6 +208,8 @@ public class SmartCSVController extends FXMLController {
bindCsvFileName();
bindConfigFileName();
csvPreferenceFile.setFile(PREFERENCES_FILE);
loadCsvPreferencesFromFile();
}
@@ -263,58 +243,32 @@ public class SmartCSVController extends FXMLController {
@FXML
public void openCsv(ActionEvent actionEvent) {
currentCsvFile.setValue(
loadFile(
csvLoader,
CSV_FILTER_TEXT,
CSV_FILTER_EXTENSION,
"Open CSV",
currentCsvFile.getValue()));
loadFile(CSV_FILTER_TEXT, CSV_FILTER_EXTENSION, "Open CSV", currentCsvFile);
}
@FXML
public void openConfig(ActionEvent actionEvent) {
currentConfigFile.setValue(
loadFile(
validationLoader,
JSON_FILTER_TEXT,
JSON_FILTER_EXTENSION,
"Open Validation Configuration",
currentConfigFile.getValue()));
loadFile(JSON_FILTER_TEXT, JSON_FILTER_EXTENSION, "Open Validation Configuration", currentConfigFile);
}
@FXML
public void saveCsv(ActionEvent actionEvent) {
csvFileWriter.setModel(model);
useSaveFileService(csvFileWriter, currentCsvFile.getValue());
useSaveFileService(currentCsvFile);
}
@FXML
public void saveAsCsv(ActionEvent actionEvent) {
csvFileWriter.setModel(model);
currentCsvFile.setValue(
saveFile(
csvFileWriter,
CSV_FILTER_TEXT,
CSV_FILTER_EXTENSION,
currentCsvFile.getValue()));
saveFile(CSV_FILTER_TEXT, CSV_FILTER_EXTENSION, currentCsvFile);
}
@FXML
public void saveConfig(ActionEvent actionEvent) {
validationFileWriter.setValidationConfiguration(validationLoader.getValidationConfiguration());
useSaveFileService(validationFileWriter, currentConfigFile.getValue());
useSaveFileService(currentConfigFile);
}
@FXML
public void saveAsConfig(ActionEvent actionEvent) {
validationFileWriter.setValidationConfiguration(validationLoader.getValidationConfiguration());
currentConfigFile.setValue(
saveFile(
validationFileWriter,
JSON_FILTER_TEXT,
JSON_FILTER_EXTENSION,
currentConfigFile.getValue()));
saveFile(JSON_FILTER_TEXT, JSON_FILTER_EXTENSION, currentConfigFile);
}
@FXML
@@ -351,24 +305,24 @@ public class SmartCSVController extends FXMLController {
setCsvPreference(csvPreference);
saveCsvPreferences(csvPreference);
} else {
preferencesController.setCsvPreference(preferencesLoader.getCSVpreference());
preferencesController.setCsvPreference(csvPreferenceFile.getContent());
}
}
@FXML
public void deleteRow(ActionEvent actionEvent) {
model.getRows().removeAll(tableView.getSelectionModel().getSelectedItems());
fileChanged.setValue(true);
currentCsvFile.getContent().getRows().removeAll(tableView.getSelectionModel().getSelectedItems());
currentCsvFile.setFileChanged(true);
resetContent();
}
@FXML
public void addRow(ActionEvent actionEvent) {
CSVRow row = model.addRow();
for (String column : model.getHeader()) {
CSVRow row = currentCsvFile.getContent().addRow();
for (String column : currentCsvFile.getContent().getHeader()) {
row.addValue(column, "");
}
fileChanged.setValue(true);
currentCsvFile.setFileChanged(true);
resetContent();
selectNewRow();
@@ -376,7 +330,7 @@ public class SmartCSVController extends FXMLController {
public boolean canExit() {
boolean canExit = true;
if (model != null && fileChanged.get()) {
if (currentCsvFile.getContent() != null && currentCsvFile.isFileChanged()) {
Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
alert.setTitle(resourceBundle.getString("dialog.exit.title"));
alert.setHeaderText(resourceBundle.getString("dialog.exit.header.text"));
@@ -404,8 +358,8 @@ public class SmartCSVController extends FXMLController {
if (result.get() == ButtonType.OK){
runLater(() -> {
validationEditorController.updateConfiguration();
fileChanged.setValue(true);
model.revalidate();
currentCsvFile.setFileChanged(true);
currentCsvFile.getContent().revalidate();
});
}
}
@@ -421,15 +375,15 @@ public class SmartCSVController extends FXMLController {
tableView.getSelectionModel().select(lastRow);
}
private void bindMenuItemsToFileExistence(ObjectProperty<File> file, MenuItem... items) {
private void bindMenuItemsToFileExistence(FileStorage file, MenuItem... items) {
for (MenuItem item: items) {
item.disableProperty().bind(isNull(file));
item.disableProperty().bind(isNull(file.fileProperty()));
}
}
private void bindButtonsToFileExistence(ObjectProperty<File> file, Button... items) {
private void bindButtonsToFileExistence(FileStorage file, Button... items) {
for (Button item: items) {
item.disableProperty().bind(isNull(file));
item.disableProperty().bind(isNull(file.fileProperty()));
}
}
@@ -446,17 +400,16 @@ public class SmartCSVController extends FXMLController {
}
private void bindCsvFileName() {
csvName.textProperty().bind(selectString(currentCsvFile, "name"));
csvName.textProperty().bind(selectString(currentCsvFile.fileProperty(), "name"));
}
private void bindConfigFileName() {
configurationName.textProperty().bind(selectString(currentConfigFile, "name"));
configurationName.textProperty().bind(selectString(currentConfigFile.fileProperty(), "name"));
}
private void loadCsvPreferencesFromFile() {
if (PREFERENCES_FILE.exists()) {
useLoadFileService(preferencesLoader, PREFERENCES_FILE,
event -> setCsvPreference(preferencesLoader.getCSVpreference()));
if (csvPreferenceFile.getFile().exists()) {
useLoadFileService(csvPreferenceFile, event -> setCsvPreference(csvPreferenceFile.getContent()));
} else {
setCsvPreference(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE);
}
@@ -465,37 +418,34 @@ public class SmartCSVController extends FXMLController {
private void saveCsvPreferences(CsvPreference csvPreference) {
try {
createPreferenceFile();
preferencesWriter.setCsvPreference(csvPreference);
useSaveFileService(preferencesWriter, PREFERENCES_FILE);
csvPreferenceFile.setContent(csvPreference);
useSaveFileService(csvPreferenceFile);
} catch (IOException e) {
e.printStackTrace();
}
}
private void createPreferenceFile() throws IOException {
if (!PREFERENCES_FILE.exists()) {
if (!csvPreferenceFile.getFile().exists()) {
createPreferencesFileFolder();
PREFERENCES_FILE.createNewFile();
csvPreferenceFile.getFile().createNewFile();
}
}
private void createPreferencesFileFolder() {
if (!PREFERENCES_FILE.getParentFile().exists()) {
PREFERENCES_FILE.getParentFile().mkdir();
if (!csvPreferenceFile.getFile().getParentFile().exists()) {
csvPreferenceFile.getFile().getParentFile().mkdir();
}
}
private void setCsvPreference(CsvPreference csvPreference) {
csvLoader.setCsvPreference(csvPreference);
csvFileWriter.setCsvPreference(csvPreference);
preferencesController.setCsvPreference(csvPreference);
}
private File loadFile(FileReader fileReader,
String filterText,
private void loadFile(String filterText,
String filter,
String title,
File initChildFile) {
FileStorage storageFile) {
final FileChooser fileChooser = new FileChooser();
//Set extension filter
@@ -503,61 +453,57 @@ public class SmartCSVController extends FXMLController {
fileChooser.getExtensionFilters().add(extFilter);
fileChooser.setTitle(title);
if (initChildFile != null) {
fileChooser.setInitialDirectory(initChildFile.getParentFile());
if (storageFile.getFile() != null) {
fileChooser.setInitialDirectory(storageFile.getFile().getParentFile());
}
//Show open file dialog
File file = fileChooser.showOpenDialog(applicationPane.getScene().getWindow());
if (file != null) {
useLoadFileService(fileReader, file, event -> runLater(() -> {
storageFile.setFile(file);
useLoadFileService(storageFile, event -> runLater(() -> {
resetContent();
fileChanged.setValue(false);
storageFile.setFileChanged(false);
}));
return file;
} else {
return initChildFile;
}
}
private File saveFile(FileWriter writer, String filterText, String filter, File initFile) {
File file = initFile;
if (model != null) {
private File saveFile(String filterText, String filter, FileStorage initFile) {
File file = initFile.getFile();
if (initFile.getContent() != null) {
final FileChooser fileChooser = new FileChooser();
//Set extension filter
final FileChooser.ExtensionFilter extFilter = new FileChooser.ExtensionFilter(filterText, filter);
fileChooser.getExtensionFilters().add(extFilter);
if (initFile != null) {
fileChooser.setInitialDirectory(initFile.getParentFile());
fileChooser.setInitialFileName(initFile.getName());
if (initFile.getFile() != null) {
fileChooser.setInitialDirectory(initFile.getFile().getParentFile());
fileChooser.setInitialFileName(initFile.getFile().getName());
}
fileChooser.setTitle("Save File");
//Show open file dialog
file = fileChooser.showSaveDialog(applicationPane.getScene().getWindow());
if (file != null) {
useSaveFileService(writer, file);
initFile.setFile(file);
useSaveFileService(currentCsvFile);
}
}
return file;
}
private void useLoadFileService(FileReader fileReader, File file, EventHandler<WorkerStateEvent> value) {
loadFileService.setFile(file);
loadFileService.setFileReader(fileReader);
private void useLoadFileService(FileStorage fileStorage, EventHandler<WorkerStateEvent> value) {
loadFileService.setFileStorage(fileStorage);
loadFileService.restart();
loadFileService.setOnSucceeded(value);
}
private void useSaveFileService(FileWriter writer, File file) {
saveFileService.setFile(file);
saveFileService.setWriter(writer);
private void useSaveFileService(FileStorage fileStorage) {
saveFileService.setFileStorage(fileStorage);
saveFileService.restart();
saveFileService.setOnSucceeded(event -> runLater(() -> {
resetContent();
fileChanged.setValue(false);
}));
}
@@ -565,21 +511,20 @@ public class SmartCSVController extends FXMLController {
* Creates new table view and add the new content
*/
private void resetContent() {
model = csvLoader.getData();
if (model != null) {
model.getValidationError().addListener(weakErrorListListener);
model.setValidationConfiguration(validationLoader.getValidationConfiguration());
validationEditorController.setValidationConfiguration(validationLoader.getValidationConfiguration());
if (currentCsvFile.getContent() != null) {
currentCsvFile.getContent().getValidationError().addListener(weakErrorListListener);
currentCsvFile.getContent().setValidationConfiguration(currentConfigFile.getContent());
validationEditorController.setValidationConfiguration(currentConfigFile.getContent());
tableView = new TableView<>();
bindMenuItemsToTableSelection(deleteRowMenuItem);
bindButtonsToTableSelection(deleteRowButton);
for (String column : model.getHeader()) {
for (String column : currentCsvFile.getContent().getHeader()) {
addColumn(column, tableView);
}
tableView.getItems().setAll(model.getRows());
tableView.getItems().setAll(currentCsvFile.getContent().getRows());
tableView.setEditable(true);
setBottomAnchor(tableView, 0.0);
@@ -587,7 +532,7 @@ public class SmartCSVController extends FXMLController {
setLeftAnchor(tableView, 0.0);
setRightAnchor(tableView, 0.0);
tableWrapper.getChildren().setAll(tableView);
errorSideBar.setModel(model);
errorSideBar.setModel(currentCsvFile.getContent());
}
}
@@ -612,8 +557,8 @@ public class SmartCSVController extends FXMLController {
event.getTableView().getItems().get(event.getTablePosition().getRow()).
getColumns().get(header).setValue(event.getNewValue());
runLater(() -> {
fileChanged.setValue(true);
model.revalidate();
currentCsvFile.setFileChanged(true);
currentCsvFile.getContent().revalidate();
});
}
});

24
src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVModel.java
View File

@@ -32,6 +32,9 @@ import ninja.javafx.smartcsv.validation.ValidationConfiguration;
import ninja.javafx.smartcsv.validation.ValidationError;
import ninja.javafx.smartcsv.validation.Validator;
import java.util.ArrayList;
import java.util.List;
/**
* The CSVModel is the client representation for the csv filepath.
* It holds the data in rows, stores the header and manages the validator.
@@ -100,8 +103,15 @@ public class CSVModel {
public void revalidate() {
validationError.clear();
if (header != null && validator != null) {
addValidationError(validator.isHeaderValid(header));
if (!hasValidator()) return;
List<ValidationError> errors = new ArrayList<>();
if (header != null) {
ValidationError headerError = validator.isHeaderValid(header);
if (headerError != null) {
errors.add(headerError);
}
}
for (int lineNumber = 0; lineNumber < rows.size(); lineNumber++) {
@@ -113,7 +123,7 @@ public class CSVModel {
if (validator != null) {
ValidationError validationError = validator.isValid(column, value.getValue(), lineNumber);
if (validationError != null) {
addValidationError(validationError);
errors.add(validationError);
value.setValidationError(validationError);
} else {
value.setValidationError(null);
@@ -123,12 +133,12 @@ public class CSVModel {
}
}
}
validationError.setAll(errors);
}
private void addValidationError(ValidationError validationError) {
if (validationError != null) {
this.validationError.add(validationError);
}
private boolean hasValidator() {
return validator != null && validator.hasConfig();
}
}

13
src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
View File

@@ -29,6 +29,7 @@ package ninja.javafx.smartcsv.fx.util;
import javafx.concurrent.Service;
import javafx.concurrent.Task;
import ninja.javafx.smartcsv.FileReader;
import ninja.javafx.smartcsv.files.FileStorage;
import java.io.File;
@@ -38,14 +39,10 @@ import java.io.File;
@org.springframework.stereotype.Service
public class LoadFileService extends Service {
private File file;
private FileReader fileReader;
private FileStorage file;
public void setFile(File value) {
file = value;
}
public void setFileReader(FileReader fileReader) {
this.fileReader = fileReader;
public void setFileStorage(FileStorage file) {
this.file = file;
}
@Override
@@ -54,7 +51,7 @@ public class LoadFileService extends Service {
@Override
protected Void call() throws Exception {
if (file != null) {
fileReader.read(file);
file.load();
}
return null;
}

12
src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
View File

@@ -30,6 +30,7 @@ import javafx.concurrent.Service;
import javafx.concurrent.Task;
import ninja.javafx.smartcsv.FileWriter;
import ninja.javafx.smartcsv.csv.CSVFileWriter;
import ninja.javafx.smartcsv.files.FileStorage;
import java.io.File;
@@ -41,14 +42,9 @@ import static javafx.application.Platform.runLater;
@org.springframework.stereotype.Service
public class SaveFileService extends Service {
private File file;
private FileWriter writer;
private FileStorage file;
public void setWriter(FileWriter writer) {
this.writer = writer;
}
public void setFile(File value) {
public void setFileStorage(FileStorage value) {
file = value;
}
@@ -58,7 +54,7 @@ public class SaveFileService extends Service {
@Override
protected Void call() throws Exception {
try {
writer.write(file);
file.save();
} catch (Throwable ex) {
ex.printStackTrace();
}

5
src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
View File

@@ -42,8 +42,7 @@ import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteMode;
/**
* file reader for the preferences
*/
@Service
public class PreferencesFileReader implements FileReader {
public class PreferencesFileReader implements FileReader<CsvPreference> {
private Map config;
private CsvPreference csvPreference;
@@ -74,7 +73,7 @@ public class PreferencesFileReader implements FileReader {
}
}
public CsvPreference getCSVpreference() {
public CsvPreference getContent() {
return csvPreference;
}

5
src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
View File

@@ -41,12 +41,11 @@ import java.util.Map;
/**
* Save preferences to configuration file
*/
@Service
public class PreferencesFileWriter implements FileWriter {
public class PreferencesFileWriter implements FileWriter<CsvPreference> {
private CsvPreference csvPreference;
public void setCsvPreference(CsvPreference csvPreference) {
public void setContent(CsvPreference csvPreference) {
this.csvPreference = csvPreference;
}

5
src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
View File

@@ -36,8 +36,7 @@ import java.io.IOException;
/**
* This class loads the constraints as json config
*/
@Service
public class ValidationFileReader implements FileReader {
public class ValidationFileReader implements FileReader<ValidationConfiguration> {
private ValidationConfiguration config;
@@ -46,7 +45,7 @@ public class ValidationFileReader implements FileReader {
config = new GsonBuilder().create().fromJson(new java.io.FileReader(file), ValidationConfiguration.class);
}
public ValidationConfiguration getValidationConfiguration() {
public ValidationConfiguration getContent() {
return config;
}
}

5
src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
View File

@@ -38,12 +38,11 @@ import java.nio.file.Files;
/**
* file writer for the validation configuration
*/
@Service
public class ValidationFileWriter implements FileWriter {
public class ValidationFileWriter implements FileWriter<ValidationConfiguration> {
private ValidationConfiguration validationConfiguration;
public void setValidationConfiguration(ValidationConfiguration validationConfiguration) {
public void setContent(ValidationConfiguration validationConfiguration) {
this.validationConfiguration = validationConfiguration;
}

7
src/main/java/ninja/javafx/smartcsv/validation/Validator.java
View File

@@ -67,7 +67,7 @@ public class Validator {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// oublic methods
// public methods
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**
@@ -78,7 +78,7 @@ public class Validator {
*/
public ValidationError isValid(String column, String value, Integer lineNumber) {
ValidationError result = null;
if (validationConfig != null) {
if (hasConfig()) {
ValidationError error = ValidationError.withLineNumber(lineNumber);
checkBlankOrNull(column, value, error);
@@ -101,6 +101,9 @@ public class Validator {
return result;
}
public boolean hasConfig() {
return validationConfig != null;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// private methods