Revert "file updates - use encodingFormat and always send contentUrl if allowed"

qqmyers · qqmyers · commit cbc0e52907d2 · 2022-10-19T13:05:36.000-04:00
This reverts commit 3cdfd49.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java b/src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@@ -2012,7 +2012,7 @@ public String getJsonLd() {
                 }
                 fileObject.add("@type", "DataDownload");
                 fileObject.add("name", fileMetadata.getLabel());
-                fileObject.add("encodingFormat", fileMetadata.getDataFile().getContentType());
+                fileObject.add("fileFormat", fileMetadata.getDataFile().getContentType());
                 fileObject.add("contentSize", fileMetadata.getDataFile().getFilesize());
                 fileObject.add("description", fileMetadata.getDescription());
                 fileObject.add("@id", filePidUrlAsString);
@@ -2021,8 +2021,10 @@ public String getJsonLd() {
                 if (hideFilesBoolean != null && hideFilesBoolean.equals("true")) {
                     // no-op
                 } else {
-                    String nullDownloadType = null;
-                    fileObject.add("contentUrl", dataverseSiteUrl + FileUtil.getFileDownloadUrlPath(nullDownloadType, fileMetadata.getDataFile().getId(), false, fileMetadata.getId()));
+                    if (FileUtil.isPubliclyDownloadable(fileMetadata)) {
+                        String nullDownloadType = null;
+                        fileObject.add("contentUrl", dataverseSiteUrl + FileUtil.getFileDownloadUrlPath(nullDownloadType, fileMetadata.getDataFile().getId(), false, fileMetadata.getId()));
+                    }
                 }
                 fileArray.add(fileObject);
             }
diff --git a/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java b/src/test/java/edu/harvard/iq/dataverse/export/SchemaDotOrgExporterTest.java
@@ -181,7 +181,7 @@ public void testExportDataset() throws Exception {
         assertEquals(2, json2.getJsonArray("spatialCoverage").size());
         assertEquals("DataDownload", json2.getJsonArray("distribution").getJsonObject(0).getString("@type"));
         assertEquals("README.md", json2.getJsonArray("distribution").getJsonObject(0).getString("name"));
-        assertEquals("text/plain", json2.getJsonArray("distribution").getJsonObject(0).getString("encodingFormat"));
+        assertEquals("text/plain", json2.getJsonArray("distribution").getJsonObject(0).getString("fileFormat"));
         assertEquals(1234, json2.getJsonArray("distribution").getJsonObject(0).getInt("contentSize"));
         assertEquals("README file.", json2.getJsonArray("distribution").getJsonObject(0).getString("description"));
         assertEquals("https://doi.org/10.5072/FK2/7V5MPI", json2.getJsonArray("distribution").getJsonObject(0).getString("@id"));
