Merge branch '2.11'

FasterXML · Nov 27, 2019 · 4efe46e · 4efe46e
2 parents 4e5a7bd + caaa746
commit 4efe46e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,18 @@
 language: java
 
+git:
+  quiet: true
+  submodules: false
+
 jdk:
   - openjdk8
   - openjdk11
 
+# 2019-11-27, tatu: Let's try caching Maven dependencies
+cache:
+  directories:
+    - $HOME/.m2
+
 # whitelist
 branches:
   only:

diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvDecoder.java
@@ -822,12 +822,13 @@ protected String _nextQuotedString() throws IOException {
                 continue;
             }
             _owner._reportUnexpectedCsvChar(ch, String.format(
-                    "Expected separator (%s) or end-of-line", _getCharDesc(_quoteChar)));
+                    "Expected column separator character (%s) or end-of-line", _getCharDesc(_separatorChar)));
         }
         return result;
     }
 
-    protected final void _handleLF() throws IOException {
+    protected final void _handleLF() throws IOException
+    {
         // already skipped past first part; but may get \r\n so skip the other char too?
         if (_pendingLF == INT_CR) {
             if (_inputPtr < _inputEnd || loadMore()) {

diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/SequenceRecoveryTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/SequenceRecoveryTest.java
@@ -165,7 +165,7 @@ public void testRecoveryFromMissingQuote91() throws Exception
             value = it.nextValue();
             fail("Should fail");
         } catch (JsonProcessingException e) {
-            verifyException(e, "Expected separator");
+            verifyException(e, "Expected column separator");
         }
 
         // and because of this, synchronization skips the rest of 3rd line...
@@ -210,7 +210,7 @@ public void testRecoveryFromUnclosedQuotes() throws Exception
             value = it.nextValue();
             fail("Should fail");
         } catch (JsonProcessingException e) {
-            verifyException(e, "Expected separator");
+            verifyException(e, "Expected column separator");
         }
 
         // and this means that since error was encountered on 3rd row, that gets

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,11 @@ Modules:
   into `null` values
  (contributed by Tyler C-R)
 
+2.10.2 (not yet released)
+
+#166: (csv) Incorrect `JsonParseException` Message for missing separator char
+ (reported by gimiz@github)
+
 2.10.1 (09-Nov-2019)
 
 #15: Add a `CsvParser.Feature.SKIP_EMPTY_LINES` to allow skipping empty rows