-
-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a way to distinguish between null and empty
- Loading branch information
1 parent
8edbd05
commit fa938f1
Showing
3 changed files
with
205 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
143 changes: 143 additions & 0 deletions
143
...c/test/java/com/fasterxml/jackson/dataformat/csv/deser/EmptyUnquotedStringAsNullTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| package com.fasterxml.jackson.dataformat.csv.deser; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonPropertyOrder; | ||
| import com.fasterxml.jackson.databind.MappingIterator; | ||
| import com.fasterxml.jackson.databind.ObjectReader; | ||
| import com.fasterxml.jackson.dataformat.csv.CsvMapper; | ||
| import com.fasterxml.jackson.dataformat.csv.CsvParser; | ||
| import com.fasterxml.jackson.dataformat.csv.ModuleTestBase; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Tests for {@code CsvParser.Feature.EMPTY_UNQUOTED_STRING_AS_NULL} | ||
| */ | ||
| public class EmptyUnquotedStringAsNullTest | ||
| extends ModuleTestBase | ||
| { | ||
| @JsonPropertyOrder({"firstName", "middleName", "lastName"}) | ||
| static class TestUser { | ||
| public String firstName, middleName, lastName; | ||
| } | ||
|
|
||
| /* | ||
| /********************************************************** | ||
| /* Test methods | ||
| /********************************************************** | ||
| */ | ||
|
|
||
| private final CsvMapper MAPPER = mapperForCsv(); | ||
|
|
||
| public void testDefaultParseAsEmptyString() throws IOException { | ||
| // setup test data | ||
| TestUser expectedTestUser = new TestUser(); | ||
| expectedTestUser.firstName = "Grace"; | ||
| expectedTestUser.middleName = ""; | ||
| expectedTestUser.lastName = "Hopper"; | ||
| ObjectReader objectReader = MAPPER.readerFor(TestUser.class).with(MAPPER.schemaFor(TestUser.class)); | ||
| String csv = "Grace,,Hopper"; | ||
|
|
||
| // execute | ||
| TestUser actualTestUser = objectReader.readValue(csv); | ||
|
|
||
| // test | ||
| assertNotNull(actualTestUser); | ||
| assertEquals(expectedTestUser.firstName, actualTestUser.firstName); | ||
| assertEquals(expectedTestUser.middleName, actualTestUser.middleName); | ||
| assertEquals(expectedTestUser.lastName, actualTestUser.lastName); | ||
| } | ||
|
|
||
| public void testSimpleParseEmptyUnquotedStringAsNull() throws IOException { | ||
| // setup test data | ||
| TestUser expectedTestUser = new TestUser(); | ||
| expectedTestUser.firstName = "Grace"; | ||
| expectedTestUser.lastName = "Hopper"; | ||
|
|
||
| ObjectReader objectReader = MAPPER | ||
| .readerFor(TestUser.class) | ||
| .with(MAPPER.schemaFor(TestUser.class)) | ||
| .with(CsvParser.Feature.EMPTY_UNQUOTED_STRING_AS_NULL); | ||
| String csv = "Grace,,Hopper"; | ||
|
|
||
| // execute | ||
| TestUser actualTestUser = objectReader.readValue(csv); | ||
|
|
||
| // test | ||
| assertNotNull(actualTestUser); | ||
| assertEquals(expectedTestUser.firstName, actualTestUser.firstName); | ||
| assertNull("The column that contains an empty String should be deserialized as null ", actualTestUser.middleName); | ||
| assertEquals(expectedTestUser.lastName, actualTestUser.lastName); | ||
| } | ||
|
|
||
| public void testSimpleParseEmptyQuotedStringAsNonNull() throws IOException { | ||
| // setup test data | ||
| TestUser expectedTestUser = new TestUser(); | ||
| expectedTestUser.firstName = "Grace"; | ||
| expectedTestUser.middleName = ""; | ||
| expectedTestUser.lastName = "Hopper"; | ||
|
|
||
| ObjectReader objectReader = MAPPER | ||
| .readerFor(TestUser.class) | ||
| .with(MAPPER.schemaFor(TestUser.class)) | ||
| .with(CsvParser.Feature.EMPTY_UNQUOTED_STRING_AS_NULL); | ||
| String csv = "Grace,\"\",Hopper"; | ||
|
|
||
| // execute | ||
| TestUser actualTestUser = objectReader.readValue(csv); | ||
|
|
||
| // test | ||
| assertNotNull(actualTestUser); | ||
| assertEquals(expectedTestUser.firstName, actualTestUser.firstName); | ||
| assertEquals(expectedTestUser.middleName, actualTestUser.middleName); | ||
| assertEquals(expectedTestUser.lastName, actualTestUser.lastName); | ||
| } | ||
|
|
||
| // [dataformats-text#222] | ||
| public void testEmptyUnquotedStringAsNullNonPojo() throws Exception | ||
| { | ||
| String csv = "Grace,,Hopper"; | ||
|
|
||
| ObjectReader r = MAPPER.reader() | ||
| .with(CsvParser.Feature.EMPTY_UNQUOTED_STRING_AS_NULL) | ||
| .with(CsvParser.Feature.WRAP_AS_ARRAY); | ||
|
|
||
| try (MappingIterator<Object[]> it1 = r.forType(Object[].class).readValues(csv)) { | ||
| Object[] array1 = it1.next(); | ||
| assertEquals(3, array1.length); | ||
| assertEquals("Grace", array1[0]); | ||
| assertNull(array1[1]); | ||
| assertEquals("Hopper", array1[2]); | ||
| } | ||
| try (MappingIterator<String[]> it2 = r.forType(String[].class).readValues(csv)) { | ||
| String[] array2 = it2.next(); | ||
| assertEquals(3, array2.length); | ||
| assertEquals("Grace", array2[0]); | ||
| assertNull(array2[1]); | ||
| assertEquals("Hopper", array2[2]); | ||
| } | ||
| } | ||
|
|
||
| public void testEmptyQuotedStringAsNonNullNonPojo() throws Exception | ||
| { | ||
| String csv = "Grace,\"\",Hopper"; | ||
|
|
||
| ObjectReader r = MAPPER.reader() | ||
| .with(CsvParser.Feature.EMPTY_UNQUOTED_STRING_AS_NULL) | ||
| .with(CsvParser.Feature.WRAP_AS_ARRAY); | ||
|
|
||
| try (MappingIterator<Object[]> it1 = r.forType(Object[].class).readValues(csv)) { | ||
| Object[] array1 = it1.next(); | ||
| assertEquals(3, array1.length); | ||
| assertEquals("Grace", array1[0]); | ||
| assertEquals("", array1[1]); | ||
| assertEquals("Hopper", array1[2]); | ||
| } | ||
| try (MappingIterator<String[]> it2 = r.forType(String[].class).readValues(csv)) { | ||
| String[] array2 = it2.next(); | ||
| assertEquals(3, array2.length); | ||
| assertEquals("Grace", array2[0]); | ||
| assertEquals("", array2[1]); | ||
| assertEquals("Hopper", array2[2]); | ||
| } | ||
| } | ||
| } |