Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

reference static serviceSettings in a static manner... #5192

Merged
merged 9 commits into from
Oct 19, 2018
Merged

reference static serviceSettings in a static manner... #5192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5269b92
get :ExcludeEmailFromExport working again #5185
pdurbin Oct 15, 2018
4ecb463
reference static serviceSettings in a static manner...
qqmyers Oct 15, 2018
1f7b1ab
update test
qqmyers Oct 19, 2018
9939e31
initialize to null
qqmyers Oct 19, 2018
111a4c0
reset to null before test
qqmyers Oct 19, 2018
16bccdb
support excludeemail setting
qqmyers Oct 19, 2018
b187069
also handle subfields
qqmyers Oct 19, 2018
b226db0
remove Logger
qqmyers Oct 19, 2018
17f68dd
more unused imports
qqmyers Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public static synchronized ExportService getInstance() {

public static synchronized ExportService getInstance(SettingsServiceBean settingsService) {
ExportService.settingsService = settingsService;
// We pass settingsService into the JsonPrinter so it can check the :ExcludeEmailFromExport setting in calls to JsonPrinter.jsonAsDatasetDto().
JsonPrinter.setSettingsService(settingsService);
if (service == null) {
service = new ExportService();
}
Expand Down Expand Up @@ -154,6 +156,7 @@ public void exportAllFormats(Dataset dataset) throws ExportException {
if (releasedVersion == null) {
throw new ExportException("No released version for dataset " + dataset.getGlobalId().toString());
}

final JsonObjectBuilder datasetAsJsonBuilder = JsonPrinter.jsonAsDatasetDto(releasedVersion);
JsonObject datasetAsJson = datasetAsJsonBuilder.build();

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/export/OAI_OREExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.auto.service.AutoService;
import edu.harvard.iq.dataverse.DatasetVersion;
import edu.harvard.iq.dataverse.export.spi.Exporter;
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
import edu.harvard.iq.dataverse.export.ExportException;
import edu.harvard.iq.dataverse.util.bagit.OREMap;
import java.io.OutputStream;
Expand All @@ -23,7 +24,7 @@ public class OAI_OREExporter implements Exporter {
public void exportDataset(DatasetVersion version, JsonObject json, OutputStream outputStream)
throws ExportException {
try {
new OREMap(version).writeOREMap(outputStream);
new OREMap(version, ExportService.settingsService.isTrueForKey(SettingsServiceBean.Key.ExcludeEmailFromExport, false)).writeOREMap(outputStream);
} catch (Exception e) {
logger.severe(e.getMessage());
e.printStackTrace();
Expand Down
12 changes: 10 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/util/bagit/OREMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ public class OREMap {
public static final String NAME = "OREMap";
private Map<String, String> localContext = new TreeMap<String, String>();
private DatasetVersion version;

public OREMap(DatasetVersion version) {
private boolean excludeEmail = false;

public OREMap(DatasetVersion version, boolean excludeEmail) {
this.version = version;
this.excludeEmail = excludeEmail;
}

public void writeOREMap(OutputStream outputStream) throws Exception {
Expand All @@ -64,6 +66,9 @@ public JsonObject getOREMap() throws Exception {
for (DatasetField field : fields) {
if (!field.isEmpty()) {
DatasetFieldType dfType = field.getDatasetFieldType();
if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dfType.getFieldType())) {
continue;
}
JsonLDTerm fieldName = getTermFor(dfType);
if (fieldName.inNamespace()) {
localContext.putIfAbsent(fieldName.getNamespace().getPrefix(), fieldName.getNamespace().getUrl());
Expand All @@ -83,6 +88,9 @@ public JsonObject getOREMap() throws Exception {

for (DatasetField dsf : dscv.getChildDatasetFields()) {
DatasetFieldType dsft = dsf.getDatasetFieldType();
if(excludeEmail && DatasetFieldType.FieldType.EMAIL.equals(dsft.getFieldType())) {
continue;
}
// which may have multiple values
if (!dsf.isEmpty()) {
// Add context entry
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ public class JsonPrinter {

private static final Logger logger = Logger.getLogger(JsonPrinter.class.getCanonicalName());

static SettingsServiceBean settingsService;
static SettingsServiceBean settingsService = null;

public JsonPrinter(SettingsServiceBean settingsService) {
this.settingsService = settingsService;
// Passed to DatasetFieldWalker so it can check the :ExcludeEmailFromExport setting
public static void setSettingsService(SettingsServiceBean ssb) {
settingsService = ssb;
}

public JsonPrinter() {
this(null);

}

public static final BriefJsonPrinter brief = new BriefJsonPrinter();
Expand Down
14 changes: 6 additions & 8 deletions src/test/java/edu/harvard/iq/dataverse/util/json/JsonPrinterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ public void setUp() {
t.setParentDatasetFieldType(compoundSingleType);
}
compoundSingleType.setChildDatasetFieldTypes(childTypes);
// settingsSvc = new JsonParserTest.MockSettingsSvc();
// jsonPrinter = new JsonPrinter(settingsSvc);
}

@Test
Expand Down Expand Up @@ -197,9 +195,9 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
fields.add(datasetContactField);

SettingsServiceBean nullServiceBean = null;
JsonPrinter jsonPrinter = new JsonPrinter(nullServiceBean);

JsonObject jsonObject = jsonPrinter.json(block, fields).build();
JsonPrinter.setSettingsService(nullServiceBean);
JsonObject jsonObject = JsonPrinter.json(block, fields).build();
assertNotNull(jsonObject);

System.out.println("json: " + JsonUtil.prettyPrint(jsonObject.toString()));
Expand All @@ -208,7 +206,7 @@ public void testDatasetContactOutOfBoxNoPrivacy() {
assertEquals("Bar University", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactAffiliation").getString("value"));
assertEquals("foo@bar.com", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactEmail").getString("value"));

JsonObject byBlocks = jsonPrinter.jsonByBlocks(fields).build();
JsonObject byBlocks = JsonPrinter.jsonByBlocks(fields).build();

System.out.println("byBlocks: " + JsonUtil.prettyPrint(byBlocks.toString()));
assertEquals("Foo Bar", byBlocks.getJsonObject("citation").getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactName").getString("value"));
Expand Down Expand Up @@ -238,7 +236,7 @@ public void testDatasetContactWithPrivacy() {
datasetContactField.setDatasetFieldCompoundValues(vals);
fields.add(datasetContactField);

JsonPrinter jsonPrinter = new JsonPrinter(new MockSettingsSvc());
JsonPrinter.setSettingsService(new MockSettingsSvc());

JsonObject jsonObject = JsonPrinter.json(block, fields).build();
assertNotNull(jsonObject);
Expand All @@ -249,7 +247,7 @@ public void testDatasetContactWithPrivacy() {
assertEquals("Bar University", jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactAffiliation").getString("value"));
assertEquals(null, jsonObject.getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactEmail"));

JsonObject byBlocks = jsonPrinter.jsonByBlocks(fields).build();
JsonObject byBlocks = JsonPrinter.jsonByBlocks(fields).build();

System.out.println("byBlocks: " + JsonUtil.prettyPrint(byBlocks.toString()));
assertEquals("Foo Bar", byBlocks.getJsonObject("citation").getJsonArray("fields").getJsonObject(0).getJsonArray("value").getJsonObject(0).getJsonObject("datasetContactName").getString("value"));
Expand Down