Improve Error handling, split up classes into multiple packages

Author: damgem

.gitignore

@@ -1,6 +1,5 @@
 # Custom
-teilnehmer.xls
-db.mdb
+extern/data/*
 gradlew
 gradlew.bat
 

.idea/.name

@@ -21,11 +21,12 @@ dependencies {
 
     //implementation group: 'net.sf.ucanaccess', name: 'ucanaccess', version: '5.0.1'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.7'
+    implementation 'org.jetbrains:annotations:20.1.0'
 }
 
 application {
-    mainClassName('com.damgem.dataImporter.Main')
-    mainModule.set('com.damgem.dataImporter')
+    mainClassName('com.damgem.DataImporter.Main')
+    mainModule.set('com.damgem.DataImporter')
 }
 
 javafx {
@@ -46,7 +47,8 @@ jlink {
     jpackage {
         appVersion = '0.1.1'
         icon = 'src/main/resources/table2.ico'
-        //jvmArgs = ['-Djavafx.autoproxy.disable=true']
-        installerOptions = ['--win-upgrade-uuid', 'comdamgemDataImporter']
+        jvmArgs = ['-Djavafx.autoproxy.disable=true']
+        installerOptions = ['--win-upgrade-uuid', '855563f2-b2c5-4ac1-8af6-80a0baff651b']
+        // resourceDir = new File("src/main/resources")
     }
 }

.idea/libraries-with-intellij-classes.xml

@@ -1,7 +1,7 @@
 #NoEnv  ; Recommended for performance and compatibility with future AutoHotkey releases.
 ; #Warn  ; Enable warnings to assist with detecting common errors.
 SendMode Input  ; Recommended for new scripts due to its superior speed and reliability.
-SetWorkingDir C:\Program Files\DataImporter ; %A_ScriptDir%  ; Ensures a consistent starting directory.
+SetWorkingDir %A_ScriptDir%  ; C:\Program Files\DataImporter ; Ensures a consistent starting directory.
 
 GetSelectedText() {
 	tmp = %ClipboardAll% ; save clipboard

.idea/modules/DataImporter.iml

@@ -1,9 +1,9 @@
 {
   "legacyMode": false,
-  "legacyProfile": "FB",
+  "legacyProfile": "WS",
   "profiles": {
-    "FB": {
-      "target": "teilnehmer.xls",
+    "WS": {
+      "target": "data/teilnehmer.xls",
       "targetType": "excel",
       "mapping": {
         "Kundennummer":  null,
@@ -35,8 +35,8 @@
         "Nachname Erziehungsb.":  14
       }
     },
-    "Feedback": {
-      "target": "feedback.mdb",
+    "FB": {
+      "target": "data/feedback.mdb",
       "subTarget": "tbl_Feedback_FP",
       "targetType": "access",
       "mapping": {
@@ -69,7 +69,7 @@
     },
     "GEB": {
       "targetType": "excel",
-      "target": "geburtstage.xls",
+      "target": "data/geburtstage.xls",
       "mapping": {
         "Vorname": 0,
         "Nachname": 1,

build.gradle

@@ -0,0 +1,81 @@
+package com.damgem.DataImporter.Connector;
+
+import com.damgem.DataImporter.DataImporterError;
+import com.damgem.DataImporter.Field.Field;
+import com.healthmarketscience.jackcess.*;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class AccessConnector implements DataConnector {
+
+    private String target, subTarget;
+
+    public AccessConnector(String target, String subTarget) throws DataImporterError {
+        if(target == null) {
+            throw new DataImporterError("Unvollständige Konfiguration", "target ist null.");
+        }
+        if(subTarget == null) {
+            throw new DataImporterError("Unvollständige Konfiguration", "subTarget ist null.");
+        }
+        this.target = target;
+        this.subTarget = subTarget;
+    }
+
+    private Database openDatabase() throws DataImporterError {
+        File file = new File(target);
+        if(!file.exists()) {
+            throw new DataImporterError("Fehler beim Öffnen der Datenbank", "Datei "
+                    + file.getAbsolutePath() + " existiert nicht.");
+        }
+        try {
+            return DatabaseBuilder.open(file);
+        } catch (Exception error) {
+            throw new DataImporterError("Fehler beim Öffnen der Datenbank", "Datei "
+                    + file.getAbsolutePath() + " konnte nicht korrekt gelesen werden. ");
+        }
+    }
+
+    private Table openTable() throws DataImporterError {
+        Database database = this.openDatabase();
+        try {
+            return database.getTable(subTarget);
+        } catch (Exception error) {
+            throw new DataImporterError("Fehler beim Öffnen der Tabelle ", "Tabelle mit dem Namen " +
+                    subTarget + " konnte nicht gefunden oder nicht korrekt gelesen werden:\n" + error.getMessage());
+        }
+    }
+
+    @Override
+    public void write(String target, String subTarget, List<Field> data) throws DataImporterError {
+
+        Table table = this.openTable();
+
+        List<String> accessColumnNames = table.getColumns().stream().map(Column::getName).collect(Collectors.toList());
+        List<String> dataColumnNames = data.stream().map(f -> f.name).collect(Collectors.toList());
+
+        if(!accessColumnNames.equals(dataColumnNames)) {
+            throw new DataImporterError("Namensfehler", "Spaltennamen der Datenbank-Tabelle " +
+                    "stimmen nicht mit den in der Konfiguration spezifierten Feldnamen überein.");
+        }
+
+        Map<String, Object> map = new HashMap<>();
+
+        // make sure there are no empty numerical values
+        data.forEach(f -> {
+            if(table.getColumn(f.name).getType() == DataType.LONG && f.value.isEmpty().get()) {
+                map.put(f.name, 0);
+            } else {
+                map.put(f.name, f.value.getValue());
+            }
+        });
+
+        try { table.addRowFromMap(map); }
+        catch (Exception error) {
+            throw new DataImporterError("Schreibfehler", error.getMessage());
+        }
+    }
+}

autohotkey/importer_ctrl_alt_c.ahk renamed to extern/DataImporter-Hotkey.ahk

@@ -0,0 +1,10 @@
+package com.damgem.DataImporter.Connector;
+
+import com.damgem.DataImporter.DataImporterError;
+import com.damgem.DataImporter.Field.Field;
+
+import java.util.List;
+
+public interface DataConnector {
+    void write(String target, String subTarget, List<Field> data) throws DataImporterError;
+}

config.json renamed to extern/config.json

@@ -0,0 +1,107 @@
+package com.damgem.DataImporter.Connector;
+
+import com.damgem.DataImporter.DataImporterError;
+import com.damgem.DataImporter.Field.Field;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+
+import java.io.*;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ExcelConnector implements DataConnector {
+
+    private String target, subTarget;
+
+    private String cellToString(Cell cell) {
+        return switch (cell.getCellType()) {
+            case _NONE, BLANK -> "";
+            case NUMERIC -> String.valueOf(cell.getNumericCellValue());
+            case STRING -> cell.getStringCellValue();
+            case FORMULA -> "<formula>";
+            case BOOLEAN -> cell.getBooleanCellValue() ? "<ja>" : "<nein>";
+            case ERROR -> "<error>";
+        };
+    }
+
+    private List<String> rowToList(Row row) {
+        if(row == null) return new ArrayList<>();
+        List<String> cellStrings = new ArrayList<>(row.getLastCellNum());
+        for (Cell cell : row) {
+           cellStrings.add(this.cellToString(cell));
+        }
+        return cellStrings;
+    }
+
+    private void addRowToSheet(Sheet sheet, List<String> data) {
+        Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+        for (int ci = 0; ci < data.size(); ci++) {
+            row.createCell(ci, CellType.STRING).setCellValue(data.get(ci));
+        }
+    }
+
+    private Workbook openWorkbook() throws DataImporterError {
+        try {
+            // new XSSFWorkbook(new FileInputStream(this.target));
+            return new HSSFWorkbook(new FileInputStream(this.target));
+        } catch(FileNotFoundException ignored) {
+            // new XSSFWorkbook();
+            return new HSSFWorkbook();
+        } catch (Exception error) {
+            throw new DataImporterError("Target Fehler", "Kann die Datei \"" + target +
+                    "\" weder korrekt lesen noch erstellen.\n\n" + error.getMessage());
+        }
+    }
+
+    private Sheet openSheet(Workbook workbook) throws DataImporterError {
+        if(this.subTarget != null && !this.subTarget.isEmpty()) {
+            Sheet sheet = workbook.getSheet(subTarget);
+            return (sheet == null) ? workbook.createSheet(subTarget) : sheet;
+        }
+        else {
+            if(workbook.getNumberOfSheets() == 0) workbook.createSheet();
+            return workbook.getSheetAt(0);
+        }
+    }
+
+    public ExcelConnector(String target, String subTarget) throws DataImporterError {
+        if(target == null) {
+            throw new DataImporterError("Unvollständige Konfiguration", "target ist null.");
+        }
+        this.target = target;
+        this.subTarget = subTarget;
+    }
+
+    @Override
+    public void write(String target, String subTarget, List<Field> data) throws DataImporterError {
+
+        Workbook workbook = this.openWorkbook();
+        Sheet sheet = this.openSheet(workbook);
+
+        // compile field name list
+        List<String> dataKeys = data.stream().map(kv -> kv.name).collect(Collectors.toList());
+
+        // read field names
+        int rows = sheet.getLastRowNum();
+        if(rows == -1) {
+            this.addRowToSheet(sheet, dataKeys);
+        } else if(!dataKeys.equals(rowToList(sheet.getRow(0)))) {
+            throw new DataImporterError("Namensfehler", "Spaltennamen der Excel-Tabelle " +
+                    "stimmen nicht mit den in der Konfiguration spezifizierten Feldnamen überein.");
+        }
+
+        // insert data
+        List<String> dataFieldValues = data.stream().map(kv -> kv.value.getValue()).collect(Collectors.toList());
+        this.addRowToSheet(sheet, dataFieldValues);
+
+        // write to file
+        try (OutputStream fileOut = new FileOutputStream(target)) {
+            workbook.write(fileOut);
+        } catch (IOException ioe) {
+            throw new DataImporterError("Schreibfehler", "Die Datei \"" +
+                    Paths.get(target).toAbsolutePath() + "\" konnte nicht zum Schreiben geöffnet werden.");
+        }
+    }
+}

src/main/java/com/damgem/DataImporter/Connector/AccessConnector.java

@@ -1,4 +1,4 @@
-package com.damgem.dataImporter;
+package com.damgem.DataImporter.Controller;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -7,8 +7,6 @@
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 
-import java.util.Objects;
-
 public class ErrorController {
     @FXML
     public Label errorTitle;