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

Migrate FileProjectManager to Jackson

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-15 17:39:11 +00:00
parent ccb1ac84c1
commit 4a067cb110
1 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
main/src/com/google/refine/io/FileProjectManager.java
View File

@ -36,12 +36,12 @@ package com.google.refine.io;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
@ -50,10 +50,7 @@ import java.util.zip.GZIPOutputStream;
import org.apache.tools.tar.TarEntry; import org.apache.tools.tar.TarEntry;
import org.apache.tools.tar.TarInputStream; import org.apache.tools.tar.TarInputStream;
import org.apache.tools.tar.TarOutputStream; import org.apache.tools.tar.TarOutputStream;
import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -377,60 +374,11 @@ public class FileProjectManager extends ProjectManager {
boolean found = false; boolean found = false;
if (file.exists() || file.canRead()) {
FileReader reader = null;
try { try {
reader = new FileReader(file); ParsingUtilities.mapper.readerForUpdating(this).readValue(file);
JSONTokener tokener = new JSONTokener(reader);
JSONObject obj = (JSONObject) tokener.nextValue();
// load global preferences firstly
if (obj.has("preferences") && !obj.isNull("preferences")) {
_preferenceStore = ParsingUtilities.mapper.readValue(obj.getJSONObject("preferences").toString(), PreferenceStore.class);
}
JSONArray a = obj.getJSONArray("projectIDs");
int count = a.length();
for (int i = 0; i < count; i++) {
long id = a.getLong(i);
File projectDir = getProjectDir(id);
ProjectMetadata metadata = ProjectMetadataUtilities.load(projectDir);
mergeEmptyUserMetadata(metadata);
_projectsMetadata.put(id, metadata);
if (metadata != null && metadata.getTags() != null) {
for (String tag : metadata.getTags()) {
if (_projectsTags.containsKey(tag)) {
_projectsTags.put(tag, _projectsTags.get(tag) + 1);
} else {
_projectsTags.put(tag, 1);
}
}
}
}
if (obj.has("expressions") && !obj.isNull("expressions")) { // backward compatibility
TopList newExpressions = ParsingUtilities.mapper.readValue(obj.getJSONArray("expressions").toString(), TopList.class);
this._preferenceStore.put("scripting.expressions", newExpressions);
}
found = true; found = true;
} catch (JSONException e) { } catch(IOException e) {
logger.warn("Error reading file", e); logger.warn(e.toString());
} catch (IOException e) {
logger.warn("Error reading file", e);
} finally {
try {
if (reader != null) {
reader.close();
}
} catch (IOException e) {
logger.warn("Exception closing file",e);
}
}
} }
return found; return found;
@ -490,4 +438,42 @@ public class FileProjectManager extends ProjectManager {
public Set<Long> getProjectIds() { public Set<Long> getProjectIds() {
return _projectsMetadata.keySet(); return _projectsMetadata.keySet();
} }
@JsonProperty("projectIDs")
protected void loadProjects(List<Long> projectIDs) {
for (Long id : projectIDs) {
File projectDir = getProjectDir(id);
ProjectMetadata metadata = ProjectMetadataUtilities.load(projectDir);
mergeEmptyUserMetadata(metadata);
_projectsMetadata.put(id, metadata);
if (metadata != null && metadata.getTags() != null) {
for (String tag : metadata.getTags()) {
if (_projectsTags.containsKey(tag)) {
_projectsTags.put(tag, _projectsTags.get(tag) + 1);
} else {
_projectsTags.put(tag, 1);
}
}
}
}
}
@JsonProperty("preferences")
protected void setPreferences(PreferenceStore preferences) {
if(preferences != null) {
_preferenceStore = preferences;
}
}
// backwards compatibility
@JsonProperty("expressions")
protected void setExpressions(TopList newExpressions) {
if (newExpressions != null) {
_preferenceStore.put("scripting.expressions", newExpressions);
}
}
} }