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

Migrate StandardReconConfig to Jackson

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-20 14:42:55 +00:00
parent ba8e406a97
commit 772ee1ee59
1 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
main/src/com/google/refine/model/recon/StandardReconConfig.java
View File

@ -48,9 +48,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -60,6 +57,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.refine.expr.ExpressionUtils; import com.google.refine.expr.ExpressionUtils;
import com.google.refine.model.Cell; import com.google.refine.model.Cell;
import com.google.refine.model.Project; import com.google.refine.model.Project;
@ -284,7 +284,19 @@ public class StandardReconConfig extends ReconConfig {
this.properties = properties; this.properties = properties;
this.limit = limit; this.limit = limit;
} }
}
protected class ReconResult {
@JsonProperty("name")
protected String name;
@JsonProperty("id")
protected String id;
@JsonProperty("types")
protected String[] types = new String[0];
@JsonProperty("score")
protected double score;
@JsonProperty("match")
protected boolean match = false;
} }
@Override @Override
@ -388,7 +400,7 @@ public class StandardReconConfig extends ReconConfig {
InputStream is = connection.getInputStream(); InputStream is = connection.getInputStream();
try { try {
String s = ParsingUtilities.inputStreamToString(is); String s = ParsingUtilities.inputStreamToString(is);
JSONObject o = ParsingUtilities.evaluateJsonStringToObject(s); ObjectNode o = ParsingUtilities.evaluateJsonStringToObjectNode(s);
for (int i = 0; i < jobs.size(); i++) { for (int i = 0; i < jobs.size(); i++) {
StandardReconJob job = (StandardReconJob) jobs.get(i); StandardReconJob job = (StandardReconJob) jobs.get(i);
@ -396,10 +408,10 @@ public class StandardReconConfig extends ReconConfig {
String text = job.text; String text = job.text;
String key = "q" + i; String key = "q" + i;
if (o.has(key)) { if (o.has(key) && o.get(key) instanceof ObjectNode) {
JSONObject o2 = o.getJSONObject(key); ObjectNode o2 = (ObjectNode) o.get(key);
if (o2.has("result")) { if (o2.has("result") && o2.get("result") instanceof ArrayNode) {
JSONArray results = o2.getJSONArray("result"); ArrayNode results = (ArrayNode) o2.get("result");
recon = createReconServiceResults(text, results, historyEntryID); recon = createReconServiceResults(text, results, historyEntryID);
} else { } else {
@ -418,7 +430,7 @@ public class StandardReconConfig extends ReconConfig {
is.close(); is.close();
} }
} }
} catch (Exception e) { } catch (IOException e) {
logger.error("Failed to batch recon with load:\n" + queriesString, e); logger.error("Failed to batch recon with load:\n" + queriesString, e);
} }
@ -441,64 +453,49 @@ public class StandardReconConfig extends ReconConfig {
return recon; return recon;
} }
protected Recon createReconServiceResults(String text, JSONArray results, long historyEntryID) { protected Recon createReconServiceResults(String text, ArrayNode resultsList, long historyEntryID) throws IOException {
Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace); Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace);
try { List<ReconResult> results = ParsingUtilities.mapper.readValue(resultsList.toString(), new TypeReference<List<ReconResult>>() {});
int length = results.length();
int count = 0; int length = results.size();
for (int i = 0; i < length; i++) { int count = 0;
JSONObject result = results.getJSONObject(i); for (int i = 0; i < length; i++) {
if (!result.has("name")) { ReconResult result = results.get(i);
continue; ReconCandidate candidate = new ReconCandidate(
} result.id,
result.name,
JSONArray types = result.getJSONArray("type"); result.types,
String[] typeIDs = new String[types.length()]; result.score
for (int j = 0; j < typeIDs.length; j++) { );
Object type = types.get(j);
typeIDs[j] = type instanceof String ? (String) type : if (autoMatch && i == 0 && result.match) {
((JSONObject) type).getString("id"); recon.match = candidate;
} recon.matchRank = 0;
recon.judgment = Judgment.Matched;
double score = result.getDouble("score"); recon.judgmentAction = "auto";
ReconCandidate candidate = new ReconCandidate(
result.getString("id"),
result.getString("name"),
typeIDs,
score
);
if (autoMatch && i == 0 && result.has("match") && result.getBoolean("match")) {
recon.match = candidate;
recon.matchRank = 0;
recon.judgment = Judgment.Matched;
recon.judgmentAction = "auto";
}
recon.addCandidate(candidate);
count++;
} }
if (count > 0) { recon.addCandidate(candidate);
ReconCandidate candidate = recon.candidates.get(0); count++;
}
recon.setFeature(Recon.Feature_nameMatch, text.equalsIgnoreCase(candidate.name));
recon.setFeature(Recon.Feature_nameLevenshtein, if (count > 0) {
StringUtils.getLevenshteinDistance(StringUtils.lowerCase(text), StringUtils.lowerCase(candidate.name))); ReconCandidate candidate = recon.candidates.get(0);
recon.setFeature(Recon.Feature_nameWordDistance, wordDistance(text, candidate.name));
recon.setFeature(Recon.Feature_nameMatch, text.equalsIgnoreCase(candidate.name));
recon.setFeature(Recon.Feature_typeMatch, false); recon.setFeature(Recon.Feature_nameLevenshtein,
if (this.typeID != null) { StringUtils.getLevenshteinDistance(StringUtils.lowerCase(text), StringUtils.lowerCase(candidate.name)));
for (String typeID : candidate.types) { recon.setFeature(Recon.Feature_nameWordDistance, wordDistance(text, candidate.name));
if (this.typeID.equals(typeID)) {
recon.setFeature(Recon.Feature_typeMatch, true); recon.setFeature(Recon.Feature_typeMatch, false);
break; if (this.typeID != null) {
} for (String typeID : candidate.types) {
if (this.typeID.equals(typeID)) {
recon.setFeature(Recon.Feature_typeMatch, true);
break;
} }
} }
} }
} catch (JSONException e) {
e.printStackTrace();
} }
return recon; return recon;
} }