Merge branch '2.13'

Author: cowtowncoder

csv/pom.xml

@@ -41,13 +41,6 @@ abstractions.
       <artifactId>jackson-annotations</artifactId>
     </dependency>
 
-    <!-- and for testing -->
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>27.1-jre</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ModuleTestBase.java

@@ -2,6 +2,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -229,6 +230,15 @@ protected String aposToQuotes(String json) {
         return json.replace("'", "\"");
     }
 
+    protected static Map<String, Object> mapOf(Object...strings)
+    {
+        final Map<String, Object> map = new LinkedHashMap<>();
+        for (int i = 0, end = strings.length; i < end; i += 2) {
+            map.put(strings[i].toString(), strings[i+1]);
+        }
+        return map;
+    }
+
     protected void assertToken(JsonToken expToken, JsonToken actToken) {
         if (actToken != expToken) {
             fail("Expected token "+expToken+", current token "+actToken);

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/BasicCSVParserTest.java

@@ -12,7 +12,6 @@
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.dataformat.csv.*;
-import com.google.common.collect.Lists;
 
 import static org.junit.Assert.assertArrayEquals;
 
@@ -40,13 +39,15 @@ public static class Point {
 
     final CsvMapper MAPPER = mapperForCsv();
 
-    public void testSimpleExplicit() throws Exception {
+    public void testSimpleExplicit() throws Exception
+    {
         ObjectReader r = MAPPER.reader(SIMPLE_SCHEMA);
         _testSimpleExplicit(r, false);
         _testSimpleExplicit(r, true);
     }
 
-    private void _testSimpleExplicit(ObjectReader r, boolean useBytes) throws Exception {
+    private void _testSimpleExplicit(ObjectReader r, boolean useBytes) throws Exception
+    {
         r = r.forType(FiveMinuteUser.class);
         FiveMinuteUser user;
         final String INPUT = "Bob,Robertson,MALE,AQIDBAU=,false\n";
@@ -421,7 +422,7 @@ public void testStrictColumnReturnsExpectedData()
         String CSV = "x,y,z\n1,2,3\n4,5,6\n7,8,9";
 
         final MappingIterator<Point> iter = MAPPER.readerFor(Point.class).with(schema).readValues(CSV);
-        final ArrayList<Point> values = Lists.newArrayList(iter);
+        final List<Point> values = iter.readAll(new ArrayList<Point>());
         assertEquals(3, values.size());
         assertEquals(1, values.get(0).x);
         assertEquals(2, values.get(0).y.intValue());

csv/src/test/java/com/fasterxml/jackson/dataformat/csv/ser/TestWriterWithMissingValues.java

@@ -4,60 +4,50 @@
 
 import com.fasterxml.jackson.dataformat.csv.*;
 
-import com.google.common.collect.ImmutableMap;
-
-import org.junit.Test;
-
-import java.lang.String;
-
-// [Issue#33]
+// [dataformats-text#33]
 public class TestWriterWithMissingValues extends ModuleTestBase
 {
     private final CsvSchema SCHEMA = new CsvSchema.Builder()
         .addColumn("timestamp", CsvSchema.ColumnType.STRING)
         .addColumn("value", CsvSchema.ColumnType.NUMBER)
         .addColumn("id", CsvSchema.ColumnType.STRING)
         .build();
-    final ObjectWriter WRITER = new CsvMapper().writer().with(SCHEMA);
-    
-    @Test
+    private final CsvMapper MAPPER = mapperForCsv();
+    final ObjectWriter WRITER = MAPPER.writer().with(SCHEMA);
+
     public void testWrite_NoNulls() {
         final String csv = WRITER.writeValueAsString(
-                ImmutableMap.of("timestamp", "2014-03-10T23:32:47+00:00",
+                mapOf("timestamp", "2014-03-10T23:32:47+00:00",
                         "value", 42, "id", "hello"));
 
         assertEquals("\"2014-03-10T23:32:47+00:00\",42,hello\n", csv);
     }
 
-    @Test
     public void testWrite_NullFirstColumn() {
         final String csv = WRITER.writeValueAsString(
-                ImmutableMap.of("value", 42, "id", "hello"));
+                mapOf("value", 42, "id", "hello"));
         assertEquals(",42,hello\n", csv);
     }
 
-    @Test
     public void testWrite_NullSecondColumn() {
         final String csv = WRITER.writeValueAsString(
-                ImmutableMap.of("timestamp", "2014-03-10T23:32:47+00:00",
+                mapOf("timestamp", "2014-03-10T23:32:47+00:00",
                         "id", "hello"));
 
         assertEquals("\"2014-03-10T23:32:47+00:00\",,hello\n", csv);
     }
 
-    @Test
     public void testWrite_NullThirdColumn()
     {
-        CsvMapper mapper = new CsvMapper();
-        assertFalse(mapper.tokenStreamFactory().isEnabled(CsvGenerator.Feature.OMIT_MISSING_TAIL_COLUMNS));
-        String csv = mapper.writer(SCHEMA).writeValueAsString(
-                ImmutableMap.of("timestamp", "2014-03-10T23:32:47+00:00",
+        assertFalse(MAPPER.tokenStreamFactory().isEnabled(CsvGenerator.Feature.OMIT_MISSING_TAIL_COLUMNS));
+        String csv = MAPPER.writer(SCHEMA).writeValueAsString(
+                mapOf("timestamp", "2014-03-10T23:32:47+00:00",
                         "value", 42));
 
         assertEquals("\"2014-03-10T23:32:47+00:00\",42,\n", csv);
-        ObjectWriter w = mapper.writer().with(CsvGenerator.Feature.OMIT_MISSING_TAIL_COLUMNS);
+        ObjectWriter w = MAPPER.writer().with(CsvGenerator.Feature.OMIT_MISSING_TAIL_COLUMNS);
         csv = w.with(SCHEMA).writeValueAsString(
-                ImmutableMap.of("timestamp", "2014-03-10T23:32:47+00:00",
+                mapOf("timestamp", "2014-03-10T23:32:47+00:00",
                         "value", 42));
         assertEquals("\"2014-03-10T23:32:47+00:00\",42\n", csv);
     }