s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2008 from ostephens/jackson-fixes

Browse Source 
Cell serialization fixes
This commit is contained in:
Antonin Delpeuch 2019-04-07 20:09:41 +01:00 committed by GitHub
commit a077968dc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/wikidata/src/org/openrefine/wikidata/editing/NewItemLibrary.java
View File

@ -134,7 +134,9 @@ public class NewItemLibrary {
ReconConfig config = column.getReconConfig();
if (config instanceof StandardReconConfig) {
StandardReconConfig stdConfig = (StandardReconConfig)config;
stdConfig.computeFeatures(recon, cell.getValueAsString());
if (cell.getValue() instanceof String) {
stdConfig.computeFeatures(recon, (String) cell.getValue());
}
}
}
}

5
main/src/com/google/refine/model/Cell.java
View File

@ -102,7 +102,7 @@ public class Cell implements HasFields {
@JsonProperty("v")
@JsonInclude(Include.NON_NULL)
public String getValueAsString() {
public Object getValue() {
if (value != null && !ExpressionUtils.isError(value)) {
Instant instant = null;
if (value instanceof OffsetDateTime) {
@ -119,8 +119,9 @@ public class Cell implements HasFields {
return ((Double)value).toString();
} else if (value instanceof Float
&& (((Float)value).isNaN() || ((Float)value).isInfinite())) {
// TODO: Skip? Write as string?
return ((Float)value).toString();
} else if (value instanceof Boolean || value instanceof Number){
return value;
} else {
return value.toString();
}

66
main/tests/server/src/com/google/refine/tests/model/CellTests.java
View File

@ -26,6 +26,10 @@
******************************************************************************/
package com.google.refine.tests.model;
import java.time.format.DateTimeFormatter;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -95,4 +99,66 @@ public class CellTests {
String json = "{\"v\":\"2018-03-04T08:09:10Z\",\"t\":\"date\"}";
TestUtils.isSerializedTo(Cell.loadStreaming(json, pool), json);
}
@Test
public void serializeNumberCell() throws Exception {
String json = "{\"v\": 1}";
Cell c = Cell.loadStreaming(json, pool);
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeBooleanCell() throws Exception {
String json = "{\"v\": true}";
Cell c = Cell.loadStreaming(json, pool);
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeDatewithOffset() throws Exception {
OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
Cell c = new Cell(dateTimeValue, null);
String json = "{\"v\":\"2017-05-12T04:45:00Z\",\"t\":\"date\"}";
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeLocalDate() throws Exception {
LocalDateTime dateTimeValue = LocalDateTime.of(2017,5,12,0,0,0);
Cell c = new Cell(dateTimeValue, null);
String json = "{\"v\":\"2017-05-12T00:00:00Z\",\"t\":\"date\"}";
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeDoubleNan() throws Exception {
double dn = Double.NaN;
Cell c = new Cell(dn, null);
String json = "{\"v\":\"NaN\"}";
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeFloatNan() throws Exception {
Float fn = Float.NaN;
Cell c = new Cell(fn, null);
String json = "{\"v\":\"NaN\"}";
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeDoubleInfinity() throws Exception {
double di = Double.POSITIVE_INFINITY;
Cell c = new Cell(di, null);
String json = "{\"v\":\"Infinity\"}";
TestUtils.isSerializedTo(c, json);
}
@Test
public void serializeFloatInfinity() throws Exception {
Float fi = Float.POSITIVE_INFINITY;
Cell c = new Cell(fi, null);
String json = "{\"v\":\"Infinity\"}";
TestUtils.isSerializedTo(c, json);
}
}