From 825e687b0b676fd1be1fa0a9d00be22de0e57060 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Tue, 5 May 2020 14:00:17 +0200
Subject: [PATCH] Fix bug when both trim and autodetect are enabled in tabular
 parser. Closes #2584 (#2610)

---
 .../importers/TabularImportingParserBase.java |  7 ++++---
 .../refine/importers/TsvCsvImporterTests.java | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/main/src/com/google/refine/importers/TabularImportingParserBase.java b/main/src/com/google/refine/importers/TabularImportingParserBase.java
index 73aba46ca..bf9780620 100644
--- a/main/src/com/google/refine/importers/TabularImportingParserBase.java
+++ b/main/src/com/google/refine/importers/TabularImportingParserBase.java
@@ -167,11 +167,12 @@ abstract public class TabularImportingParserBase extends ImportingParserBase {
                             } else if (ExpressionUtils.isNonBlankData(value)) {
                                 Serializable storedValue;
                                 if (value instanceof String) {
+                                	if(trimStrings) {
+                                        value = ((String) value).trim();
+                                    }
                                     storedValue = guessCellValueTypes ?
                                         ImporterUtilities.parseCellValue((String) value) : (String) value;
-                                    if(trimStrings) {
-                                        storedValue = ((String) storedValue).toString().trim();
-                                    }
+                                    
                                 } else {
                                     storedValue = ExpressionUtils.wrapStorable(value);
                                 }
diff --git a/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java b/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
index c573c098c..3b215e7d7 100644
--- a/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
+++ b/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
@@ -245,6 +245,27 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, " 3.4 ");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, " data3 ");
     }
+    
+    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
+    public void trimAndAutodetectDatatype(String sep){
+        //create input to test with
+        String inputSeparator =  sep == null ? "\t" : sep;
+        String input = " data1 " + inputSeparator + " 3.4 " + inputSeparator + " data3 ";
+
+        try {
+            prepareOptions(sep, -1, 0, 0, 0, true, false, true);
+            parseOneFile(SUT, new StringReader(input));
+        } catch (Exception e) {
+            Assert.fail("Exception during file parse",e);
+        }
+        Assert.assertEquals(project.columnModel.columns.size(), 3);
+        Assert.assertEquals(project.rows.size(), 1);
+        Assert.assertEquals(project.rows.get(0).cells.size(), 3);
+        Assert.assertEquals(project.rows.get(0).cells.get(0).value, "data1");
+        Assert.assertEquals(project.rows.get(0).cells.get(1).value, Double.parseDouble("3.4"));
+        Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
+    }
+
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
     public void readCanAddNull(String sep){