[Fix] Change default quote character to "

In addition, [Fix] remove messages about choosing default values for delimiter and quote character
kbss-cvut · Feb 5, 2023 · 2ec48b8 · 2ec48b8
1 parent 1ba859a
commit 2ec48b8
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/TabularModule.java b/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/TabularModule.java
@@ -382,23 +382,27 @@ private void setInputCharset(int delimiter) {
         }
     }
     private Supplier<Character> getDefaultDelimiterSupplier() {
-        LOG.debug("Delimiter not specified, using comma as default value to be compliant with RFC 4180 (CSV).");
-        return () -> ',';
+        return () -> {
+            LOG.debug("Delimiter not specified, using comma as default value to be compliant with RFC 4180 (CSV).");
+            return ',';
+        };
     }
 
     private Supplier<Character> getDefaultQuoteCharacterSupplier(int delimiter) {
         if (delimiter != ',') {
             return () -> '\0';
         }
-        LOG.debug("Quote character not specified, using double-quote as default value to be compliant with RFC 4180 (CSV)");
-        return () -> ',';
+        return () ->  {
+            LOG.debug("Quote character not specified, using double-quote as default value to be compliant with RFC 4180 (CSV)");
+            return '"';
+        };
     }
 
     private char getPropertyValue(Property property,
                           Supplier<Character> defaultValueSupplier) {
         return Optional.ofNullable(getPropertyValue(property))
             .map(n -> n.asLiteral().getChar())
-            .orElse(defaultValueSupplier.get());
+            .orElseGet(defaultValueSupplier);
     }
 
     @Override