Merge branch '2.10' into 2.11

FasterXML · Nov 28, 2019 · a2480bd · a2480bd
2 parents caaa746 + 26c5b56
commit a2480bd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvMapper.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvMapper.java
@@ -107,7 +107,6 @@ public CsvMapper() {
         this(new CsvFactory());
     }
 
-    @SuppressWarnings("deprecation")
     public CsvMapper(CsvFactory f)
     {
         super(f);

diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
@@ -720,7 +720,7 @@ protected void _readHeaderLine() throws IOException {
 
             a) The schema has been populated.  In this case, build a new
                schema where the order matches the *actual* order in which
-               the given CSV file offers its columns, iif _schema.reordersColumns()
+               the given CSV file offers its columns, if _schema.reordersColumns()
                is set to true; there cases the consumer of the csv file
                knows about the columns but not necessarily the order in
                which they are defined.