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

Migrate RowFilters to Jackson

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-19 16:34:29 +00:00
parent 2c5607b9fa
commit f3f6a2846b
3 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main/src/com/google/refine/browsing/filters/ExpressionEqualRowFilter.java
View File

@ -38,12 +38,11 @@ import java.time.OffsetDateTime;
import java.util.Collection; import java.util.Collection;
import java.util.Properties; import java.util.Properties;
import org.json.JSONArray; import com.fasterxml.jackson.databind.node.ArrayNode;
import org.json.JSONException;
import com.google.refine.browsing.RowFilter; import com.google.refine.browsing.RowFilter;
import com.google.refine.expr.Evaluable; import com.google.refine.expr.Evaluable;
import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.ExpressionUtils;
import com.google.refine.expr.util.JsonValueConverter;
import com.google.refine.model.Cell; import com.google.refine.model.Cell;
import com.google.refine.model.Project; import com.google.refine.model.Project;
import com.google.refine.model.Row; import com.google.refine.model.Row;
@ -122,18 +121,14 @@ public class ExpressionEqualRowFilter implements RowFilter {
} }
} }
return false; return false;
} else if (value instanceof JSONArray) { } else if (value instanceof ArrayNode) {
JSONArray a = (JSONArray) value; ArrayNode a = (ArrayNode) value;
int l = a.length(); int l = a.size();
for (int i = 0; i < l; i++) { for (int i = 0; i < l; i++) {
try { if (testValue(JsonValueConverter.convert(a.get(i)))) {
if (testValue(a.get(i))) {
return true; return true;
} }
} catch (JSONException e) {
// ignore
}
} }
return false; return false;
} // else, fall through } // else, fall through
@ -165,18 +160,14 @@ public class ExpressionEqualRowFilter implements RowFilter {
} }
} }
return true; return true;
} else if (value instanceof JSONArray) { } else if (value instanceof ArrayNode) {
JSONArray a = (JSONArray) value; ArrayNode a = (ArrayNode) value;
int l = a.length(); int l = a.size();
for (int i = 0; i < l; i++) { for (int i = 0; i < l; i++) {
try { if (testValue(JsonValueConverter.convert(a.get(i)))) {
if (testValue(a.get(i))) {
return false; return false;
} }
} catch (JSONException e) {
// ignore
}
} }
return true; return true;
} // else, fall through } // else, fall through

17
main/src/com/google/refine/browsing/filters/ExpressionNumberComparisonRowFilter.java
View File

@ -36,12 +36,11 @@ package com.google.refine.browsing.filters;
import java.util.Collection; import java.util.Collection;
import java.util.Properties; import java.util.Properties;
import org.json.JSONArray; import com.fasterxml.jackson.databind.node.ArrayNode;
import org.json.JSONException;
import com.google.refine.browsing.RowFilter; import com.google.refine.browsing.RowFilter;
import com.google.refine.browsing.util.RowEvaluable; import com.google.refine.browsing.util.RowEvaluable;
import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.ExpressionUtils;
import com.google.refine.expr.util.JsonValueConverter;
import com.google.refine.model.Project; import com.google.refine.model.Project;
import com.google.refine.model.Row; import com.google.refine.model.Row;
@ -93,18 +92,14 @@ abstract public class ExpressionNumberComparisonRowFilter implements RowFilter {
} }
} }
return false; return false;
} else if (value instanceof JSONArray) { } else if (value instanceof ArrayNode) {
JSONArray a = (JSONArray) value; ArrayNode a = (ArrayNode) value;
int l = a.length(); int l = a.size();
for (int i = 0; i < l; i++) { for (int i = 0; i < l; i++) {
try { if (checkValue(JsonValueConverter.convert(a.get(i)))) {
if (checkValue(a.get(i))) {
return true; return true;
} }
} catch (JSONException e) {
// ignore
}
} }
return false; return false;
} // else, fall through } // else, fall through

17
main/src/com/google/refine/browsing/filters/ExpressionStringComparisonRowFilter.java
View File

@ -36,12 +36,11 @@ package com.google.refine.browsing.filters;
import java.util.Collection; import java.util.Collection;
import java.util.Properties; import java.util.Properties;
import org.json.JSONArray; import com.fasterxml.jackson.databind.node.ArrayNode;
import org.json.JSONException;
import com.google.refine.browsing.RowFilter; import com.google.refine.browsing.RowFilter;
import com.google.refine.expr.Evaluable; import com.google.refine.expr.Evaluable;
import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.ExpressionUtils;
import com.google.refine.expr.util.JsonValueConverter;
import com.google.refine.model.Cell; import com.google.refine.model.Cell;
import com.google.refine.model.Project; import com.google.refine.model.Project;
import com.google.refine.model.Row; import com.google.refine.model.Row;
@ -86,18 +85,14 @@ abstract public class ExpressionStringComparisonRowFilter implements RowFilter {
} }
} }
return invert; return invert;
} else if (value instanceof JSONArray) { } else if (value instanceof ArrayNode) {
JSONArray a = (JSONArray) value; ArrayNode a = (ArrayNode) value;
int l = a.length(); int l = a.size();
for (int i = 0; i < l; i++) { for (int i = 0; i < l; i++) {
try { if (checkValue(JsonValueConverter.convert(a.get(i)).toString())) {
if (checkValue(a.get(i).toString())) {
return !invert; return !invert;
} }
} catch (JSONException e) {
// ignore
}
} }
return invert; return invert;
} else { } else {