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

Fix deserialization of MassEditOperation

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-02 15:06:54 +00:00
parent 2873035ee2
commit 5cf58d874b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/com/google/refine/operations/cell/MassEditOperation.java
View File

@ -77,7 +77,7 @@ public class MassEditOperation extends EngineDependentMassCellOperation {
boolean fromError, boolean fromError,
Serializable to) { Serializable to) {
this.from = from; this.from = from;
this.fromBlank = fromBlank; this.fromBlank = fromBlank || (from.size() == 1 && from.get(0).length() == 0);
this.fromError = fromError; this.fromError = fromError;
this.to = to; this.to = to;
} }
@ -103,7 +103,16 @@ public class MassEditOperation extends EngineDependentMassCellOperation {
} }
} }
public MassEditOperation(EngineConfig engineConfig, String columnName, String expression, List<Edit> edits) { @JsonCreator
public MassEditOperation(
@JsonProperty("engineConfig")
EngineConfig engineConfig,
@JsonProperty("columnName")
String columnName,
@JsonProperty("expression")
String expression,
@JsonProperty("edits")
List<Edit> edits) {
super(engineConfig, columnName, true); super(engineConfig, columnName, true);
_expression = expression; _expression = expression;
_edits = edits; _edits = edits;

4
main/tests/server/src/com/google/refine/tests/operations/cell/MassOperationTests.java
View File

@ -93,7 +93,7 @@ public class MassOperationTests extends RefineTest {
public void testReconstructEditDate() throws Exception { public void testReconstructEditDate() throws Exception {
editsString = "[{\"from\":[\"2018-10-04T00:00:00Z\"],\"to\":\"newString\",\"type\":\"text\"}]"; editsString = "[{\"from\":[\"2018-10-04T00:00:00Z\"],\"to\":\"newString\",\"type\":\"text\"}]";
editList = ParsingUtilities.mapper.readValue(ParsingUtilities.evaluateJsonStringToArray(editsString).toString(), new TypeReference<List<Edit>>() {}); editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
Assert.assertEquals(editList.get(0).from.get(0), "2018-10-04T00:00:00Z"); Assert.assertEquals(editList.get(0).from.get(0), "2018-10-04T00:00:00Z");
Assert.assertEquals(editList.get(0).to,"newString" ); Assert.assertEquals(editList.get(0).to,"newString" );
@ -105,7 +105,7 @@ public class MassOperationTests extends RefineTest {
public void testReconstructEditEmpty() throws Exception { public void testReconstructEditEmpty() throws Exception {
editsString = "[{\"from\":[\"\"],\"to\":\"newString\",\"type\":\"text\"}]"; editsString = "[{\"from\":[\"\"],\"to\":\"newString\",\"type\":\"text\"}]";
editList = ParsingUtilities.mapper.readValue(ParsingUtilities.evaluateJsonStringToArray(editsString).toString(), new TypeReference<List<Edit>>() {}); editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
Assert.assertEquals(editList.get(0).from.size(), 1); Assert.assertEquals(editList.get(0).from.size(), 1);
Assert.assertEquals(editList.get(0).from.get(0), ""); Assert.assertEquals(editList.get(0).from.get(0), "");