diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java index eeee3bb21e0..4989faa054b 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java +++ b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java @@ -2,6 +2,7 @@ import edu.harvard.iq.dataverse.util.MarkupChecker; import edu.harvard.iq.dataverse.DatasetFieldType.FieldType; +import edu.harvard.iq.dataverse.branding.BrandingUtil; import edu.harvard.iq.dataverse.util.StringUtil; import edu.harvard.iq.dataverse.util.SystemConfig; import edu.harvard.iq.dataverse.workflows.WorkflowComment; @@ -1059,6 +1060,7 @@ public String getDistributorName() { return null; } + // TODO: Consider renaming this method since it's also used for getting the "provider" for Schema.org JSON-LD. public String getRootDataverseNameforCitation(){ //Get root dataverse name for Citation Dataverse root = this.getDataset().getOwner(); @@ -1513,9 +1515,10 @@ public String getJsonLd() { .add("url", SystemConfig.getDataverseSiteUrlStatic()) ); + String installationBrandName = BrandingUtil.getInstallationBrandName(getRootDataverseNameforCitation()); job.add("provider", Json.createObjectBuilder() .add("@type", "Organization") - .add("name", "Dataverse") + .add("name", installationBrandName) ); jsonLd = job.build().toString(); return jsonLd; diff --git a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java index 084626c14c3..6987bb78e11 100644 --- a/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/DatasetVersionTest.java @@ -133,7 +133,7 @@ public void testGetJsonLd() throws ParseException { assertEquals(emptyArray, obj.getJsonArray("creator")); // TODO: If it ever becomes easier to mock subjects, test them. assertEquals(emptyArray, obj.getJsonArray("keywords")); - assertEquals("Dataverse", obj.getJsonObject("provider").getString("name")); + assertEquals("LibraScholar", obj.getJsonObject("provider").getString("name")); assertEquals("LibraScholar", obj.getJsonObject("includedInDataCatalog").getString("name")); } diff --git a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java index bbf2580213a..c455429379c 100644 --- a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java @@ -191,7 +191,7 @@ public void testExportDataset() throws Exception { assertEquals("LibraScholar", json2.getJsonObject("includedInDataCatalog").getString("name")); assertEquals("https://librascholar.org", json2.getJsonObject("includedInDataCatalog").getString("url")); assertEquals("Organization", json2.getJsonObject("provider").getString("@type")); - assertEquals("Dataverse", json2.getJsonObject("provider").getString("name")); + assertEquals("LibraScholar", json2.getJsonObject("provider").getString("name")); } /**