From 60d6f92c6985f0b489a8f56dace2ad3d8b1628e5 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:36:17 -0500
Subject: [PATCH 01/25] audit physical files

---
 .../220-harvard-edu-audit-files.md            |  16 ++
 doc/sphinx-guides/source/api/native-api.rst   |  55 ++++++
 .../edu/harvard/iq/dataverse/api/Admin.java   | 161 +++++++++++++++---
 .../iq/dataverse/dataaccess/S3AccessIO.java   |   6 +
 .../edu/harvard/iq/dataverse/api/AdminIT.java |  49 +++++-
 .../edu/harvard/iq/dataverse/api/UtilIT.java  |  16 ++
 6 files changed, 275 insertions(+), 28 deletions(-)
 create mode 100644 doc/release-notes/220-harvard-edu-audit-files.md

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
new file mode 100644
index 00000000000..536554313cf
--- /dev/null
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -0,0 +1,16 @@
+### New API to Audit Datafiles across the database
+
+This is a superuser only tool to audit Datasets with DataFiles where the physical files are missing or the file metadata is missing.
+The Datasets scanned can be limited by optional firstId and lastId query parameters, or a given CSV list of Dataset Identifiers.
+Once the audit report is generated, an Administrator can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
+
+The Json response includes:
+- List of files in each DataFile where the file exists in the database but the physical file is not on the file store.
+- List of DataFiles where the FileMetadata is missing.
+- Other failures found when trying to process the Datasets
+
+curl "http://localhost:8080/api/admin/datafiles/auditFiles
+curl "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
+curl "http://localhost:8080/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
+
+For more information, see issue [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)
diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 6254742eebb..6fc10bdfa08 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6200,6 +6200,61 @@ Note that if you are attempting to validate a very large number of datasets in y
  
      asadmin set server-config.network-config.protocols.protocol.http-listener-1.http.request-timeout-seconds=3600
 
+Datafile Audit
+~~~~~~~~~~~~~~
+
+Produce an Audit report of missing files and FileMetadata for Datasets.
+Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing this information is returned in a Json response::
+
+  curl "$SERVER_URL/api/admin/datafiles/auditFiles"
+
+Optional Parameters are available for filtering the Datasets scanned.
+
+For auditing the Datasets in a paged manor (firstId and lastId)::
+
+  curl "$SERVER_URL/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
+
+Auditing specific Datasets (comma separated list)::
+
+  curl "$SERVER_URL/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi.org/10.5072/FK2/JXYBJS,doi.org/10.7910/DVN/MPU019
+
+Sample Json Audit Response::
+
+     {
+       "status": "OK",
+       "data": {
+          "firstId": 0,
+          "lastId": 100,
+          "DatasetIdentifierList": [
+              "doi.org/10.5072/FK2/XXXXXX",
+              "doi.org/10.5072/FK2/JXYBJS",
+              "doi.org/10.7910/DVN/MPU019"
+          ],
+          "datasetsChecked": 100,
+          "datasets": [
+               {
+                  "id": 6,
+                  "identifier": "FK2/JXYBJS",
+                  "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
+                  "missingFileMetadata": [
+                      "local://1930cce4f2d-855ccc51fcbb, DataFile Id:7"
+                  ]
+              },
+              {
+                  "id": 47731,
+                  "identifier": "DVN/MPU019",
+                  "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
+                  "missingFiles": [
+                    "s3://dvn-cloud:298910, jihad_metadata_edited.csv"
+                  ]
+                }
+          ],
+          "failures": [
+              "DatasetIdentifier Not Found: doi.org/10.5072/FK2/XXXXXX"
+          ]
+       }
+     }
+
 Workflows
 ~~~~~~~~~
 
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 54e5eaf7b84..ecd9b71cc8d 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -1,28 +1,11 @@
 package edu.harvard.iq.dataverse.api;
 
-import edu.harvard.iq.dataverse.BannerMessage;
-import edu.harvard.iq.dataverse.BannerMessageServiceBean;
-import edu.harvard.iq.dataverse.BannerMessageText;
-import edu.harvard.iq.dataverse.DataFile;
-import edu.harvard.iq.dataverse.DataFileServiceBean;
-import edu.harvard.iq.dataverse.Dataset;
-import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.DatasetVersion;
-import edu.harvard.iq.dataverse.DatasetVersionServiceBean;
-import edu.harvard.iq.dataverse.Dataverse;
-import edu.harvard.iq.dataverse.DataverseRequestServiceBean;
-import edu.harvard.iq.dataverse.DataverseServiceBean;
-import edu.harvard.iq.dataverse.DataverseSession;
-import edu.harvard.iq.dataverse.DvObject;
-import edu.harvard.iq.dataverse.DvObjectServiceBean;
+import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.api.auth.AuthRequired;
 import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.util.StringUtil;
+import edu.harvard.iq.dataverse.util.json.NullSafeJsonBuilder;
 import edu.harvard.iq.dataverse.validation.EMailValidator;
-import edu.harvard.iq.dataverse.EjbDataverseEngine;
-import edu.harvard.iq.dataverse.Template;
-import edu.harvard.iq.dataverse.TemplateServiceBean;
-import edu.harvard.iq.dataverse.UserServiceBean;
 import edu.harvard.iq.dataverse.actionlogging.ActionLogRecord;
 import edu.harvard.iq.dataverse.api.dto.RoleDTO;
 import edu.harvard.iq.dataverse.authorization.AuthenticatedUserDisplayInfo;
@@ -66,8 +49,9 @@
 import java.io.InputStream;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Predicate;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.ejb.EJB;
@@ -81,7 +65,6 @@
 
 import org.apache.commons.io.IOUtils;
 
-import java.util.List;
 import edu.harvard.iq.dataverse.authorization.AuthTestDataServiceBean;
 import edu.harvard.iq.dataverse.authorization.AuthenticationProvidersRegistrationServiceBean;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
@@ -118,9 +101,7 @@
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.json;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.rolesToJson;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.toJsonArray;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
+
 import jakarta.inject.Inject;
 import jakarta.json.JsonArray;
 import jakarta.persistence.Query;
@@ -128,7 +109,6 @@
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.StreamingOutput;
 import java.nio.file.Paths;
-import java.util.TreeMap;
 
 /**
  * Where the secure, setup API calls live.
@@ -2541,4 +2521,135 @@ public Response getFeatureFlag(@PathParam("flag") String flagIn) {
         }
     }
 
+	@GET
+	@AuthRequired
+	@Path("/datafiles/auditFiles")
+	public Response getAuditFiles(@Context ContainerRequestContext crc,
+								  @QueryParam("firstId") Long firstId, @QueryParam("lastId") Long lastId,
+								  @QueryParam("DatasetIdentifierList") String DatasetIdentifierList) throws WrappedResponse {
+		try {
+			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+			if (!user.isSuperuser()) {
+				return error(Response.Status.FORBIDDEN, "Superusers only.");
+			}
+		} catch (WrappedResponse wr) {
+			return wr.getResponse();
+		}
+
+		List<String> failures = new ArrayList<>();
+		int datasetsChecked = 0;
+		long startId = (firstId == null ? 0 : firstId);
+		long endId = (lastId == null ? Long.MAX_VALUE : lastId);
+
+		List<String> datasetIdentifiers;
+		if (DatasetIdentifierList == null || DatasetIdentifierList.isEmpty()) {
+			datasetIdentifiers = Collections.emptyList();
+		} else {
+			startId = 0;
+			endId = Long.MAX_VALUE;
+			datasetIdentifiers = List.of(DatasetIdentifierList.split(","));
+		}
+		if (endId < startId) {
+			return badRequest("Invalid Parameters: lastId must be equal to or greater than firstId");
+		}
+
+		NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
+		if (startId > 0) {
+			jsonObjectBuilder.add("firstId", startId);
+		}
+		if (endId < Long.MAX_VALUE) {
+			jsonObjectBuilder.add("lastId", endId);
+		}
+
+		// compile the list of ids to process
+		List<Long> datasetIds;
+		if (datasetIdentifiers.isEmpty()) {
+			datasetIds = datasetService.findAllLocalDatasetIds();
+		} else {
+			datasetIds = new ArrayList<>(datasetIdentifiers.size());
+			JsonArrayBuilder jab = Json.createArrayBuilder();
+			datasetIdentifiers.forEach(id -> {
+				String dId = id.trim();
+				jab.add(dId);
+				Dataset d = datasetService.findByGlobalId(dId);
+				if (d != null) {
+					datasetIds.add(d.getId());
+				} else {
+					failures.add("DatasetIdentifier Not Found: " +  dId);
+				}
+			});
+			jsonObjectBuilder.add("DatasetIdentifierList", jab);
+		}
+
+		JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
+		for (Long datasetId : datasetIds) {
+			if (datasetId < startId) {
+				continue;
+			} else if (datasetId > endId) {
+				break;
+			}
+			Dataset dataset;
+			try {
+				dataset = findDatasetOrDie(String.valueOf(datasetId));
+				datasetsChecked++;
+			} catch (WrappedResponse ex) {
+				failures.add("DatasetId:" +  datasetId + " Reason:" + ex.getMessage());
+				continue;
+			}
+
+			List<String> missingFiles = new ArrayList<>();
+			List<String> missingFileMetadata = new ArrayList<>();
+			try {
+				Predicate<String> filter = s -> true;
+				StorageIO<DvObject> datasetIO = DataAccess.getStorageIO(dataset);
+				final List<String> result = datasetIO.cleanUp(filter, true);
+				// add files that are in dataset files but not in cleanup result or DataFiles with missing FileMetadata
+				dataset.getFiles().forEach(df -> {
+					try {
+						StorageIO<DataFile> datafileIO = df.getStorageIO();
+						String storageId = df.getStorageIdentifier();
+						FileMetadata fm = df.getFileMetadata();
+						if (!datafileIO.exists()) {
+							missingFiles.add(storageId + ", " + (fm != null ? fm.getLabel() : df.getContentType()));
+						}
+						if (fm == null) {
+							missingFileMetadata.add(storageId + ", DataFile Id:" + df.getId());
+						}
+					} catch (IOException e) {
+						failures.add("DataFileId:" + df.getId() + ", " + e.getMessage());
+					}
+				});
+			} catch (IOException e) {
+				failures.add("DatasetId:" + datasetId + ", " + e.getMessage());
+			}
+
+			JsonObjectBuilder job = Json.createObjectBuilder();
+			if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
+				job.add("id", dataset.getId());
+				job.add("identifier", dataset.getIdentifier());
+				job.add("persistentURL", dataset.getPersistentURL());
+				if (!missingFileMetadata.isEmpty()) {
+					JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();
+					missingFileMetadata.forEach(jabMissingFileMetadata::add);
+					job.add("missingFileMetadata", jabMissingFileMetadata);
+				}
+				if (!missingFiles.isEmpty()) {
+					JsonArrayBuilder jabMissingFiles = Json.createArrayBuilder();
+					missingFiles.forEach(jabMissingFiles::add);
+					job.add("missingFiles", jabMissingFiles);
+				}
+				jsonDatasetsArrayBuilder.add(job);
+			}
+		}
+
+		jsonObjectBuilder.add("datasetsChecked", datasetsChecked);
+		jsonObjectBuilder.add("datasets", jsonDatasetsArrayBuilder);
+		if (!failures.isEmpty()) {
+			JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
+			failures.forEach(jsonFailuresArrayBuilder::add);
+			jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
+		}
+
+		return ok(jsonObjectBuilder);
+	}
 }
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
index d2fdec7b323..5b9e496281f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -753,6 +753,12 @@ public Path getFileSystemPath() throws UnsupportedDataAccessOperationException {
 
     @Override
     public boolean exists() {
+        try {
+            key = getMainFileKey();
+        } catch (IOException e) {
+            logger.warning("Caught an IOException in S3AccessIO.exists():    " + e.getMessage());
+            return false;
+        }
         String destinationKey = null;
         if (dvObject instanceof DataFile) {
             destinationKey = key;
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
index 6d7dd2eae29..e639a2f011d 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
@@ -16,6 +16,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.BeforeAll;
@@ -26,13 +28,11 @@
 
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static jakarta.ws.rs.core.Response.Status.*;
+import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class AdminIT {
@@ -901,6 +901,49 @@ public void testDownloadTmpFile() throws IOException {
                 .body("message", equalTo("Path must begin with '/tmp' but after normalization was '/etc/passwd'."));
     }
 
+    @Test
+    public void testFindMissingFiles() {
+        Response createUserResponse = UtilIT.createRandomUser();
+        createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
+        String username = UtilIT.getUsernameFromResponse(createUserResponse);
+        String apiToken = UtilIT.getApiTokenFromResponse(createUserResponse);
+        UtilIT.setSuperuserStatus(username, true);
+
+        String dataverseAlias = ":root";
+        Response createDatasetResponse = UtilIT.createRandomDatasetViaNativeApi(dataverseAlias, apiToken);
+        createDatasetResponse.prettyPrint();
+        createDatasetResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+        int datasetId = JsonPath.from(createDatasetResponse.body().asString()).getInt("data.id");
+        String datasetPersistentId = JsonPath.from(createDatasetResponse.body().asString()).getString("data.persistentId");
+
+        // Upload file
+        Response uploadResponse = UtilIT.uploadRandomFile(datasetPersistentId, apiToken);
+        uploadResponse.then().assertThat().statusCode(CREATED.getStatusCode());
+
+        // Audit files
+        Response resp = UtilIT.auditFiles(apiToken, null, 100L, null);
+        resp.prettyPrint();
+        JsonArray emptyArray = Json.createArrayBuilder().build();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.lastId", equalTo(100));
+
+        // Audit files with invalid parameters
+        resp = UtilIT.auditFiles(apiToken, 100L, 0L, null);
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(BAD_REQUEST.getStatusCode())
+                .body("status", equalTo("ERROR"))
+                .body("message", equalTo("Invalid Parameters: lastId must be equal to or greater than firstId"));
+
+        // Audit files with list of dataset identifiers parameter
+        resp = UtilIT.auditFiles(apiToken, 1L, null, "bad/id, " + datasetPersistentId);
+        resp.prettyPrint();
+        resp.then().assertThat()
+                .statusCode(OK.getStatusCode())
+                .body("data.failures[0]", equalTo("DatasetIdentifier Not Found: bad/id"));
+    }
+
     private String createTestNonSuperuserApiToken() {
         Response createUserResponse = UtilIT.createRandomUser();
         createUserResponse.then().assertThat().statusCode(OK.getStatusCode());
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 502f1ecb0a8..2fb205f1271 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -241,6 +241,22 @@ public static Response clearThumbnailFailureFlag(long fileId) {
         return response;
     }
 
+    public static Response auditFiles(String apiToken, Long firstId, Long lastId, String csvList) {
+        String params = "";
+        if (firstId != null) {
+            params = "?firstId="+ firstId;
+        }
+        if (lastId != null) {
+            params = params + (params.isEmpty() ? "?" : "&") + "lastId="+ lastId;
+        }
+        if (csvList != null) {
+            params = params + (params.isEmpty() ? "?" : "&") + "DatasetIdentifierList="+ csvList;
+        }
+        return given()
+                .header(API_TOKEN_HTTP_HEADER, apiToken)
+                .get("/api/admin/datafiles/auditFiles" + params);
+    }
+
     private static String getAuthenticatedUserAsJsonString(String persistentUserId, String firstName, String lastName, String authenticationProviderId, String identifier) {
         JsonObjectBuilder builder = Json.createObjectBuilder();
         builder.add("authenticationProviderId", authenticationProviderId);

From 804d284c99322c619db2ec36d3751db6b1ad5f0f Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:04:49 -0500
Subject: [PATCH 02/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index 536554313cf..10c27af0dec 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -13,4 +13,4 @@ curl "http://localhost:8080/api/admin/datafiles/auditFiles
 curl "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
 curl "http://localhost:8080/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
 
-For more information, see issue [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)
+For more information, see issue [the docs](https://dataverse-guide--11016.org.readthedocs.build/en/11016/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)

From a62193cfece34408616bfc54f6547291f8c38b62 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:05:05 -0500
Subject: [PATCH 03/25] Update doc/sphinx-guides/source/api/native-api.rst

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 6fc10bdfa08..455a0bc1ac2 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6203,7 +6203,7 @@ Note that if you are attempting to validate a very large number of datasets in y
 Datafile Audit
 ~~~~~~~~~~~~~~
 
-Produce an Audit report of missing files and FileMetadata for Datasets.
+Produce an audit report of missing files and FileMetadata for Datasets.
 Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing this information is returned in a Json response::
 
   curl "$SERVER_URL/api/admin/datafiles/auditFiles"

From d0df4f07f126556760091f288baab46077bb9752 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:05:19 -0500
Subject: [PATCH 04/25] Update doc/sphinx-guides/source/api/native-api.rst

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 455a0bc1ac2..c7230a9f48c 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6204,7 +6204,7 @@ Datafile Audit
 ~~~~~~~~~~~~~~
 
 Produce an audit report of missing files and FileMetadata for Datasets.
-Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing this information is returned in a Json response::
+Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing, this information is returned in a JSON response::
 
   curl "$SERVER_URL/api/admin/datafiles/auditFiles"
 

From a1d1030b845561161d0bc8b509d45b38673e9306 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:05:27 -0500
Subject: [PATCH 05/25] Update doc/sphinx-guides/source/api/native-api.rst

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index c7230a9f48c..6c20641b72e 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6218,7 +6218,7 @@ Auditing specific Datasets (comma separated list)::
 
   curl "$SERVER_URL/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi.org/10.5072/FK2/JXYBJS,doi.org/10.7910/DVN/MPU019
 
-Sample Json Audit Response::
+Sample JSON Audit Response::
 
      {
        "status": "OK",

From e433ee26925062a3f80c829199bfa7d86f061a59 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:07:36 -0500
Subject: [PATCH 06/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index 10c27af0dec..b184c0e74dc 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -1,6 +1,6 @@
 ### New API to Audit Datafiles across the database
 
-This is a superuser only tool to audit Datasets with DataFiles where the physical files are missing or the file metadata is missing.
+This is a superuser only API endpoint to audit Datasets with DataFiles where the physical files are missing or the file metadata is missing.
 The Datasets scanned can be limited by optional firstId and lastId query parameters, or a given CSV list of Dataset Identifiers.
 Once the audit report is generated, an Administrator can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
 

From e4751c59d3ecc1a5ad4d3d3aeea22f140a1f585b Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:07:49 -0500
Subject: [PATCH 07/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index b184c0e74dc..a0bc60842e5 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -2,7 +2,7 @@
 
 This is a superuser only API endpoint to audit Datasets with DataFiles where the physical files are missing or the file metadata is missing.
 The Datasets scanned can be limited by optional firstId and lastId query parameters, or a given CSV list of Dataset Identifiers.
-Once the audit report is generated, an Administrator can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
+Once the audit report is generated, a superuser can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
 
 The Json response includes:
 - List of files in each DataFile where the file exists in the database but the physical file is not on the file store.

From 456f9f6feaef342ea2db3c306b6fc691b2985bed Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:08:00 -0500
Subject: [PATCH 08/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index a0bc60842e5..160aa2e4b2f 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -4,7 +4,7 @@ This is a superuser only API endpoint to audit Datasets with DataFiles where the
 The Datasets scanned can be limited by optional firstId and lastId query parameters, or a given CSV list of Dataset Identifiers.
 Once the audit report is generated, a superuser can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
 
-The Json response includes:
+The JSON response includes:
 - List of files in each DataFile where the file exists in the database but the physical file is not on the file store.
 - List of DataFiles where the FileMetadata is missing.
 - Other failures found when trying to process the Datasets

From 9b156817cc376f121d86184433d2994dbf36cc47 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:08:31 -0500
Subject: [PATCH 09/25] Update
 src/main/java/edu/harvard/iq/dataverse/api/Admin.java

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 src/main/java/edu/harvard/iq/dataverse/api/Admin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index ecd9b71cc8d..e8e8402bfbc 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2526,7 +2526,7 @@ public Response getFeatureFlag(@PathParam("flag") String flagIn) {
 	@Path("/datafiles/auditFiles")
 	public Response getAuditFiles(@Context ContainerRequestContext crc,
 								  @QueryParam("firstId") Long firstId, @QueryParam("lastId") Long lastId,
-								  @QueryParam("DatasetIdentifierList") String DatasetIdentifierList) throws WrappedResponse {
+								  @QueryParam("datasetIdentifierList") String datasetIdentifierList) throws WrappedResponse {
 		try {
 			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
 			if (!user.isSuperuser()) {

From 2586c331498cfff72f32c057fb021f5724b27adb Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:11:09 -0500
Subject: [PATCH 10/25] fix camelcase for datasetIdentifierList

---
 src/main/java/edu/harvard/iq/dataverse/api/Admin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index e8e8402bfbc..ac01d669ef0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2542,12 +2542,12 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 		long endId = (lastId == null ? Long.MAX_VALUE : lastId);
 
 		List<String> datasetIdentifiers;
-		if (DatasetIdentifierList == null || DatasetIdentifierList.isEmpty()) {
+		if (datasetIdentifierList == null || datasetIdentifierList.isEmpty()) {
 			datasetIdentifiers = Collections.emptyList();
 		} else {
 			startId = 0;
 			endId = Long.MAX_VALUE;
-			datasetIdentifiers = List.of(DatasetIdentifierList.split(","));
+			datasetIdentifiers = List.of(datasetIdentifierList.split(","));
 		}
 		if (endId < startId) {
 			return badRequest("Invalid Parameters: lastId must be equal to or greater than firstId");

From abfc7385a304284e5611b09c4c557c1e33d48d11 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 11:21:35 -0500
Subject: [PATCH 11/25] fix camelcase for datasetIdentifierList

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 6c20641b72e..2f7bc0a4880 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6216,7 +6216,7 @@ For auditing the Datasets in a paged manor (firstId and lastId)::
 
 Auditing specific Datasets (comma separated list)::
 
-  curl "$SERVER_URL/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi.org/10.5072/FK2/JXYBJS,doi.org/10.7910/DVN/MPU019
+  curl "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi.org/10.5072/FK2/JXYBJS,doi.org/10.7910/DVN/MPU019
 
 Sample JSON Audit Response::
 

From b64addc288607f9bfb03acef00274a862757f3d4 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:03:57 -0500
Subject: [PATCH 12/25] reformat json output

---
 doc/sphinx-guides/source/api/native-api.rst   | 15 ++++--
 .../edu/harvard/iq/dataverse/api/Admin.java   | 53 +++++++++++++------
 .../edu/harvard/iq/dataverse/api/AdminIT.java |  3 +-
 .../edu/harvard/iq/dataverse/api/UtilIT.java  |  2 +-
 4 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 2f7bc0a4880..c4eaa405efb 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6237,7 +6237,10 @@ Sample JSON Audit Response::
                   "identifier": "FK2/JXYBJS",
                   "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
                   "missingFileMetadata": [
-                      "local://1930cce4f2d-855ccc51fcbb, DataFile Id:7"
+                    {
+                       "StorageIdentifier": "local://1930cce4f2d-855ccc51fcbb",
+                       "DataFileId": "7"
+                    }
                   ]
               },
               {
@@ -6245,12 +6248,18 @@ Sample JSON Audit Response::
                   "identifier": "DVN/MPU019",
                   "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
                   "missingFiles": [
-                    "s3://dvn-cloud:298910, jihad_metadata_edited.csv"
+                    {
+                       "StorageIdentifier": "s3://dvn-cloud:298910",
+                       "label": "jihad_metadata_edited.csv"
+                    }
                   ]
                 }
           ],
           "failures": [
-              "DatasetIdentifier Not Found: doi.org/10.5072/FK2/XXXXXX"
+              {
+                "DatasetIdentifier": "doi.org/10.5072/FK2/XXXXXX",
+                "Reason": "Not Found"
+              }
           ]
        }
      }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index ac01d669ef0..774ee675949 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2536,7 +2536,6 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 			return wr.getResponse();
 		}
 
-		List<String> failures = new ArrayList<>();
 		int datasetsChecked = 0;
 		long startId = (firstId == null ? 0 : firstId);
 		long endId = (lastId == null ? Long.MAX_VALUE : lastId);
@@ -2554,6 +2553,9 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 		}
 
 		NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
+		JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
+		JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
+
 		if (startId > 0) {
 			jsonObjectBuilder.add("firstId", startId);
 		}
@@ -2575,13 +2577,15 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 				if (d != null) {
 					datasetIds.add(d.getId());
 				} else {
-					failures.add("DatasetIdentifier Not Found: " +  dId);
+					NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+					job.add("DatasetIdentifier",dId);
+					job.add("Reason","Not Found");
+					jsonFailuresArrayBuilder.add(job);
 				}
 			});
 			jsonObjectBuilder.add("DatasetIdentifierList", jab);
 		}
 
-		JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
 		for (Long datasetId : datasetIds) {
 			if (datasetId < startId) {
 				continue;
@@ -2592,8 +2596,11 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 			try {
 				dataset = findDatasetOrDie(String.valueOf(datasetId));
 				datasetsChecked++;
-			} catch (WrappedResponse ex) {
-				failures.add("DatasetId:" +  datasetId + " Reason:" + ex.getMessage());
+			} catch (WrappedResponse e) {
+				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+				job.add("DatasetId", datasetId);
+				job.add("Reason", e.getMessage());
+				jsonFailuresArrayBuilder.add(job);
 				continue;
 			}
 
@@ -2610,17 +2617,23 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 						String storageId = df.getStorageIdentifier();
 						FileMetadata fm = df.getFileMetadata();
 						if (!datafileIO.exists()) {
-							missingFiles.add(storageId + ", " + (fm != null ? fm.getLabel() : df.getContentType()));
+							missingFiles.add(storageId + "," + (fm != null ? "label,"+fm.getLabel() : "type,"+df.getContentType()));
 						}
 						if (fm == null) {
-							missingFileMetadata.add(storageId + ", DataFile Id:" + df.getId());
+							missingFileMetadata.add(storageId + ",DataFileId," + df.getId());
 						}
 					} catch (IOException e) {
-						failures.add("DataFileId:" + df.getId() + ", " + e.getMessage());
+						NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+						job.add("DataFileId", df.getId());
+						job.add("Reason", e.getMessage());
+						jsonFailuresArrayBuilder.add(job);
 					}
 				});
 			} catch (IOException e) {
-				failures.add("DatasetId:" + datasetId + ", " + e.getMessage());
+				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+				job.add("DatasetId", datasetId);
+				job.add("Reason", e.getMessage());
+				jsonFailuresArrayBuilder.add(job);
 			}
 
 			JsonObjectBuilder job = Json.createObjectBuilder();
@@ -2630,12 +2643,24 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 				job.add("persistentURL", dataset.getPersistentURL());
 				if (!missingFileMetadata.isEmpty()) {
 					JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();
-					missingFileMetadata.forEach(jabMissingFileMetadata::add);
+					missingFileMetadata.forEach(mm -> {
+						String[] missingMetadata = mm.split(",");
+						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+								.add("StorageIdentifier", missingMetadata[0])
+								.add(missingMetadata[1], missingMetadata[2]);
+						jabMissingFileMetadata.add(jobj);
+					});
 					job.add("missingFileMetadata", jabMissingFileMetadata);
 				}
 				if (!missingFiles.isEmpty()) {
 					JsonArrayBuilder jabMissingFiles = Json.createArrayBuilder();
-					missingFiles.forEach(jabMissingFiles::add);
+					missingFiles.forEach(mf -> {
+						String[] missingFile = mf.split(",");
+						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+								.add("StorageIdentifier", missingFile[0])
+								.add(missingFile[1], missingFile[2]);
+						jabMissingFiles.add(jobj);
+				    });
 					job.add("missingFiles", jabMissingFiles);
 				}
 				jsonDatasetsArrayBuilder.add(job);
@@ -2644,11 +2669,7 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 
 		jsonObjectBuilder.add("datasetsChecked", datasetsChecked);
 		jsonObjectBuilder.add("datasets", jsonDatasetsArrayBuilder);
-		if (!failures.isEmpty()) {
-			JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
-			failures.forEach(jsonFailuresArrayBuilder::add);
-			jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
-		}
+		jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
 
 		return ok(jsonObjectBuilder);
 	}
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
index e639a2f011d..84011d7ac73 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
@@ -941,7 +941,8 @@ public void testFindMissingFiles() {
         resp.prettyPrint();
         resp.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.failures[0]", equalTo("DatasetIdentifier Not Found: bad/id"));
+                .body("data.failures[0].DatasetIdentifier", equalTo("bad/id"))
+                .body("data.failures[0].Reason", equalTo("Not Found"));
     }
 
     private String createTestNonSuperuserApiToken() {
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
index 2fb205f1271..c450c587543 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
@@ -250,7 +250,7 @@ public static Response auditFiles(String apiToken, Long firstId, Long lastId, St
             params = params + (params.isEmpty() ? "?" : "&") + "lastId="+ lastId;
         }
         if (csvList != null) {
-            params = params + (params.isEmpty() ? "?" : "&") + "DatasetIdentifierList="+ csvList;
+            params = params + (params.isEmpty() ? "?" : "&") + "datasetIdentifierList="+ csvList;
         }
         return given()
                 .header(API_TOKEN_HTTP_HEADER, apiToken)

From e89f1ca91e939d99521b2eeddc3643dd4333b579 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:17:34 -0500
Subject: [PATCH 13/25] reformat json output

---
 src/main/java/edu/harvard/iq/dataverse/api/Admin.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 774ee675949..29f366d91b9 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2640,6 +2640,8 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 			if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
 				job.add("id", dataset.getId());
 				job.add("identifier", dataset.getIdentifier());
+				job.add("authority", dataset.getAuthority());
+				job.add("protocol", dataset.getProtocol());
 				job.add("persistentURL", dataset.getPersistentURL());
 				if (!missingFileMetadata.isEmpty()) {
 					JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();

From 7e9aae98574e357b4b64b1feb024a89fe2c9dac2 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:19:28 -0500
Subject: [PATCH 14/25] reformat json output

---
 doc/sphinx-guides/source/api/native-api.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index c4eaa405efb..b9c30d71fa2 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6235,6 +6235,8 @@ Sample JSON Audit Response::
                {
                   "id": 6,
                   "identifier": "FK2/JXYBJS",
+                  "authority": "10.5072",
+                  "protocol": "doi",
                   "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
                   "missingFileMetadata": [
                     {
@@ -6246,6 +6248,8 @@ Sample JSON Audit Response::
               {
                   "id": 47731,
                   "identifier": "DVN/MPU019",
+                  "authority": "10.7910",
+                  "protocol": "doi",
                   "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
                   "missingFiles": [
                     {

From 11cbe8515e0c60443d76c78ce972ca4f1c83c16a Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:42:27 -0500
Subject: [PATCH 15/25] reformat json output

---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index 160aa2e4b2f..c697bc225c0 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -11,6 +11,6 @@ The JSON response includes:
 
 curl "http://localhost:8080/api/admin/datafiles/auditFiles
 curl "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
-curl "http://localhost:8080/api/admin/datafiles/auditFiles?DatasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
+curl "http://localhost:8080/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
 
 For more information, see issue [the docs](https://dataverse-guide--11016.org.readthedocs.build/en/11016/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)

From 3eec3663c96835b14f6a6444b8bc0055b4835241 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Tue, 19 Nov 2024 16:53:28 -0500
Subject: [PATCH 16/25] adding directory label to json and changing camelCase

---
 doc/sphinx-guides/source/api/native-api.rst   | 17 +++++-----
 .../edu/harvard/iq/dataverse/api/Admin.java   | 32 +++++++++++--------
 .../edu/harvard/iq/dataverse/api/AdminIT.java |  4 +--
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index b9c30d71fa2..84e8bf45d9d 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6216,7 +6216,7 @@ For auditing the Datasets in a paged manor (firstId and lastId)::
 
 Auditing specific Datasets (comma separated list)::
 
-  curl "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi.org/10.5072/FK2/JXYBJS,doi.org/10.7910/DVN/MPU019
+  curl "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019
 
 Sample JSON Audit Response::
 
@@ -6225,7 +6225,7 @@ Sample JSON Audit Response::
        "data": {
           "firstId": 0,
           "lastId": 100,
-          "DatasetIdentifierList": [
+          "datasetIdentifierList": [
               "doi.org/10.5072/FK2/XXXXXX",
               "doi.org/10.5072/FK2/JXYBJS",
               "doi.org/10.7910/DVN/MPU019"
@@ -6240,8 +6240,8 @@ Sample JSON Audit Response::
                   "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
                   "missingFileMetadata": [
                     {
-                       "StorageIdentifier": "local://1930cce4f2d-855ccc51fcbb",
-                       "DataFileId": "7"
+                       "storageIdentifier": "local://1930cce4f2d-855ccc51fcbb",
+                       "dataFileId": "7"
                     }
                   ]
               },
@@ -6253,16 +6253,17 @@ Sample JSON Audit Response::
                   "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
                   "missingFiles": [
                     {
-                       "StorageIdentifier": "s3://dvn-cloud:298910",
-                       "label": "jihad_metadata_edited.csv"
+                       "storageIdentifier": "s3://dvn-cloud:298910",
+                       "directoryLabel": "trees",
+                       "label": "trees.png"
                     }
                   ]
                 }
           ],
           "failures": [
               {
-                "DatasetIdentifier": "doi.org/10.5072/FK2/XXXXXX",
-                "Reason": "Not Found"
+                "datasetIdentifier": "doi.org/10.5072/FK2/XXXXXX",
+                "reason": "Not Found"
               }
           ]
        }
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 29f366d91b9..793e472ddac 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2578,12 +2578,12 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 					datasetIds.add(d.getId());
 				} else {
 					NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-					job.add("DatasetIdentifier",dId);
-					job.add("Reason","Not Found");
+					job.add("datasetIdentifier",dId);
+					job.add("reason","Not Found");
 					jsonFailuresArrayBuilder.add(job);
 				}
 			});
-			jsonObjectBuilder.add("DatasetIdentifierList", jab);
+			jsonObjectBuilder.add("datasetIdentifierList", jab);
 		}
 
 		for (Long datasetId : datasetIds) {
@@ -2598,8 +2598,8 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 				datasetsChecked++;
 			} catch (WrappedResponse e) {
 				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-				job.add("DatasetId", datasetId);
-				job.add("Reason", e.getMessage());
+				job.add("datasetId", datasetId);
+				job.add("reason", e.getMessage());
 				jsonFailuresArrayBuilder.add(job);
 				continue;
 			}
@@ -2617,22 +2617,24 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 						String storageId = df.getStorageIdentifier();
 						FileMetadata fm = df.getFileMetadata();
 						if (!datafileIO.exists()) {
-							missingFiles.add(storageId + "," + (fm != null ? "label,"+fm.getLabel() : "type,"+df.getContentType()));
+							missingFiles.add(storageId + "," + (fm != null ?
+									(fm.getDirectoryLabel() != null || !fm.getDirectoryLabel().isEmpty() ? "directoryLabel,"+fm.getDirectoryLabel()+"," : "")
+											+"label,"+fm.getLabel() : "type,"+df.getContentType()));
 						}
 						if (fm == null) {
-							missingFileMetadata.add(storageId + ",DataFileId," + df.getId());
+							missingFileMetadata.add(storageId + ",dataFileId," + df.getId());
 						}
 					} catch (IOException e) {
 						NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-						job.add("DataFileId", df.getId());
-						job.add("Reason", e.getMessage());
+						job.add("dataFileId", df.getId());
+						job.add("reason", e.getMessage());
 						jsonFailuresArrayBuilder.add(job);
 					}
 				});
 			} catch (IOException e) {
 				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-				job.add("DatasetId", datasetId);
-				job.add("Reason", e.getMessage());
+				job.add("datasetId", datasetId);
+				job.add("reason", e.getMessage());
 				jsonFailuresArrayBuilder.add(job);
 			}
 
@@ -2648,7 +2650,7 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 					missingFileMetadata.forEach(mm -> {
 						String[] missingMetadata = mm.split(",");
 						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
-								.add("StorageIdentifier", missingMetadata[0])
+								.add("storageIdentifier", missingMetadata[0])
 								.add(missingMetadata[1], missingMetadata[2]);
 						jabMissingFileMetadata.add(jobj);
 					});
@@ -2659,8 +2661,10 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
 					missingFiles.forEach(mf -> {
 						String[] missingFile = mf.split(",");
 						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
-								.add("StorageIdentifier", missingFile[0])
-								.add(missingFile[1], missingFile[2]);
+								.add("storageIdentifier", missingFile[0]);
+						for (int i = 2; i < missingFile.length; i+=2) {
+							jobj.add(missingFile[i-1], missingFile[i]);
+						}
 						jabMissingFiles.add(jobj);
 				    });
 					job.add("missingFiles", jabMissingFiles);
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
index 84011d7ac73..94aece95861 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
@@ -941,8 +941,8 @@ public void testFindMissingFiles() {
         resp.prettyPrint();
         resp.then().assertThat()
                 .statusCode(OK.getStatusCode())
-                .body("data.failures[0].DatasetIdentifier", equalTo("bad/id"))
-                .body("data.failures[0].Reason", equalTo("Not Found"));
+                .body("data.failures[0].datasetIdentifier", equalTo("bad/id"))
+                .body("data.failures[0].reason", equalTo("Not Found"));
     }
 
     private String createTestNonSuperuserApiToken() {

From 26e85745f450a11f8e23e748fe0f0f05a647af76 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:02:15 -0500
Subject: [PATCH 17/25] tabs to spaces

---
 .../edu/harvard/iq/dataverse/api/Admin.java   | 2132 ++++++++---------
 1 file changed, 1066 insertions(+), 1066 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 793e472ddac..61f76c9928c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -119,7 +119,7 @@
 @Path("admin")
 public class Admin extends AbstractApiBean {
 
-	private static final Logger logger = Logger.getLogger(Admin.class.getName());
+    private static final Logger logger = Logger.getLogger(Admin.class.getName());
 
     @EJB
     AuthenticationProvidersRegistrationServiceBean authProvidersRegistrationSvc;
@@ -164,53 +164,53 @@ public class Admin extends AbstractApiBean {
     @Inject
     DataverseSession session;
 
-	public static final String listUsersPartialAPIPath = "list-users";
-	public static final String listUsersFullAPIPath = "/api/admin/" + listUsersPartialAPIPath;
-
-	@Path("settings")
-	@GET
-	public Response listAllSettings() {
-		JsonObjectBuilder bld = jsonObjectBuilder();
-		settingsSvc.listAll().forEach(s -> bld.add(s.getName(), s.getContent()));
-		return ok(bld);
-	}
-
-	@Path("settings/{name}")
-	@PUT
-	public Response putSetting(@PathParam("name") String name, String content) {
-		Setting s = settingsSvc.set(name, content);
-		return ok(jsonObjectBuilder().add(s.getName(), s.getContent()));
-	}
-
-	@Path("settings/{name}/lang/{lang}")
-	@PUT
-	public Response putSettingLang(@PathParam("name") String name, @PathParam("lang") String lang, String content) {
-		Setting s = settingsSvc.set(name, lang, content);
-		return ok("Setting " + name + " - " + lang + " - added.");
-	}
-
-	@Path("settings/{name}")
-	@GET
-	public Response getSetting(@PathParam("name") String name) {
-		String s = settingsSvc.get(name);
-
-		return (s != null) ? ok(s) : notFound("Setting " + name + " not found");
-	}
-
-	@Path("settings/{name}")
-	@DELETE
-	public Response deleteSetting(@PathParam("name") String name) {
-		settingsSvc.delete(name);
-
-		return ok("Setting " + name + " deleted.");
-	}
-
-	@Path("settings/{name}/lang/{lang}")
-	@DELETE
-	public Response deleteSettingLang(@PathParam("name") String name, @PathParam("lang") String lang) {
-		settingsSvc.delete(name, lang);
-		return ok("Setting " + name + " - " + lang + " deleted.");
-	}
+    public static final String listUsersPartialAPIPath = "list-users";
+    public static final String listUsersFullAPIPath = "/api/admin/" + listUsersPartialAPIPath;
+
+    @Path("settings")
+    @GET
+    public Response listAllSettings() {
+        JsonObjectBuilder bld = jsonObjectBuilder();
+        settingsSvc.listAll().forEach(s -> bld.add(s.getName(), s.getContent()));
+        return ok(bld);
+    }
+
+    @Path("settings/{name}")
+    @PUT
+    public Response putSetting(@PathParam("name") String name, String content) {
+        Setting s = settingsSvc.set(name, content);
+        return ok(jsonObjectBuilder().add(s.getName(), s.getContent()));
+    }
+
+    @Path("settings/{name}/lang/{lang}")
+    @PUT
+    public Response putSettingLang(@PathParam("name") String name, @PathParam("lang") String lang, String content) {
+        Setting s = settingsSvc.set(name, lang, content);
+        return ok("Setting " + name + " - " + lang + " - added.");
+    }
+
+    @Path("settings/{name}")
+    @GET
+    public Response getSetting(@PathParam("name") String name) {
+        String s = settingsSvc.get(name);
+
+        return (s != null) ? ok(s) : notFound("Setting " + name + " not found");
+    }
+
+    @Path("settings/{name}")
+    @DELETE
+    public Response deleteSetting(@PathParam("name") String name) {
+        settingsSvc.delete(name);
+
+        return ok("Setting " + name + " deleted.");
+    }
+
+    @Path("settings/{name}/lang/{lang}")
+    @DELETE
+    public Response deleteSettingLang(@PathParam("name") String name, @PathParam("lang") String lang) {
+        settingsSvc.delete(name, lang);
+        return ok("Setting " + name + " - " + lang + " deleted.");
+    }
         
     @Path("template/{id}")
     @DELETE
@@ -281,130 +281,130 @@ public Response findTemplates(@PathParam("alias") String alias) {
         
     }
 
-	@Path("authenticationProviderFactories")
-	@GET
-	public Response listAuthProviderFactories() {
-		return ok(authSvc.listProviderFactories().stream()
-				.map(f -> jsonObjectBuilder().add("alias", f.getAlias()).add("info", f.getInfo()))
-				.collect(toJsonArray()));
-	}
-
-	@Path("authenticationProviders")
-	@GET
-	public Response listAuthProviders() {
-		return ok(em.createNamedQuery("AuthenticationProviderRow.findAll", AuthenticationProviderRow.class)
-				.getResultList().stream().map(r -> json(r)).collect(toJsonArray()));
-	}
-
-	@Path("authenticationProviders")
-	@POST
-	public Response addProvider(AuthenticationProviderRow row) {
-		try {
-			AuthenticationProviderRow managed = em.find(AuthenticationProviderRow.class, row.getId());
-			if (managed != null) {
-				managed = em.merge(row);
-			} else {
-				em.persist(row);
-				managed = row;
-			}
-			if (managed.isEnabled()) {
-				AuthenticationProvider provider = authProvidersRegistrationSvc.loadProvider(managed);
-				authProvidersRegistrationSvc.deregisterProvider(provider.getId());
-				authProvidersRegistrationSvc.registerProvider(provider);
-			}
-			return created("/api/admin/authenticationProviders/" + managed.getId(), json(managed));
-		} catch (AuthorizationSetupException e) {
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		}
-	}
-
-	@Path("authenticationProviders/{id}")
-	@GET
-	public Response showProvider(@PathParam("id") String id) {
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		return (row != null) ? ok(json(row))
-				: error(Status.NOT_FOUND, "Can't find authetication provider with id '" + id + "'");
-	}
-
-	@POST
-	@Path("authenticationProviders/{id}/:enabled")
-	public Response enableAuthenticationProvider_deprecated(@PathParam("id") String id, String body) {
-		return enableAuthenticationProvider(id, body);
-	}
-
-	@PUT
-	@Path("authenticationProviders/{id}/enabled")
-	@Produces("application/json")
-	public Response enableAuthenticationProvider(@PathParam("id") String id, String body) {
-		body = body.trim();
-		if (!Util.isBoolean(body)) {
-			return error(Response.Status.BAD_REQUEST, "Illegal value '" + body + "'. Use 'true' or 'false'");
-		}
-		boolean enable = Util.isTrue(body);
-
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		if (row == null) {
-			return notFound("Can't find authentication provider with id '" + id + "'");
-		}
-
-		row.setEnabled(enable);
-		em.merge(row);
-
-		if (enable) {
-			// enable a provider
-			if (authSvc.getAuthenticationProvider(id) != null) {
-				return ok(String.format("Authentication provider '%s' already enabled", id));
-			}
-			try {
-				authProvidersRegistrationSvc.registerProvider(authProvidersRegistrationSvc.loadProvider(row));
-				return ok(String.format("Authentication Provider %s enabled", row.getId()));
-
-			} catch (AuthenticationProviderFactoryNotFoundException ex) {
-				return notFound(String.format("Can't instantiate provider, as there's no factory with alias %s",
-						row.getFactoryAlias()));
-			} catch (AuthorizationSetupException ex) {
-				logger.log(Level.WARNING, "Error instantiating authentication provider: " + ex.getMessage(), ex);
-				return error(Status.INTERNAL_SERVER_ERROR,
-						String.format("Can't instantiate provider: %s", ex.getMessage()));
-			}
-
-		} else {
-			// disable a provider
-			authProvidersRegistrationSvc.deregisterProvider(id);
-			return ok("Authentication Provider '" + id + "' disabled. "
-					+ (authSvc.getAuthenticationProviderIds().isEmpty()
-							? "WARNING: no enabled authentication providers left."
-							: ""));
-		}
-	}
-
-	@GET
-	@Path("authenticationProviders/{id}/enabled")
-	public Response checkAuthenticationProviderEnabled(@PathParam("id") String id) {
-		List<AuthenticationProviderRow> prvs = em
-				.createNamedQuery("AuthenticationProviderRow.findById", AuthenticationProviderRow.class)
-				.setParameter("id", id).getResultList();
-		if (prvs.isEmpty()) {
-			return notFound("Can't find a provider with id '" + id + "'.");
-		} else {
-			return ok(Boolean.toString(prvs.get(0).isEnabled()));
-		}
-	}
-
-	@DELETE
-	@Path("authenticationProviders/{id}/")
-	public Response deleteAuthenticationProvider(@PathParam("id") String id) {
-		authProvidersRegistrationSvc.deregisterProvider(id);
-		AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
-		if (row != null) {
-			em.remove(row);
-		}
-
-		return ok("AuthenticationProvider " + id + " deleted. "
-				+ (authSvc.getAuthenticationProviderIds().isEmpty()
-						? "WARNING: no enabled authentication providers left."
-						: ""));
-	}
+    @Path("authenticationProviderFactories")
+    @GET
+    public Response listAuthProviderFactories() {
+        return ok(authSvc.listProviderFactories().stream()
+                .map(f -> jsonObjectBuilder().add("alias", f.getAlias()).add("info", f.getInfo()))
+                .collect(toJsonArray()));
+    }
+
+    @Path("authenticationProviders")
+    @GET
+    public Response listAuthProviders() {
+        return ok(em.createNamedQuery("AuthenticationProviderRow.findAll", AuthenticationProviderRow.class)
+                .getResultList().stream().map(r -> json(r)).collect(toJsonArray()));
+    }
+
+    @Path("authenticationProviders")
+    @POST
+    public Response addProvider(AuthenticationProviderRow row) {
+        try {
+            AuthenticationProviderRow managed = em.find(AuthenticationProviderRow.class, row.getId());
+            if (managed != null) {
+                managed = em.merge(row);
+            } else {
+                em.persist(row);
+                managed = row;
+            }
+            if (managed.isEnabled()) {
+                AuthenticationProvider provider = authProvidersRegistrationSvc.loadProvider(managed);
+                authProvidersRegistrationSvc.deregisterProvider(provider.getId());
+                authProvidersRegistrationSvc.registerProvider(provider);
+            }
+            return created("/api/admin/authenticationProviders/" + managed.getId(), json(managed));
+        } catch (AuthorizationSetupException e) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
+
+    @Path("authenticationProviders/{id}")
+    @GET
+    public Response showProvider(@PathParam("id") String id) {
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        return (row != null) ? ok(json(row))
+                : error(Status.NOT_FOUND, "Can't find authetication provider with id '" + id + "'");
+    }
+
+    @POST
+    @Path("authenticationProviders/{id}/:enabled")
+    public Response enableAuthenticationProvider_deprecated(@PathParam("id") String id, String body) {
+        return enableAuthenticationProvider(id, body);
+    }
+
+    @PUT
+    @Path("authenticationProviders/{id}/enabled")
+    @Produces("application/json")
+    public Response enableAuthenticationProvider(@PathParam("id") String id, String body) {
+        body = body.trim();
+        if (!Util.isBoolean(body)) {
+            return error(Response.Status.BAD_REQUEST, "Illegal value '" + body + "'. Use 'true' or 'false'");
+        }
+        boolean enable = Util.isTrue(body);
+
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        if (row == null) {
+            return notFound("Can't find authentication provider with id '" + id + "'");
+        }
+
+        row.setEnabled(enable);
+        em.merge(row);
+
+        if (enable) {
+            // enable a provider
+            if (authSvc.getAuthenticationProvider(id) != null) {
+                return ok(String.format("Authentication provider '%s' already enabled", id));
+            }
+            try {
+                authProvidersRegistrationSvc.registerProvider(authProvidersRegistrationSvc.loadProvider(row));
+                return ok(String.format("Authentication Provider %s enabled", row.getId()));
+
+            } catch (AuthenticationProviderFactoryNotFoundException ex) {
+                return notFound(String.format("Can't instantiate provider, as there's no factory with alias %s",
+                        row.getFactoryAlias()));
+            } catch (AuthorizationSetupException ex) {
+                logger.log(Level.WARNING, "Error instantiating authentication provider: " + ex.getMessage(), ex);
+                return error(Status.INTERNAL_SERVER_ERROR,
+                        String.format("Can't instantiate provider: %s", ex.getMessage()));
+            }
+
+        } else {
+            // disable a provider
+            authProvidersRegistrationSvc.deregisterProvider(id);
+            return ok("Authentication Provider '" + id + "' disabled. "
+                    + (authSvc.getAuthenticationProviderIds().isEmpty()
+                            ? "WARNING: no enabled authentication providers left."
+                            : ""));
+        }
+    }
+
+    @GET
+    @Path("authenticationProviders/{id}/enabled")
+    public Response checkAuthenticationProviderEnabled(@PathParam("id") String id) {
+        List<AuthenticationProviderRow> prvs = em
+                .createNamedQuery("AuthenticationProviderRow.findById", AuthenticationProviderRow.class)
+                .setParameter("id", id).getResultList();
+        if (prvs.isEmpty()) {
+            return notFound("Can't find a provider with id '" + id + "'.");
+        } else {
+            return ok(Boolean.toString(prvs.get(0).isEnabled()));
+        }
+    }
+
+    @DELETE
+    @Path("authenticationProviders/{id}/")
+    public Response deleteAuthenticationProvider(@PathParam("id") String id) {
+        authProvidersRegistrationSvc.deregisterProvider(id);
+        AuthenticationProviderRow row = em.find(AuthenticationProviderRow.class, id);
+        if (row != null) {
+            em.remove(row);
+        }
+
+        return ok("AuthenticationProvider " + id + " deleted. "
+                + (authSvc.getAuthenticationProviderIds().isEmpty()
+                        ? "WARNING: no enabled authentication providers left."
+                        : ""));
+    }
 
     @GET
     @Path("authenticatedUsers/{identifier}/")
@@ -489,520 +489,520 @@ private Response deactivateAuthenticatedUser(AuthenticatedUser userToDisable) {
         }
     }
 
-	@POST
-	@Path("publishDataverseAsCreator/{id}")
-	public Response publishDataverseAsCreator(@PathParam("id") long id) {
-		try {
-			Dataverse dataverse = dataverseSvc.find(id);
-			if (dataverse != null) {
-				AuthenticatedUser authenticatedUser = dataverse.getCreator();
-				return ok(json(execCommand(
-						new PublishDataverseCommand(createDataverseRequest(authenticatedUser), dataverse))));
-			} else {
-				return error(Status.BAD_REQUEST, "Could not find dataverse with id " + id);
-			}
-		} catch (WrappedResponse wr) {
-			return wr.getResponse();
-		}
-	}
-
-	@Deprecated
-	@GET
-	@AuthRequired
-	@Path("authenticatedUsers")
-	public Response listAuthenticatedUsers(@Context ContainerRequestContext crc) {
-		try {
-			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		JsonArrayBuilder userArray = Json.createArrayBuilder();
-		authSvc.findAllAuthenticatedUsers().stream().forEach((user) -> {
-			userArray.add(json(user));
-		});
-		return ok(userArray);
-	}
-
-	@GET
-	@AuthRequired
-	@Path(listUsersPartialAPIPath)
-	@Produces({ "application/json" })
-	public Response filterAuthenticatedUsers(
-			@Context ContainerRequestContext crc,
-			@QueryParam("searchTerm") String searchTerm,
-			@QueryParam("selectedPage") Integer selectedPage,
-			@QueryParam("itemsPerPage") Integer itemsPerPage,
-			@QueryParam("sortKey") String sortKey
-	) {
-
-		User authUser = getRequestUser(crc);
-
-		if (!authUser.isSuperuser()) {
-			return error(Response.Status.FORBIDDEN,
-					BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.not_superuser"));
-		}
-
-		UserListMaker userListMaker = new UserListMaker(userService);
-
-		// String sortKey = null;
-		UserListResult userListResult = userListMaker.runUserSearch(searchTerm, itemsPerPage, selectedPage, sortKey);
-
-		return ok(userListResult.toJSON());
-	}
-
-	/**
-	 * @todo Make this support creation of BuiltInUsers.
-	 *
-	 * @todo Add way more error checking. Only the happy path is tested by AdminIT.
-	 */
-	@POST
-	@Path("authenticatedUsers")
-	public Response createAuthenicatedUser(JsonObject jsonObject) {
-		logger.fine("JSON in: " + jsonObject);
-		String persistentUserId = jsonObject.getString("persistentUserId");
-		String identifier = jsonObject.getString("identifier");
-		String proposedAuthenticatedUserIdentifier = identifier.replaceFirst("@", "");
-		String firstName = jsonObject.getString("firstName");
-		String lastName = jsonObject.getString("lastName");
-		String emailAddress = jsonObject.getString("email");
-		String position = null;
-		String affiliation = null;
-		UserRecordIdentifier userRecordId = new UserRecordIdentifier(jsonObject.getString("authenticationProviderId"),
-				persistentUserId);
-		AuthenticatedUserDisplayInfo userDisplayInfo = new AuthenticatedUserDisplayInfo(firstName, lastName,
-				emailAddress, affiliation, position);
-		boolean generateUniqueIdentifier = true;
-		AuthenticatedUser authenticatedUser = authSvc.createAuthenticatedUser(userRecordId,
-				proposedAuthenticatedUserIdentifier, userDisplayInfo, true);
-		return ok(json(authenticatedUser));
-	}
+    @POST
+    @Path("publishDataverseAsCreator/{id}")
+    public Response publishDataverseAsCreator(@PathParam("id") long id) {
+        try {
+            Dataverse dataverse = dataverseSvc.find(id);
+            if (dataverse != null) {
+                AuthenticatedUser authenticatedUser = dataverse.getCreator();
+                return ok(json(execCommand(
+                        new PublishDataverseCommand(createDataverseRequest(authenticatedUser), dataverse))));
+            } else {
+                return error(Status.BAD_REQUEST, "Could not find dataverse with id " + id);
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+    }
+
+    @Deprecated
+    @GET
+    @AuthRequired
+    @Path("authenticatedUsers")
+    public Response listAuthenticatedUsers(@Context ContainerRequestContext crc) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        JsonArrayBuilder userArray = Json.createArrayBuilder();
+        authSvc.findAllAuthenticatedUsers().stream().forEach((user) -> {
+            userArray.add(json(user));
+        });
+        return ok(userArray);
+    }
+
+    @GET
+    @AuthRequired
+    @Path(listUsersPartialAPIPath)
+    @Produces({ "application/json" })
+    public Response filterAuthenticatedUsers(
+            @Context ContainerRequestContext crc,
+            @QueryParam("searchTerm") String searchTerm,
+            @QueryParam("selectedPage") Integer selectedPage,
+            @QueryParam("itemsPerPage") Integer itemsPerPage,
+            @QueryParam("sortKey") String sortKey
+    ) {
+
+        User authUser = getRequestUser(crc);
+
+        if (!authUser.isSuperuser()) {
+            return error(Response.Status.FORBIDDEN,
+                    BundleUtil.getStringFromBundle("dashboard.list_users.api.auth.not_superuser"));
+        }
+
+        UserListMaker userListMaker = new UserListMaker(userService);
+
+        // String sortKey = null;
+        UserListResult userListResult = userListMaker.runUserSearch(searchTerm, itemsPerPage, selectedPage, sortKey);
+
+        return ok(userListResult.toJSON());
+    }
+
+    /**
+     * @todo Make this support creation of BuiltInUsers.
+     *
+     * @todo Add way more error checking. Only the happy path is tested by AdminIT.
+     */
+    @POST
+    @Path("authenticatedUsers")
+    public Response createAuthenicatedUser(JsonObject jsonObject) {
+        logger.fine("JSON in: " + jsonObject);
+        String persistentUserId = jsonObject.getString("persistentUserId");
+        String identifier = jsonObject.getString("identifier");
+        String proposedAuthenticatedUserIdentifier = identifier.replaceFirst("@", "");
+        String firstName = jsonObject.getString("firstName");
+        String lastName = jsonObject.getString("lastName");
+        String emailAddress = jsonObject.getString("email");
+        String position = null;
+        String affiliation = null;
+        UserRecordIdentifier userRecordId = new UserRecordIdentifier(jsonObject.getString("authenticationProviderId"),
+                persistentUserId);
+        AuthenticatedUserDisplayInfo userDisplayInfo = new AuthenticatedUserDisplayInfo(firstName, lastName,
+                emailAddress, affiliation, position);
+        boolean generateUniqueIdentifier = true;
+        AuthenticatedUser authenticatedUser = authSvc.createAuthenticatedUser(userRecordId,
+                proposedAuthenticatedUserIdentifier, userDisplayInfo, true);
+        return ok(json(authenticatedUser));
+    }
 
         //TODO: Delete this endpoint after 4.9.3. Was updated with change in docs. --MAD
-	/**
-	 * curl -X PUT -d "shib@mailinator.com"
-	 * http://localhost:8080/api/admin/authenticatedUsers/id/11/convertShibToBuiltIn
-	 *
-	 * @deprecated We have documented this API endpoint so we'll keep in around for
-	 *             a while but we should encourage everyone to switch to the
-	 *             "convertRemoteToBuiltIn" endpoint and then remove this
-	 *             Shib-specfic one.
-	 */
-	@PUT
-	@AuthRequired
-	@Path("authenticatedUsers/id/{id}/convertShibToBuiltIn")
-	@Deprecated
-	public Response convertShibUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
-		try {
-			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		try {
-			BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
-			if (builtinUser == null) {
-				return error(Response.Status.BAD_REQUEST, "User id " + id
-						+ " could not be converted from Shibboleth to BuiltIn. An Exception was not thrown.");
-			}
+    /**
+     * curl -X PUT -d "shib@mailinator.com"
+     * http://localhost:8080/api/admin/authenticatedUsers/id/11/convertShibToBuiltIn
+     *
+     * @deprecated We have documented this API endpoint so we'll keep in around for
+     *             a while but we should encourage everyone to switch to the
+     *             "convertRemoteToBuiltIn" endpoint and then remove this
+     *             Shib-specfic one.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/id/{id}/convertShibToBuiltIn")
+    @Deprecated
+    public Response convertShibUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        try {
+            BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
+            if (builtinUser == null) {
+                return error(Response.Status.BAD_REQUEST, "User id " + id
+                        + " could not be converted from Shibboleth to BuiltIn. An Exception was not thrown.");
+            }
                         AuthenticatedUser authUser = authSvc.getAuthenticatedUser(builtinUser.getUserName());
-			JsonObjectBuilder output = Json.createObjectBuilder();
-			output.add("email", authUser.getEmail());
-			output.add("username", builtinUser.getUserName());
-			return ok(output);
-		} catch (Throwable ex) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(ex + " ");
-			while (ex.getCause() != null) {
-				ex = ex.getCause();
-				sb.append(ex + " ");
-			}
-			String msg = "User id " + id
-					+ " could not be converted from Shibboleth to BuiltIn. Details from Exception: " + sb;
-			logger.info(msg);
-			return error(Response.Status.BAD_REQUEST, msg);
-		}
-	}
-
-	@PUT
-	@AuthRequired
-	@Path("authenticatedUsers/id/{id}/convertRemoteToBuiltIn")
-	public Response convertOAuthUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
-		try {
-			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		try {
-			BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
+            JsonObjectBuilder output = Json.createObjectBuilder();
+            output.add("email", authUser.getEmail());
+            output.add("username", builtinUser.getUserName());
+            return ok(output);
+        } catch (Throwable ex) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(ex + " ");
+            while (ex.getCause() != null) {
+                ex = ex.getCause();
+                sb.append(ex + " ");
+            }
+            String msg = "User id " + id
+                    + " could not be converted from Shibboleth to BuiltIn. Details from Exception: " + sb;
+            logger.info(msg);
+            return error(Response.Status.BAD_REQUEST, msg);
+        }
+    }
+
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/id/{id}/convertRemoteToBuiltIn")
+    public Response convertOAuthUserToBuiltin(@Context ContainerRequestContext crc, @PathParam("id") Long id, String newEmailAddress) {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        try {
+            BuiltinUser builtinUser = authSvc.convertRemoteToBuiltIn(id, newEmailAddress);
                         //AuthenticatedUser authUser = authService.getAuthenticatedUser(aUser.getUserName());
-			if (builtinUser == null) {
-				return error(Response.Status.BAD_REQUEST, "User id " + id
-						+ " could not be converted from remote to BuiltIn. An Exception was not thrown.");
-			}
+            if (builtinUser == null) {
+                return error(Response.Status.BAD_REQUEST, "User id " + id
+                        + " could not be converted from remote to BuiltIn. An Exception was not thrown.");
+            }
                         AuthenticatedUser authUser = authSvc.getAuthenticatedUser(builtinUser.getUserName());
-			JsonObjectBuilder output = Json.createObjectBuilder();
-			output.add("email", authUser.getEmail());
-			output.add("username", builtinUser.getUserName());
-			return ok(output);
-		} catch (Throwable ex) {
-			StringBuilder sb = new StringBuilder();
-			sb.append(ex + " ");
-			while (ex.getCause() != null) {
-				ex = ex.getCause();
-				sb.append(ex + " ");
-			}
-			String msg = "User id " + id + " could not be converted from remote to BuiltIn. Details from Exception: "
-					+ sb;
-			logger.info(msg);
-			return error(Response.Status.BAD_REQUEST, msg);
-		}
-	}
-
-	/**
-	 * This is used in testing via AdminIT.java but we don't expect sysadmins to use
-	 * this.
-	 */
-	@PUT
-	@AuthRequired
-	@Path("authenticatedUsers/convert/builtin2shib")
-	public Response builtin2shib(@Context ContainerRequestContext crc, String content) {
-		logger.info("entering builtin2shib...");
-		try {
-			AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
-			if (!userToRunThisMethod.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		boolean disabled = false;
-		if (disabled) {
-			return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
-		}
-		AuthenticatedUser builtInUserToConvert = null;
-		String emailToFind;
-		String password;
-		String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
-									// tell us their
-		String newEmailAddressToUse;
-		try {
-			String[] args = content.split(":");
-			emailToFind = args[0];
-			password = args[1];
-			newEmailAddressToUse = args[2];
-			// authuserId = args[666];
-		} catch (ArrayIndexOutOfBoundsException ex) {
-			return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
-		}
-		AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
-		String existing = "NOT FOUND";
-		if (existingAuthUserFoundByEmail != null) {
-			builtInUserToConvert = existingAuthUserFoundByEmail;
-			existing = existingAuthUserFoundByEmail.getIdentifier();
-		} else {
-			long longToLookup = Long.parseLong(authuserId);
-			AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
-			if (specifiedUserToConvert != null) {
-				builtInUserToConvert = specifiedUserToConvert;
-			} else {
-				return error(Response.Status.BAD_REQUEST,
-						"No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
-								+ " and no user was found using specified id " + longToLookup);
-			}
-		}
-		String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
-		Map<String, String> randomUser = authTestDataService.getRandomUser();
-		// String eppn = UUID.randomUUID().toString().substring(0, 8);
-		String eppn = randomUser.get("eppn");
-		String idPEntityId = randomUser.get("idp");
-		String notUsed = null;
-		String separator = "|";
-		UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(idPEntityId + separator + eppn, notUsed);
-		String overwriteFirstName = randomUser.get("firstName");
-		String overwriteLastName = randomUser.get("lastName");
-		String overwriteEmail = randomUser.get("email");
-		overwriteEmail = newEmailAddressToUse;
-		logger.info("overwriteEmail: " + overwriteEmail);
-		boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
-		if (!validEmail) {
-			// See https://github.com/IQSS/dataverse/issues/2998
-			return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
-		}
-		/**
-		 * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
-		 *       constructor.
-		 */
-		/**
-		 * Here we are exercising (via an API test) shibService.getAffiliation with the
-		 * TestShib IdP and a non-production DevShibAccountType.
-		 */
-		idPEntityId = ShibUtil.testShibIdpEntityId;
-		String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
-				ShibServiceBean.DevShibAccountType.RANDOM);
-		logger.info("overwriteAffiliation: " + overwriteAffiliation);
-		/**
-		 * @todo Find a place to put "position" in the authenticateduser table:
-		 *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
-		 */
-		String overwritePosition = "staff;student";
-		AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
-				overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
-		JsonObjectBuilder response = Json.createObjectBuilder();
-		JsonArrayBuilder problems = Json.createArrayBuilder();
-		if (password != null) {
-			response.add("password supplied", password);
-			boolean knowsExistingPassword = false;
-			BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
-			if (oldBuiltInUser != null) {
+            JsonObjectBuilder output = Json.createObjectBuilder();
+            output.add("email", authUser.getEmail());
+            output.add("username", builtinUser.getUserName());
+            return ok(output);
+        } catch (Throwable ex) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(ex + " ");
+            while (ex.getCause() != null) {
+                ex = ex.getCause();
+                sb.append(ex + " ");
+            }
+            String msg = "User id " + id + " could not be converted from remote to BuiltIn. Details from Exception: "
+                    + sb;
+            logger.info(msg);
+            return error(Response.Status.BAD_REQUEST, msg);
+        }
+    }
+
+    /**
+     * This is used in testing via AdminIT.java but we don't expect sysadmins to use
+     * this.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/convert/builtin2shib")
+    public Response builtin2shib(@Context ContainerRequestContext crc, String content) {
+        logger.info("entering builtin2shib...");
+        try {
+            AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
+            if (!userToRunThisMethod.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        boolean disabled = false;
+        if (disabled) {
+            return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
+        }
+        AuthenticatedUser builtInUserToConvert = null;
+        String emailToFind;
+        String password;
+        String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
+                                    // tell us their
+        String newEmailAddressToUse;
+        try {
+            String[] args = content.split(":");
+            emailToFind = args[0];
+            password = args[1];
+            newEmailAddressToUse = args[2];
+            // authuserId = args[666];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
+        }
+        AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
+        String existing = "NOT FOUND";
+        if (existingAuthUserFoundByEmail != null) {
+            builtInUserToConvert = existingAuthUserFoundByEmail;
+            existing = existingAuthUserFoundByEmail.getIdentifier();
+        } else {
+            long longToLookup = Long.parseLong(authuserId);
+            AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
+            if (specifiedUserToConvert != null) {
+                builtInUserToConvert = specifiedUserToConvert;
+            } else {
+                return error(Response.Status.BAD_REQUEST,
+                        "No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
+                                + " and no user was found using specified id " + longToLookup);
+            }
+        }
+        String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
+        Map<String, String> randomUser = authTestDataService.getRandomUser();
+        // String eppn = UUID.randomUUID().toString().substring(0, 8);
+        String eppn = randomUser.get("eppn");
+        String idPEntityId = randomUser.get("idp");
+        String notUsed = null;
+        String separator = "|";
+        UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(idPEntityId + separator + eppn, notUsed);
+        String overwriteFirstName = randomUser.get("firstName");
+        String overwriteLastName = randomUser.get("lastName");
+        String overwriteEmail = randomUser.get("email");
+        overwriteEmail = newEmailAddressToUse;
+        logger.info("overwriteEmail: " + overwriteEmail);
+        boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
+        if (!validEmail) {
+            // See https://github.com/IQSS/dataverse/issues/2998
+            return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
+        }
+        /**
+         * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
+         *       constructor.
+         */
+        /**
+         * Here we are exercising (via an API test) shibService.getAffiliation with the
+         * TestShib IdP and a non-production DevShibAccountType.
+         */
+        idPEntityId = ShibUtil.testShibIdpEntityId;
+        String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
+                ShibServiceBean.DevShibAccountType.RANDOM);
+        logger.info("overwriteAffiliation: " + overwriteAffiliation);
+        /**
+         * @todo Find a place to put "position" in the authenticateduser table:
+         *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
+         */
+        String overwritePosition = "staff;student";
+        AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
+                overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        JsonArrayBuilder problems = Json.createArrayBuilder();
+        if (password != null) {
+            response.add("password supplied", password);
+            boolean knowsExistingPassword = false;
+            BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
+            if (oldBuiltInUser != null) {
                                 if (builtInUserToConvert.isDeactivated()) {
                                         problems.add("builtin account has been deactivated");
                                         return error(Status.BAD_REQUEST, problems.build().toString());
                                 }
-				String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
-				response.add("old username", usernameOfBuiltinAccountToConvert);
-				AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
-						password);
-				if (authenticatedUser != null) {
-					knowsExistingPassword = true;
-					AuthenticatedUser convertedUser = authSvc.convertBuiltInToShib(builtInUserToConvert, shibProviderId,
-							newUserIdentifierInLookupTable);
-					if (convertedUser != null) {
-						/**
-						 * @todo Display name is not being overwritten. Logic must be in Shib backing
-						 *       bean
-						 */
-						AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
-						if (updatedInfoUser != null) {
-							response.add("display name overwritten with", updatedInfoUser.getName());
-						} else {
-							problems.add("couldn't update display info");
-						}
-					} else {
-						problems.add("unable to convert user");
-					}
-				}
-			} else {
-				problems.add("couldn't find old username");
-			}
-			if (!knowsExistingPassword) {
-				String message = "User doesn't know password.";
-				problems.add(message);
-				/**
-				 * @todo Someday we should make a errorResponse method that takes JSON arrays
-				 *       and objects.
-				 */
-				return error(Status.BAD_REQUEST, problems.build().toString());
-			}
-			// response.add("knows existing password", knowsExistingPassword);
-		}
-
-		response.add("user to convert", builtInUserToConvert.getIdentifier());
-		response.add("existing user found by email (prompt to convert)", existing);
-		response.add("changing to this provider", shibProviderId);
-		response.add("value to overwrite old first name", overwriteFirstName);
-		response.add("value to overwrite old last name", overwriteLastName);
-		response.add("value to overwrite old email address", overwriteEmail);
-		if (overwriteAffiliation != null) {
-			response.add("affiliation", overwriteAffiliation);
-		}
-		response.add("problems", problems);
-		return ok(response);
-	}
-
-	/**
-	 * This is used in testing via AdminIT.java but we don't expect sysadmins to use
-	 * this.
-	 */
-	@PUT
-	@AuthRequired
-	@Path("authenticatedUsers/convert/builtin2oauth")
-	public Response builtin2oauth(@Context ContainerRequestContext crc, String content) {
-		logger.info("entering builtin2oauth...");
-		try {
-			AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
-			if (!userToRunThisMethod.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse ex) {
-			return error(Response.Status.FORBIDDEN, "Superusers only.");
-		}
-		boolean disabled = false;
-		if (disabled) {
-			return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
-		}
-		AuthenticatedUser builtInUserToConvert = null;
-		String emailToFind;
-		String password;
-		String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
-									// tell us their
-		String newEmailAddressToUse;
-		String newProviderId;
-		String newPersistentUserIdInLookupTable;
-		logger.info("content: " + content);
-		try {
-			String[] args = content.split(":");
-			emailToFind = args[0];
-			password = args[1];
-			newEmailAddressToUse = args[2];
-			newProviderId = args[3];
-			newPersistentUserIdInLookupTable = args[4];
-			// authuserId = args[666];
-		} catch (ArrayIndexOutOfBoundsException ex) {
-			return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
-		}
-		AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
-		String existing = "NOT FOUND";
-		if (existingAuthUserFoundByEmail != null) {
-			builtInUserToConvert = existingAuthUserFoundByEmail;
-			existing = existingAuthUserFoundByEmail.getIdentifier();
-		} else {
-			long longToLookup = Long.parseLong(authuserId);
-			AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
-			if (specifiedUserToConvert != null) {
-				builtInUserToConvert = specifiedUserToConvert;
-			} else {
-				return error(Response.Status.BAD_REQUEST,
-						"No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
-								+ " and no user was found using specified id " + longToLookup);
-			}
-		}
-		// String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
-		Map<String, String> randomUser = authTestDataService.getRandomUser();
-		// String eppn = UUID.randomUUID().toString().substring(0, 8);
-		String eppn = randomUser.get("eppn");
-		String idPEntityId = randomUser.get("idp");
-		String notUsed = null;
-		String separator = "|";
-		// UserIdentifier newUserIdentifierInLookupTable = new
-		// UserIdentifier(idPEntityId + separator + eppn, notUsed);
-		UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(newPersistentUserIdInLookupTable, notUsed);
-		String overwriteFirstName = randomUser.get("firstName");
-		String overwriteLastName = randomUser.get("lastName");
-		String overwriteEmail = randomUser.get("email");
-		overwriteEmail = newEmailAddressToUse;
-		logger.info("overwriteEmail: " + overwriteEmail);
-		boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
-		if (!validEmail) {
-			// See https://github.com/IQSS/dataverse/issues/2998
-			return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
-		}
-		/**
-		 * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
-		 *       constructor.
-		 */
-		/**
-		 * Here we are exercising (via an API test) shibService.getAffiliation with the
-		 * TestShib IdP and a non-production DevShibAccountType.
-		 */
-		// idPEntityId = ShibUtil.testShibIdpEntityId;
-		// String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
-		// ShibServiceBean.DevShibAccountType.RANDOM);
-		String overwriteAffiliation = null;
-		logger.info("overwriteAffiliation: " + overwriteAffiliation);
-		/**
-		 * @todo Find a place to put "position" in the authenticateduser table:
-		 *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
-		 */
-		String overwritePosition = "staff;student";
-		AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
-				overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
-		JsonObjectBuilder response = Json.createObjectBuilder();
-		JsonArrayBuilder problems = Json.createArrayBuilder();
-		if (password != null) {
-			response.add("password supplied", password);
-			boolean knowsExistingPassword = false;
-			BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
-			if (oldBuiltInUser != null) {
-				String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
-				response.add("old username", usernameOfBuiltinAccountToConvert);
-				AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
-						password);
-				if (authenticatedUser != null) {
-					knowsExistingPassword = true;
-					AuthenticatedUser convertedUser = authSvc.convertBuiltInUserToRemoteUser(builtInUserToConvert,
-							newProviderId, newUserIdentifierInLookupTable);
-					if (convertedUser != null) {
-						/**
-						 * @todo Display name is not being overwritten. Logic must be in Shib backing
-						 *       bean
-						 */
-						AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
-						if (updatedInfoUser != null) {
-							response.add("display name overwritten with", updatedInfoUser.getName());
-						} else {
-							problems.add("couldn't update display info");
-						}
-					} else {
-						problems.add("unable to convert user");
-					}
-				}
-			} else {
-				problems.add("couldn't find old username");
-			}
-			if (!knowsExistingPassword) {
-				String message = "User doesn't know password.";
-				problems.add(message);
-				/**
-				 * @todo Someday we should make a errorResponse method that takes JSON arrays
-				 *       and objects.
-				 */
-				return error(Status.BAD_REQUEST, problems.build().toString());
-			}
-			// response.add("knows existing password", knowsExistingPassword);
-		}
-
-		response.add("user to convert", builtInUserToConvert.getIdentifier());
-		response.add("existing user found by email (prompt to convert)", existing);
-		response.add("changing to this provider", newProviderId);
-		response.add("value to overwrite old first name", overwriteFirstName);
-		response.add("value to overwrite old last name", overwriteLastName);
-		response.add("value to overwrite old email address", overwriteEmail);
-		if (overwriteAffiliation != null) {
-			response.add("affiliation", overwriteAffiliation);
-		}
-		response.add("problems", problems);
-		return ok(response);
-	}
-
-
-
-
-	@Path("roles")
-	@POST
-	public Response createNewBuiltinRole(RoleDTO roleDto) {
-		ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "createBuiltInRole")
-				.setInfo(roleDto.getAlias() + ":" + roleDto.getDescription());
-		try {
-			return ok(json(rolesSvc.save(roleDto.asRole())));
-		} catch (Exception e) {
-			alr.setActionResult(ActionLogRecord.Result.InternalError);
-			alr.setInfo(alr.getInfo() + "// " + e.getMessage());
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		} finally {
-			actionLogSvc.log(alr);
-		}
-	}
-
-	@Path("roles")
-	@GET
-	public Response listBuiltinRoles() {
-		try {
-			return ok(rolesToJson(rolesSvc.findBuiltinRoles()));
-		} catch (Exception e) {
-			return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-		}
-	}
+                String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
+                response.add("old username", usernameOfBuiltinAccountToConvert);
+                AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
+                        password);
+                if (authenticatedUser != null) {
+                    knowsExistingPassword = true;
+                    AuthenticatedUser convertedUser = authSvc.convertBuiltInToShib(builtInUserToConvert, shibProviderId,
+                            newUserIdentifierInLookupTable);
+                    if (convertedUser != null) {
+                        /**
+                         * @todo Display name is not being overwritten. Logic must be in Shib backing
+                         *       bean
+                         */
+                        AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
+                        if (updatedInfoUser != null) {
+                            response.add("display name overwritten with", updatedInfoUser.getName());
+                        } else {
+                            problems.add("couldn't update display info");
+                        }
+                    } else {
+                        problems.add("unable to convert user");
+                    }
+                }
+            } else {
+                problems.add("couldn't find old username");
+            }
+            if (!knowsExistingPassword) {
+                String message = "User doesn't know password.";
+                problems.add(message);
+                /**
+                 * @todo Someday we should make a errorResponse method that takes JSON arrays
+                 *       and objects.
+                 */
+                return error(Status.BAD_REQUEST, problems.build().toString());
+            }
+            // response.add("knows existing password", knowsExistingPassword);
+        }
+
+        response.add("user to convert", builtInUserToConvert.getIdentifier());
+        response.add("existing user found by email (prompt to convert)", existing);
+        response.add("changing to this provider", shibProviderId);
+        response.add("value to overwrite old first name", overwriteFirstName);
+        response.add("value to overwrite old last name", overwriteLastName);
+        response.add("value to overwrite old email address", overwriteEmail);
+        if (overwriteAffiliation != null) {
+            response.add("affiliation", overwriteAffiliation);
+        }
+        response.add("problems", problems);
+        return ok(response);
+    }
+
+    /**
+     * This is used in testing via AdminIT.java but we don't expect sysadmins to use
+     * this.
+     */
+    @PUT
+    @AuthRequired
+    @Path("authenticatedUsers/convert/builtin2oauth")
+    public Response builtin2oauth(@Context ContainerRequestContext crc, String content) {
+        logger.info("entering builtin2oauth...");
+        try {
+            AuthenticatedUser userToRunThisMethod = getRequestAuthenticatedUserOrDie(crc);
+            if (!userToRunThisMethod.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse ex) {
+            return error(Response.Status.FORBIDDEN, "Superusers only.");
+        }
+        boolean disabled = false;
+        if (disabled) {
+            return error(Response.Status.BAD_REQUEST, "API endpoint disabled.");
+        }
+        AuthenticatedUser builtInUserToConvert = null;
+        String emailToFind;
+        String password;
+        String authuserId = "0"; // could let people specify id on authuser table. probably better to let them
+                                    // tell us their
+        String newEmailAddressToUse;
+        String newProviderId;
+        String newPersistentUserIdInLookupTable;
+        logger.info("content: " + content);
+        try {
+            String[] args = content.split(":");
+            emailToFind = args[0];
+            password = args[1];
+            newEmailAddressToUse = args[2];
+            newProviderId = args[3];
+            newPersistentUserIdInLookupTable = args[4];
+            // authuserId = args[666];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return error(Response.Status.BAD_REQUEST, "Problem with content <<<" + content + ">>>: " + ex.toString());
+        }
+        AuthenticatedUser existingAuthUserFoundByEmail = shibService.findAuthUserByEmail(emailToFind);
+        String existing = "NOT FOUND";
+        if (existingAuthUserFoundByEmail != null) {
+            builtInUserToConvert = existingAuthUserFoundByEmail;
+            existing = existingAuthUserFoundByEmail.getIdentifier();
+        } else {
+            long longToLookup = Long.parseLong(authuserId);
+            AuthenticatedUser specifiedUserToConvert = authSvc.findByID(longToLookup);
+            if (specifiedUserToConvert != null) {
+                builtInUserToConvert = specifiedUserToConvert;
+            } else {
+                return error(Response.Status.BAD_REQUEST,
+                        "No user to convert. We couldn't find a *single* existing user account based on " + emailToFind
+                                + " and no user was found using specified id " + longToLookup);
+            }
+        }
+        // String shibProviderId = ShibAuthenticationProvider.PROVIDER_ID;
+        Map<String, String> randomUser = authTestDataService.getRandomUser();
+        // String eppn = UUID.randomUUID().toString().substring(0, 8);
+        String eppn = randomUser.get("eppn");
+        String idPEntityId = randomUser.get("idp");
+        String notUsed = null;
+        String separator = "|";
+        // UserIdentifier newUserIdentifierInLookupTable = new
+        // UserIdentifier(idPEntityId + separator + eppn, notUsed);
+        UserIdentifier newUserIdentifierInLookupTable = new UserIdentifier(newPersistentUserIdInLookupTable, notUsed);
+        String overwriteFirstName = randomUser.get("firstName");
+        String overwriteLastName = randomUser.get("lastName");
+        String overwriteEmail = randomUser.get("email");
+        overwriteEmail = newEmailAddressToUse;
+        logger.info("overwriteEmail: " + overwriteEmail);
+        boolean validEmail = EMailValidator.isEmailValid(overwriteEmail);
+        if (!validEmail) {
+            // See https://github.com/IQSS/dataverse/issues/2998
+            return error(Response.Status.BAD_REQUEST, "invalid email: " + overwriteEmail);
+        }
+        /**
+         * @todo If affiliation is not null, put it in RoleAssigneeDisplayInfo
+         *       constructor.
+         */
+        /**
+         * Here we are exercising (via an API test) shibService.getAffiliation with the
+         * TestShib IdP and a non-production DevShibAccountType.
+         */
+        // idPEntityId = ShibUtil.testShibIdpEntityId;
+        // String overwriteAffiliation = shibService.getAffiliation(idPEntityId,
+        // ShibServiceBean.DevShibAccountType.RANDOM);
+        String overwriteAffiliation = null;
+        logger.info("overwriteAffiliation: " + overwriteAffiliation);
+        /**
+         * @todo Find a place to put "position" in the authenticateduser table:
+         *       https://github.com/IQSS/dataverse/issues/1444#issuecomment-74134694
+         */
+        String overwritePosition = "staff;student";
+        AuthenticatedUserDisplayInfo displayInfo = new AuthenticatedUserDisplayInfo(overwriteFirstName,
+                overwriteLastName, overwriteEmail, overwriteAffiliation, overwritePosition);
+        JsonObjectBuilder response = Json.createObjectBuilder();
+        JsonArrayBuilder problems = Json.createArrayBuilder();
+        if (password != null) {
+            response.add("password supplied", password);
+            boolean knowsExistingPassword = false;
+            BuiltinUser oldBuiltInUser = builtinUserService.findByUserName(builtInUserToConvert.getUserIdentifier());
+            if (oldBuiltInUser != null) {
+                String usernameOfBuiltinAccountToConvert = oldBuiltInUser.getUserName();
+                response.add("old username", usernameOfBuiltinAccountToConvert);
+                AuthenticatedUser authenticatedUser = authSvc.canLogInAsBuiltinUser(usernameOfBuiltinAccountToConvert,
+                        password);
+                if (authenticatedUser != null) {
+                    knowsExistingPassword = true;
+                    AuthenticatedUser convertedUser = authSvc.convertBuiltInUserToRemoteUser(builtInUserToConvert,
+                            newProviderId, newUserIdentifierInLookupTable);
+                    if (convertedUser != null) {
+                        /**
+                         * @todo Display name is not being overwritten. Logic must be in Shib backing
+                         *       bean
+                         */
+                        AuthenticatedUser updatedInfoUser = authSvc.updateAuthenticatedUser(convertedUser, displayInfo);
+                        if (updatedInfoUser != null) {
+                            response.add("display name overwritten with", updatedInfoUser.getName());
+                        } else {
+                            problems.add("couldn't update display info");
+                        }
+                    } else {
+                        problems.add("unable to convert user");
+                    }
+                }
+            } else {
+                problems.add("couldn't find old username");
+            }
+            if (!knowsExistingPassword) {
+                String message = "User doesn't know password.";
+                problems.add(message);
+                /**
+                 * @todo Someday we should make a errorResponse method that takes JSON arrays
+                 *       and objects.
+                 */
+                return error(Status.BAD_REQUEST, problems.build().toString());
+            }
+            // response.add("knows existing password", knowsExistingPassword);
+        }
+
+        response.add("user to convert", builtInUserToConvert.getIdentifier());
+        response.add("existing user found by email (prompt to convert)", existing);
+        response.add("changing to this provider", newProviderId);
+        response.add("value to overwrite old first name", overwriteFirstName);
+        response.add("value to overwrite old last name", overwriteLastName);
+        response.add("value to overwrite old email address", overwriteEmail);
+        if (overwriteAffiliation != null) {
+            response.add("affiliation", overwriteAffiliation);
+        }
+        response.add("problems", problems);
+        return ok(response);
+    }
+
+
+
+
+    @Path("roles")
+    @POST
+    public Response createNewBuiltinRole(RoleDTO roleDto) {
+        ActionLogRecord alr = new ActionLogRecord(ActionLogRecord.ActionType.Admin, "createBuiltInRole")
+                .setInfo(roleDto.getAlias() + ":" + roleDto.getDescription());
+        try {
+            return ok(json(rolesSvc.save(roleDto.asRole())));
+        } catch (Exception e) {
+            alr.setActionResult(ActionLogRecord.Result.InternalError);
+            alr.setInfo(alr.getInfo() + "// " + e.getMessage());
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        } finally {
+            actionLogSvc.log(alr);
+        }
+    }
+
+    @Path("roles")
+    @GET
+    public Response listBuiltinRoles() {
+        try {
+            return ok(rolesToJson(rolesSvc.findBuiltinRoles()));
+        } catch (Exception e) {
+            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
+        }
+    }
 
     @DELETE
-	@AuthRequired
+    @AuthRequired
     @Path("roles/{id}")
     public Response deleteRole(@Context ContainerRequestContext crc, @PathParam("id") String id) {
 
@@ -1264,77 +1264,77 @@ public void write(OutputStream os) throws IOException,
         return Response.ok(stream).build();
     }
 
-	@Path("assignments/assignees/{raIdtf: .*}")
-	@GET
-	public Response getAssignmentsFor(@PathParam("raIdtf") String raIdtf) {
-
-		JsonArrayBuilder arr = Json.createArrayBuilder();
-		roleAssigneeSvc.getAssignmentsFor(raIdtf).forEach(a -> arr.add(json(a)));
-
-		return ok(arr);
-	}
-
-	/**
-	 * This method is used in integration tests.
-	 *
-	 * @param userId
-	 *            The database id of an AuthenticatedUser.
-	 * @return The confirm email token.
-	 */
-	@Path("confirmEmail/{userId}")
-	@GET
-	public Response getConfirmEmailToken(@PathParam("userId") long userId) {
-		AuthenticatedUser user = authSvc.findByID(userId);
-		if (user != null) {
-			ConfirmEmailData confirmEmailData = confirmEmailSvc.findSingleConfirmEmailDataByUser(user);
-			if (confirmEmailData != null) {
-				return ok(Json.createObjectBuilder().add("token", confirmEmailData.getToken()));
-			}
-		}
-		return error(Status.BAD_REQUEST, "Could not find confirm email token for user " + userId);
-	}
-
-	/**
-	 * This method is used in integration tests.
-	 *
-	 * @param userId
-	 *            The database id of an AuthenticatedUser.
-	 */
-	@Path("confirmEmail/{userId}")
-	@POST
-	public Response startConfirmEmailProcess(@PathParam("userId") long userId) {
-		AuthenticatedUser user = authSvc.findByID(userId);
-		if (user != null) {
-			try {
-				ConfirmEmailInitResponse confirmEmailInitResponse = confirmEmailSvc.beginConfirm(user);
-				ConfirmEmailData confirmEmailData = confirmEmailInitResponse.getConfirmEmailData();
-				return ok(Json.createObjectBuilder().add("tokenCreated", confirmEmailData.getCreated().toString())
-						.add("identifier", user.getUserIdentifier()));
-			} catch (ConfirmEmailException ex) {
-				return error(Status.BAD_REQUEST,
-						"Could not start confirm email process for user " + userId + ": " + ex.getLocalizedMessage());
-			}
-		}
-		return error(Status.BAD_REQUEST, "Could not find user based on " + userId);
-	}
-
-	/**
-	 * This method is used by an integration test in UsersIT.java to exercise bug
-	 * https://github.com/IQSS/dataverse/issues/3287 . Not for use by users!
-	 */
-	@Path("convertUserFromBcryptToSha1")
-	@POST
-	public Response convertUserFromBcryptToSha1(String json) {
-		JsonReader jsonReader = Json.createReader(new StringReader(json));
-		JsonObject object = jsonReader.readObject();
-		jsonReader.close();
-		BuiltinUser builtinUser = builtinUserService.find(new Long(object.getInt("builtinUserId")));
-		builtinUser.updateEncryptedPassword("4G7xxL9z11/JKN4jHPn4g9iIQck=", 0); // password is "sha-1Pass", 0 means
-																				// SHA-1
-		BuiltinUser savedUser = builtinUserService.save(builtinUser);
-		return ok("foo: " + savedUser);
-
-	}
+    @Path("assignments/assignees/{raIdtf: .*}")
+    @GET
+    public Response getAssignmentsFor(@PathParam("raIdtf") String raIdtf) {
+
+        JsonArrayBuilder arr = Json.createArrayBuilder();
+        roleAssigneeSvc.getAssignmentsFor(raIdtf).forEach(a -> arr.add(json(a)));
+
+        return ok(arr);
+    }
+
+    /**
+     * This method is used in integration tests.
+     *
+     * @param userId
+     *            The database id of an AuthenticatedUser.
+     * @return The confirm email token.
+     */
+    @Path("confirmEmail/{userId}")
+    @GET
+    public Response getConfirmEmailToken(@PathParam("userId") long userId) {
+        AuthenticatedUser user = authSvc.findByID(userId);
+        if (user != null) {
+            ConfirmEmailData confirmEmailData = confirmEmailSvc.findSingleConfirmEmailDataByUser(user);
+            if (confirmEmailData != null) {
+                return ok(Json.createObjectBuilder().add("token", confirmEmailData.getToken()));
+            }
+        }
+        return error(Status.BAD_REQUEST, "Could not find confirm email token for user " + userId);
+    }
+
+    /**
+     * This method is used in integration tests.
+     *
+     * @param userId
+     *            The database id of an AuthenticatedUser.
+     */
+    @Path("confirmEmail/{userId}")
+    @POST
+    public Response startConfirmEmailProcess(@PathParam("userId") long userId) {
+        AuthenticatedUser user = authSvc.findByID(userId);
+        if (user != null) {
+            try {
+                ConfirmEmailInitResponse confirmEmailInitResponse = confirmEmailSvc.beginConfirm(user);
+                ConfirmEmailData confirmEmailData = confirmEmailInitResponse.getConfirmEmailData();
+                return ok(Json.createObjectBuilder().add("tokenCreated", confirmEmailData.getCreated().toString())
+                        .add("identifier", user.getUserIdentifier()));
+            } catch (ConfirmEmailException ex) {
+                return error(Status.BAD_REQUEST,
+                        "Could not start confirm email process for user " + userId + ": " + ex.getLocalizedMessage());
+            }
+        }
+        return error(Status.BAD_REQUEST, "Could not find user based on " + userId);
+    }
+
+    /**
+     * This method is used by an integration test in UsersIT.java to exercise bug
+     * https://github.com/IQSS/dataverse/issues/3287 . Not for use by users!
+     */
+    @Path("convertUserFromBcryptToSha1")
+    @POST
+    public Response convertUserFromBcryptToSha1(String json) {
+        JsonReader jsonReader = Json.createReader(new StringReader(json));
+        JsonObject object = jsonReader.readObject();
+        jsonReader.close();
+        BuiltinUser builtinUser = builtinUserService.find(new Long(object.getInt("builtinUserId")));
+        builtinUser.updateEncryptedPassword("4G7xxL9z11/JKN4jHPn4g9iIQck=", 0); // password is "sha-1Pass", 0 means
+                                                                                // SHA-1
+        BuiltinUser savedUser = builtinUserService.save(builtinUser);
+        return ok("foo: " + savedUser);
+
+    }
 
     @Path("permissions/{dvo}")
     @AuthRequired
@@ -1355,43 +1355,43 @@ public Response findPermissonsOn(@Context final ContainerRequestContext crc, @Pa
         }
     }
 
-	@Path("assignee/{idtf}")
-	@GET
-	public Response findRoleAssignee(@PathParam("idtf") String idtf) {
-		RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(idtf);
-		return (ra == null) ? notFound("Role Assignee '" + idtf + "' not found.") : ok(json(ra.getDisplayInfo()));
-	}
-
-	@Path("datasets/integrity/{datasetVersionId}/fixmissingunf")
-	@POST
-	public Response fixUnf(@PathParam("datasetVersionId") String datasetVersionId,
-			@QueryParam("forceRecalculate") boolean forceRecalculate) {
-		JsonObjectBuilder info = datasetVersionSvc.fixMissingUnf(datasetVersionId, forceRecalculate);
-		return ok(info);
-	}
-
-	@Path("datafiles/integrity/fixmissingoriginaltypes")
-	@GET
-	public Response fixMissingOriginalTypes() {
-		JsonObjectBuilder info = Json.createObjectBuilder();
-
-		List<Long> affectedFileIds = fileService.selectFilesWithMissingOriginalTypes();
-
-		if (affectedFileIds.isEmpty()) {
-			info.add("message",
-					"All the tabular files in the database already have the original types set correctly; exiting.");
-		} else {
-			for (Long fileid : affectedFileIds) {
-				logger.fine("found file id: " + fileid);
-			}
-			info.add("message", "Found " + affectedFileIds.size()
-					+ " tabular files with missing original types. Kicking off an async job that will repair the files in the background.");
-		}
-
-		ingestService.fixMissingOriginalTypes(affectedFileIds);
-
-		return ok(info);
-	}
+    @Path("assignee/{idtf}")
+    @GET
+    public Response findRoleAssignee(@PathParam("idtf") String idtf) {
+        RoleAssignee ra = roleAssigneeSvc.getRoleAssignee(idtf);
+        return (ra == null) ? notFound("Role Assignee '" + idtf + "' not found.") : ok(json(ra.getDisplayInfo()));
+    }
+
+    @Path("datasets/integrity/{datasetVersionId}/fixmissingunf")
+    @POST
+    public Response fixUnf(@PathParam("datasetVersionId") String datasetVersionId,
+            @QueryParam("forceRecalculate") boolean forceRecalculate) {
+        JsonObjectBuilder info = datasetVersionSvc.fixMissingUnf(datasetVersionId, forceRecalculate);
+        return ok(info);
+    }
+
+    @Path("datafiles/integrity/fixmissingoriginaltypes")
+    @GET
+    public Response fixMissingOriginalTypes() {
+        JsonObjectBuilder info = Json.createObjectBuilder();
+
+        List<Long> affectedFileIds = fileService.selectFilesWithMissingOriginalTypes();
+
+        if (affectedFileIds.isEmpty()) {
+            info.add("message",
+                    "All the tabular files in the database already have the original types set correctly; exiting.");
+        } else {
+            for (Long fileid : affectedFileIds) {
+                logger.fine("found file id: " + fileid);
+            }
+            info.add("message", "Found " + affectedFileIds.size()
+                    + " tabular files with missing original types. Kicking off an async job that will repair the files in the background.");
+        }
+
+        ingestService.fixMissingOriginalTypes(affectedFileIds);
+
+        return ok(info);
+    }
         
     @Path("datafiles/integrity/fixmissingoriginalsizes")
     @GET
@@ -1421,60 +1421,60 @@ public Response fixMissingOriginalSizes(@QueryParam("limit") Integer limit) {
         return ok(info);
     }
 
-	/**
-	 * This method is used in API tests, called from UtilIt.java.
-	 */
-	@GET
-	@Path("datasets/thumbnailMetadata/{id}")
-	public Response getDatasetThumbnailMetadata(@PathParam("id") Long idSupplied) {
-		Dataset dataset = datasetSvc.find(idSupplied);
-		if (dataset == null) {
-			return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
-		}
-		JsonObjectBuilder data = Json.createObjectBuilder();
-		DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
-		data.add("isUseGenericThumbnail", dataset.isUseGenericThumbnail());
-		data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
-		if (datasetThumbnail != null) {
-			data.add("datasetThumbnailBase64image", datasetThumbnail.getBase64image());
-			DataFile dataFile = datasetThumbnail.getDataFile();
-			if (dataFile != null) {
-				/**
-				 * @todo Change this from a String to a long.
-				 */
-				data.add("dataFileId", dataFile.getId().toString());
-			}
-		}
-		return ok(data);
-	}
-
-	/**
-	 * validatePassword
-	 * <p>
-	 * Validate a password with an API call
-	 *
-	 * @param password
-	 *            The password
-	 * @return A response with the validation result.
-	 */
-	@Path("validatePassword")
-	@POST
-	public Response validatePassword(String password) {
-
-		final List<String> errors = passwordValidatorService.validate(password, new Date(), false);
-		final JsonArrayBuilder errorArray = Json.createArrayBuilder();
-		errors.forEach(errorArray::add);
-		return ok(Json.createObjectBuilder().add("password", password).add("errors", errorArray));
-	}
-
-	@GET
-	@Path("/isOrcid")
-	public Response isOrcidEnabled() {
-		return authSvc.isOrcidEnabled() ? ok("Orcid is enabled") : ok("no orcid for you.");
-	}
+    /**
+     * This method is used in API tests, called from UtilIt.java.
+     */
+    @GET
+    @Path("datasets/thumbnailMetadata/{id}")
+    public Response getDatasetThumbnailMetadata(@PathParam("id") Long idSupplied) {
+        Dataset dataset = datasetSvc.find(idSupplied);
+        if (dataset == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataset based on id supplied: " + idSupplied + ".");
+        }
+        JsonObjectBuilder data = Json.createObjectBuilder();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        data.add("isUseGenericThumbnail", dataset.isUseGenericThumbnail());
+        data.add("datasetLogoPresent", DatasetUtil.isDatasetLogoPresent(dataset, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE));
+        if (datasetThumbnail != null) {
+            data.add("datasetThumbnailBase64image", datasetThumbnail.getBase64image());
+            DataFile dataFile = datasetThumbnail.getDataFile();
+            if (dataFile != null) {
+                /**
+                 * @todo Change this from a String to a long.
+                 */
+                data.add("dataFileId", dataFile.getId().toString());
+            }
+        }
+        return ok(data);
+    }
+
+    /**
+     * validatePassword
+     * <p>
+     * Validate a password with an API call
+     *
+     * @param password
+     *            The password
+     * @return A response with the validation result.
+     */
+    @Path("validatePassword")
+    @POST
+    public Response validatePassword(String password) {
+
+        final List<String> errors = passwordValidatorService.validate(password, new Date(), false);
+        final JsonArrayBuilder errorArray = Json.createArrayBuilder();
+        errors.forEach(errorArray::add);
+        return ok(Json.createObjectBuilder().add("password", password).add("errors", errorArray));
+    }
+
+    @GET
+    @Path("/isOrcid")
+    public Response isOrcidEnabled() {
+        return authSvc.isOrcidEnabled() ? ok("Orcid is enabled") : ok("no orcid for you.");
+    }
 
     @POST
-	@AuthRequired
+    @AuthRequired
     @Path("{id}/reregisterHDLToPID")
     public Response reregisterHdlToPID(@Context ContainerRequestContext crc, @PathParam("id") String id) {
         logger.info("Starting to reregister  " + id + " Dataset Id. (from hdl to doi)" + new Date());
@@ -1805,7 +1805,7 @@ public Response updateHashValues(@Context ContainerRequestContext crc, @PathPara
     }
         
     @POST
-	@AuthRequired
+    @AuthRequired
     @Path("/computeDataFileHashValue/{fileId}/algorithm/{alg}")
     public Response computeDataFileHashValue(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId, @PathParam("alg") String alg) {
 
@@ -1867,7 +1867,7 @@ public Response computeDataFileHashValue(@Context ContainerRequestContext crc, @
     }
     
     @POST
-	@AuthRequired
+    @AuthRequired
     @Path("/validateDataFileHashValue/{fileId}")
     public Response validateDataFileHashValue(@Context ContainerRequestContext crc, @PathParam("fileId") String fileId) {
 
@@ -1934,7 +1934,7 @@ public Response validateDataFileHashValue(@Context ContainerRequestContext crc,
     }
 
     @POST
-	@AuthRequired
+    @AuthRequired
     @Path("/submitDatasetVersionToArchive/{id}/{version}")
     public Response submitDatasetVersionToArchive(@Context ContainerRequestContext crc, @PathParam("id") String dsid,
             @PathParam("version") String versionNumber) {
@@ -2007,7 +2007,7 @@ public void run() {
      * @return
      */
     @POST
-	@AuthRequired
+    @AuthRequired
     @Path("/archiveAllUnarchivedDatasetVersions")
     public Response archiveAllUnarchivedDatasetVersions(@Context ContainerRequestContext crc, @QueryParam("listonly") boolean listonly, @QueryParam("limit") Integer limit, @QueryParam("latestonly") boolean latestonly) {
 
@@ -2106,7 +2106,7 @@ public Response clearMetricsCacheByName(@PathParam("name") String name) {
     }
 
     @GET
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/addRoleAssignmentsToChildren")
     public Response addRoleAssignementsToChildren(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
         Dataverse owner = dataverseSvc.findByAlias(alias);
@@ -2137,90 +2137,90 @@ public Response addRoleAssignementsToChildren(@Context ContainerRequestContext c
     }
     
     @GET
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/storageDriver")
     public Response getStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
-    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
-    	if (dataverse == null) {
-    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
-    	}
-    	try {
-    		AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-    		if (!user.isSuperuser()) {
-    			return error(Response.Status.FORBIDDEN, "Superusers only.");
-    		}
-    	} catch (WrappedResponse wr) {
-    		return wr.getResponse();
-    	}
-    	//Note that this returns what's set directly on this dataverse. If null/DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER, the user would have to recurse the chain of parents to find the effective storageDriver
-    	return ok(dataverse.getStorageDriverId());
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        //Note that this returns what's set directly on this dataverse. If null/DataAccess.UNDEFINED_STORAGE_DRIVER_IDENTIFIER, the user would have to recurse the chain of parents to find the effective storageDriver
+        return ok(dataverse.getStorageDriverId());
     }
     
     @PUT
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/storageDriver")
     public Response setStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias, String label) throws WrappedResponse {
-    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
-    	if (dataverse == null) {
-    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
-    	}
-    	try {
-    		AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-    		if (!user.isSuperuser()) {
-    			return error(Response.Status.FORBIDDEN, "Superusers only.");
-    		}
-    	} catch (WrappedResponse wr) {
-    		return wr.getResponse();
-    	}
-    	for (Entry<String, String> store: DataAccess.getStorageDriverLabels().entrySet()) {
-    		if(store.getKey().equals(label)) {
-    			dataverse.setStorageDriverId(store.getValue());
-    			return ok("Storage set to: " + store.getKey() + "/" + store.getValue());
-    		}
-    	}
-    	return error(Response.Status.BAD_REQUEST,
-    			"No Storage Driver found for : " + label);
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        for (Entry<String, String> store: DataAccess.getStorageDriverLabels().entrySet()) {
+            if(store.getKey().equals(label)) {
+                dataverse.setStorageDriverId(store.getValue());
+                return ok("Storage set to: " + store.getKey() + "/" + store.getValue());
+            }
+        }
+        return error(Response.Status.BAD_REQUEST,
+                "No Storage Driver found for : " + label);
     }
 
     @DELETE
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/storageDriver")
     public Response resetStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
-    	Dataverse dataverse = dataverseSvc.findByAlias(alias);
-    	if (dataverse == null) {
-    		return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
-    	}
-    	try {
-    		AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-    		if (!user.isSuperuser()) {
-    			return error(Response.Status.FORBIDDEN, "Superusers only.");
-    		}
-    	} catch (WrappedResponse wr) {
-    		return wr.getResponse();
-    	}
-    	dataverse.setStorageDriverId("");
-    	return ok("Storage reset to default: " + DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
+        Dataverse dataverse = dataverseSvc.findByAlias(alias);
+        if (dataverse == null) {
+            return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
+        }
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        dataverse.setStorageDriverId("");
+        return ok("Storage reset to default: " + DataAccess.DEFAULT_STORAGE_DRIVER_IDENTIFIER);
     }
     
     @GET
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/storageDrivers")
     public Response listStorageDrivers(@Context ContainerRequestContext crc) throws WrappedResponse {
-    	try {
-    		AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-    		if (!user.isSuperuser()) {
-    			return error(Response.Status.FORBIDDEN, "Superusers only.");
-    		}
-    	} catch (WrappedResponse wr) {
-    		return wr.getResponse();
-    	}
-    	JsonObjectBuilder bld = jsonObjectBuilder();
-    	DataAccess.getStorageDriverLabels().entrySet().forEach(s -> bld.add(s.getKey(), s.getValue()));
-		return ok(bld);
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+        JsonObjectBuilder bld = jsonObjectBuilder();
+        DataAccess.getStorageDriverLabels().entrySet().forEach(s -> bld.add(s.getKey(), s.getValue()));
+        return ok(bld);
     }
     
     @GET
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/curationLabelSet")
     public Response getCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
         Dataverse dataverse = dataverseSvc.findByAlias(alias);
@@ -2242,7 +2242,7 @@ public Response getCurationLabelSet(@Context ContainerRequestContext crc, @PathP
     }
 
     @PUT
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/curationLabelSet")
     public Response setCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias, @QueryParam("name") String name) throws WrappedResponse {
         Dataverse dataverse = dataverseSvc.findByAlias(alias);
@@ -2273,7 +2273,7 @@ public Response setCurationLabelSet(@Context ContainerRequestContext crc, @PathP
     }
 
     @DELETE
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/{alias}/curationLabelSet")
     public Response resetCurationLabelSet(@Context ContainerRequestContext crc, @PathParam("alias") String alias) throws WrappedResponse {
         Dataverse dataverse = dataverseSvc.findByAlias(alias);
@@ -2293,7 +2293,7 @@ public Response resetCurationLabelSet(@Context ContainerRequestContext crc, @Pat
     }
 
     @GET
-	@AuthRequired
+    @AuthRequired
     @Path("/dataverse/curationLabelSets")
     public Response listCurationLabelSets(@Context ContainerRequestContext crc) throws WrappedResponse {
         try {
@@ -2403,7 +2403,7 @@ public Response getBannerMessages(@PathParam("id") Long id) throws WrappedRespon
     }
     
     @POST
-	@AuthRequired
+    @AuthRequired
     @Consumes("application/json")
     @Path("/requestSignedUrl")
     public Response getSignedUrl(@Context ContainerRequestContext crc, JsonObject urlInfo) {
@@ -2521,162 +2521,162 @@ public Response getFeatureFlag(@PathParam("flag") String flagIn) {
         }
     }
 
-	@GET
-	@AuthRequired
-	@Path("/datafiles/auditFiles")
-	public Response getAuditFiles(@Context ContainerRequestContext crc,
-								  @QueryParam("firstId") Long firstId, @QueryParam("lastId") Long lastId,
-								  @QueryParam("datasetIdentifierList") String datasetIdentifierList) throws WrappedResponse {
-		try {
-			AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
-			if (!user.isSuperuser()) {
-				return error(Response.Status.FORBIDDEN, "Superusers only.");
-			}
-		} catch (WrappedResponse wr) {
-			return wr.getResponse();
-		}
-
-		int datasetsChecked = 0;
-		long startId = (firstId == null ? 0 : firstId);
-		long endId = (lastId == null ? Long.MAX_VALUE : lastId);
-
-		List<String> datasetIdentifiers;
-		if (datasetIdentifierList == null || datasetIdentifierList.isEmpty()) {
-			datasetIdentifiers = Collections.emptyList();
-		} else {
-			startId = 0;
-			endId = Long.MAX_VALUE;
-			datasetIdentifiers = List.of(datasetIdentifierList.split(","));
-		}
-		if (endId < startId) {
-			return badRequest("Invalid Parameters: lastId must be equal to or greater than firstId");
-		}
-
-		NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
-		JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
-		JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
-
-		if (startId > 0) {
-			jsonObjectBuilder.add("firstId", startId);
-		}
-		if (endId < Long.MAX_VALUE) {
-			jsonObjectBuilder.add("lastId", endId);
-		}
-
-		// compile the list of ids to process
-		List<Long> datasetIds;
-		if (datasetIdentifiers.isEmpty()) {
-			datasetIds = datasetService.findAllLocalDatasetIds();
-		} else {
-			datasetIds = new ArrayList<>(datasetIdentifiers.size());
-			JsonArrayBuilder jab = Json.createArrayBuilder();
-			datasetIdentifiers.forEach(id -> {
-				String dId = id.trim();
-				jab.add(dId);
-				Dataset d = datasetService.findByGlobalId(dId);
-				if (d != null) {
-					datasetIds.add(d.getId());
-				} else {
-					NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-					job.add("datasetIdentifier",dId);
-					job.add("reason","Not Found");
-					jsonFailuresArrayBuilder.add(job);
-				}
-			});
-			jsonObjectBuilder.add("datasetIdentifierList", jab);
-		}
-
-		for (Long datasetId : datasetIds) {
-			if (datasetId < startId) {
-				continue;
-			} else if (datasetId > endId) {
-				break;
-			}
-			Dataset dataset;
-			try {
-				dataset = findDatasetOrDie(String.valueOf(datasetId));
-				datasetsChecked++;
-			} catch (WrappedResponse e) {
-				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-				job.add("datasetId", datasetId);
-				job.add("reason", e.getMessage());
-				jsonFailuresArrayBuilder.add(job);
-				continue;
-			}
-
-			List<String> missingFiles = new ArrayList<>();
-			List<String> missingFileMetadata = new ArrayList<>();
-			try {
-				Predicate<String> filter = s -> true;
-				StorageIO<DvObject> datasetIO = DataAccess.getStorageIO(dataset);
-				final List<String> result = datasetIO.cleanUp(filter, true);
-				// add files that are in dataset files but not in cleanup result or DataFiles with missing FileMetadata
-				dataset.getFiles().forEach(df -> {
-					try {
-						StorageIO<DataFile> datafileIO = df.getStorageIO();
-						String storageId = df.getStorageIdentifier();
-						FileMetadata fm = df.getFileMetadata();
-						if (!datafileIO.exists()) {
-							missingFiles.add(storageId + "," + (fm != null ?
-									(fm.getDirectoryLabel() != null || !fm.getDirectoryLabel().isEmpty() ? "directoryLabel,"+fm.getDirectoryLabel()+"," : "")
-											+"label,"+fm.getLabel() : "type,"+df.getContentType()));
-						}
-						if (fm == null) {
-							missingFileMetadata.add(storageId + ",dataFileId," + df.getId());
-						}
-					} catch (IOException e) {
-						NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-						job.add("dataFileId", df.getId());
-						job.add("reason", e.getMessage());
-						jsonFailuresArrayBuilder.add(job);
-					}
-				});
-			} catch (IOException e) {
-				NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
-				job.add("datasetId", datasetId);
-				job.add("reason", e.getMessage());
-				jsonFailuresArrayBuilder.add(job);
-			}
-
-			JsonObjectBuilder job = Json.createObjectBuilder();
-			if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
-				job.add("id", dataset.getId());
-				job.add("identifier", dataset.getIdentifier());
-				job.add("authority", dataset.getAuthority());
-				job.add("protocol", dataset.getProtocol());
-				job.add("persistentURL", dataset.getPersistentURL());
-				if (!missingFileMetadata.isEmpty()) {
-					JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();
-					missingFileMetadata.forEach(mm -> {
-						String[] missingMetadata = mm.split(",");
-						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
-								.add("storageIdentifier", missingMetadata[0])
-								.add(missingMetadata[1], missingMetadata[2]);
-						jabMissingFileMetadata.add(jobj);
-					});
-					job.add("missingFileMetadata", jabMissingFileMetadata);
-				}
-				if (!missingFiles.isEmpty()) {
-					JsonArrayBuilder jabMissingFiles = Json.createArrayBuilder();
-					missingFiles.forEach(mf -> {
-						String[] missingFile = mf.split(",");
-						NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
-								.add("storageIdentifier", missingFile[0]);
-						for (int i = 2; i < missingFile.length; i+=2) {
-							jobj.add(missingFile[i-1], missingFile[i]);
-						}
-						jabMissingFiles.add(jobj);
-				    });
-					job.add("missingFiles", jabMissingFiles);
-				}
-				jsonDatasetsArrayBuilder.add(job);
-			}
-		}
-
-		jsonObjectBuilder.add("datasetsChecked", datasetsChecked);
-		jsonObjectBuilder.add("datasets", jsonDatasetsArrayBuilder);
-		jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
-
-		return ok(jsonObjectBuilder);
-	}
+    @GET
+    @AuthRequired
+    @Path("/datafiles/auditFiles")
+    public Response getAuditFiles(@Context ContainerRequestContext crc,
+                                  @QueryParam("firstId") Long firstId, @QueryParam("lastId") Long lastId,
+                                  @QueryParam("datasetIdentifierList") String datasetIdentifierList) throws WrappedResponse {
+        try {
+            AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
+            if (!user.isSuperuser()) {
+                return error(Response.Status.FORBIDDEN, "Superusers only.");
+            }
+        } catch (WrappedResponse wr) {
+            return wr.getResponse();
+        }
+
+        int datasetsChecked = 0;
+        long startId = (firstId == null ? 0 : firstId);
+        long endId = (lastId == null ? Long.MAX_VALUE : lastId);
+
+        List<String> datasetIdentifiers;
+        if (datasetIdentifierList == null || datasetIdentifierList.isEmpty()) {
+            datasetIdentifiers = Collections.emptyList();
+        } else {
+            startId = 0;
+            endId = Long.MAX_VALUE;
+            datasetIdentifiers = List.of(datasetIdentifierList.split(","));
+        }
+        if (endId < startId) {
+            return badRequest("Invalid Parameters: lastId must be equal to or greater than firstId");
+        }
+
+        NullSafeJsonBuilder jsonObjectBuilder = NullSafeJsonBuilder.jsonObjectBuilder();
+        JsonArrayBuilder jsonDatasetsArrayBuilder = Json.createArrayBuilder();
+        JsonArrayBuilder jsonFailuresArrayBuilder = Json.createArrayBuilder();
+
+        if (startId > 0) {
+            jsonObjectBuilder.add("firstId", startId);
+        }
+        if (endId < Long.MAX_VALUE) {
+            jsonObjectBuilder.add("lastId", endId);
+        }
+
+        // compile the list of ids to process
+        List<Long> datasetIds;
+        if (datasetIdentifiers.isEmpty()) {
+            datasetIds = datasetService.findAllLocalDatasetIds();
+        } else {
+            datasetIds = new ArrayList<>(datasetIdentifiers.size());
+            JsonArrayBuilder jab = Json.createArrayBuilder();
+            datasetIdentifiers.forEach(id -> {
+                String dId = id.trim();
+                jab.add(dId);
+                Dataset d = datasetService.findByGlobalId(dId);
+                if (d != null) {
+                    datasetIds.add(d.getId());
+                } else {
+                    NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                    job.add("datasetIdentifier",dId);
+                    job.add("reason","Not Found");
+                    jsonFailuresArrayBuilder.add(job);
+                }
+            });
+            jsonObjectBuilder.add("datasetIdentifierList", jab);
+        }
+
+        for (Long datasetId : datasetIds) {
+            if (datasetId < startId) {
+                continue;
+            } else if (datasetId > endId) {
+                break;
+            }
+            Dataset dataset;
+            try {
+                dataset = findDatasetOrDie(String.valueOf(datasetId));
+                datasetsChecked++;
+            } catch (WrappedResponse e) {
+                NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                job.add("datasetId", datasetId);
+                job.add("reason", e.getMessage());
+                jsonFailuresArrayBuilder.add(job);
+                continue;
+            }
+
+            List<String> missingFiles = new ArrayList<>();
+            List<String> missingFileMetadata = new ArrayList<>();
+            try {
+                Predicate<String> filter = s -> true;
+                StorageIO<DvObject> datasetIO = DataAccess.getStorageIO(dataset);
+                final List<String> result = datasetIO.cleanUp(filter, true);
+                // add files that are in dataset files but not in cleanup result or DataFiles with missing FileMetadata
+                dataset.getFiles().forEach(df -> {
+                    try {
+                        StorageIO<DataFile> datafileIO = df.getStorageIO();
+                        String storageId = df.getStorageIdentifier();
+                        FileMetadata fm = df.getFileMetadata();
+                        if (!datafileIO.exists()) {
+                            missingFiles.add(storageId + "," + (fm != null ?
+                                    (fm.getDirectoryLabel() != null || !fm.getDirectoryLabel().isEmpty() ? "directoryLabel,"+fm.getDirectoryLabel()+"," : "")
+                                            +"label,"+fm.getLabel() : "type,"+df.getContentType()));
+                        }
+                        if (fm == null) {
+                            missingFileMetadata.add(storageId + ",dataFileId," + df.getId());
+                        }
+                    } catch (IOException e) {
+                        NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                        job.add("dataFileId", df.getId());
+                        job.add("reason", e.getMessage());
+                        jsonFailuresArrayBuilder.add(job);
+                    }
+                });
+            } catch (IOException e) {
+                NullSafeJsonBuilder job = NullSafeJsonBuilder.jsonObjectBuilder();
+                job.add("datasetId", datasetId);
+                job.add("reason", e.getMessage());
+                jsonFailuresArrayBuilder.add(job);
+            }
+
+            JsonObjectBuilder job = Json.createObjectBuilder();
+            if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
+                job.add("id", dataset.getId());
+                job.add("identifier", dataset.getIdentifier());
+                job.add("authority", dataset.getAuthority());
+                job.add("protocol", dataset.getProtocol());
+                job.add("persistentURL", dataset.getPersistentURL());
+                if (!missingFileMetadata.isEmpty()) {
+                    JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();
+                    missingFileMetadata.forEach(mm -> {
+                        String[] missingMetadata = mm.split(",");
+                        NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+                                .add("storageIdentifier", missingMetadata[0])
+                                .add(missingMetadata[1], missingMetadata[2]);
+                        jabMissingFileMetadata.add(jobj);
+                    });
+                    job.add("missingFileMetadata", jabMissingFileMetadata);
+                }
+                if (!missingFiles.isEmpty()) {
+                    JsonArrayBuilder jabMissingFiles = Json.createArrayBuilder();
+                    missingFiles.forEach(mf -> {
+                        String[] missingFile = mf.split(",");
+                        NullSafeJsonBuilder jobj = NullSafeJsonBuilder.jsonObjectBuilder()
+                                .add("storageIdentifier", missingFile[0]);
+                        for (int i = 2; i < missingFile.length; i+=2) {
+                            jobj.add(missingFile[i-1], missingFile[i]);
+                        }
+                        jabMissingFiles.add(jobj);
+                    });
+                    job.add("missingFiles", jabMissingFiles);
+                }
+                jsonDatasetsArrayBuilder.add(job);
+            }
+        }
+
+        jsonObjectBuilder.add("datasetsChecked", datasetsChecked);
+        jsonObjectBuilder.add("datasets", jsonDatasetsArrayBuilder);
+        jsonObjectBuilder.add("failures", jsonFailuresArrayBuilder);
+
+        return ok(jsonObjectBuilder);
+    }
 }

From 2db26b20f3d01895cfa4d0c5093ca1ce4b539be2 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:26:56 -0500
Subject: [PATCH 18/25] add pid

---
 doc/sphinx-guides/source/api/native-api.rst      | 16 ++++++----------
 .../java/edu/harvard/iq/dataverse/api/Admin.java |  4 +---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 84e8bf45d9d..9a5f469a4d0 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6226,17 +6226,15 @@ Sample JSON Audit Response::
           "firstId": 0,
           "lastId": 100,
           "datasetIdentifierList": [
-              "doi.org/10.5072/FK2/XXXXXX",
-              "doi.org/10.5072/FK2/JXYBJS",
-              "doi.org/10.7910/DVN/MPU019"
+              "doi:10.5072/FK2/XXXXXX",
+              "doi:10.5072/FK2/JXYBJS",
+              "doi:10.7910/DVN/MPU019"
           ],
           "datasetsChecked": 100,
           "datasets": [
                {
                   "id": 6,
-                  "identifier": "FK2/JXYBJS",
-                  "authority": "10.5072",
-                  "protocol": "doi",
+                  "pid": "doi:10.5072/FK2/JXYBJS",
                   "persistentURL": "https://doi.org/10.5072/FK2/JXYBJS",
                   "missingFileMetadata": [
                     {
@@ -6247,9 +6245,7 @@ Sample JSON Audit Response::
               },
               {
                   "id": 47731,
-                  "identifier": "DVN/MPU019",
-                  "authority": "10.7910",
-                  "protocol": "doi",
+                  "pid": "doi:10.5072/FK2/MPU019",
                   "persistentURL": "https://doi.org/10.7910/DVN/MPU019",
                   "missingFiles": [
                     {
@@ -6262,7 +6258,7 @@ Sample JSON Audit Response::
           ],
           "failures": [
               {
-                "datasetIdentifier": "doi.org/10.5072/FK2/XXXXXX",
+                "datasetIdentifier": "doi:10.5072/FK2/XXXXXX",
                 "reason": "Not Found"
               }
           ]
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
index 61f76c9928c..152bcf5066e 100644
--- a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+++ b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -2641,9 +2641,7 @@ public Response getAuditFiles(@Context ContainerRequestContext crc,
             JsonObjectBuilder job = Json.createObjectBuilder();
             if (!missingFiles.isEmpty() || !missingFileMetadata.isEmpty()) {
                 job.add("id", dataset.getId());
-                job.add("identifier", dataset.getIdentifier());
-                job.add("authority", dataset.getAuthority());
-                job.add("protocol", dataset.getProtocol());
+                job.add("pid", dataset.getProtocol() + ":" + dataset.getAuthority() + "/" + dataset.getIdentifier());
                 job.add("persistentURL", dataset.getPersistentURL());
                 if (!missingFileMetadata.isEmpty()) {
                     JsonArrayBuilder jabMissingFileMetadata = Json.createArrayBuilder();

From 2c5aca8e952b39fd1e1f7cfa99298303ca535799 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:30:50 -0500
Subject: [PATCH 19/25] fix typos

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 9a5f469a4d0..9d6871041fd 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6210,7 +6210,7 @@ Scans the Datasets in the database and verifies that the stored files exist. If
 
 Optional Parameters are available for filtering the Datasets scanned.
 
-For auditing the Datasets in a paged manor (firstId and lastId)::
+For auditing the Datasets in a paged manner (firstId and lastId)::
 
   curl "$SERVER_URL/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
 

From 3c67a7977fdaa862460e25208bb1bcb7a9c4a3c4 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:31:15 -0500
Subject: [PATCH 20/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index c697bc225c0..79391703041 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -5,7 +5,7 @@ The Datasets scanned can be limited by optional firstId and lastId query paramet
 Once the audit report is generated, a superuser can either delete the missing file(s) from the Dataset or contact the author to re-upload the missing file(s).
 
 The JSON response includes:
-- List of files in each DataFile where the file exists in the database but the physical file is not on the file store.
+- List of files in each DataFile where the file exists in the database but the physical file is not in the file store.
 - List of DataFiles where the FileMetadata is missing.
 - Other failures found when trying to process the Datasets
 

From 58d32357978ddbae7abe587e5645fbc52192e471 Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:31:24 -0500
Subject: [PATCH 21/25] Update doc/release-notes/220-harvard-edu-audit-files.md

Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
---
 doc/release-notes/220-harvard-edu-audit-files.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index 79391703041..002c8e85063 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -13,4 +13,4 @@ curl "http://localhost:8080/api/admin/datafiles/auditFiles
 curl "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
 curl "http://localhost:8080/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
 
-For more information, see issue [the docs](https://dataverse-guide--11016.org.readthedocs.build/en/11016/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)
+For more information, see [the docs](https://dataverse-guide--11016.org.readthedocs.build/en/11016/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)

From 50b752a0116d060de95b790a23a63840c90feb6c Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Wed, 20 Nov 2024 10:45:48 -0500
Subject: [PATCH 22/25] fix typos

---
 doc/sphinx-guides/source/api/native-api.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index 9d6871041fd..bfcbbb96f93 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6204,7 +6204,8 @@ Datafile Audit
 ~~~~~~~~~~~~~~
 
 Produce an audit report of missing files and FileMetadata for Datasets.
-Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing, this information is returned in a JSON response::
+Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing, this information is returned in a JSON response.
+The call will return a status code of 200 if the report was generated successfully.  Issues found will be documented in the report and will not return a failure status code unless the report could not be generated::
 
   curl "$SERVER_URL/api/admin/datafiles/auditFiles"
 

From a192c177da18469c411bf42cfa064fd719a38d4c Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:35:36 -0500
Subject: [PATCH 23/25] fix release note

---
 doc/release-notes/220-harvard-edu-audit-files.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/220-harvard-edu-audit-files.md b/doc/release-notes/220-harvard-edu-audit-files.md
index 002c8e85063..fc857e3a02b 100644
--- a/doc/release-notes/220-harvard-edu-audit-files.md
+++ b/doc/release-notes/220-harvard-edu-audit-files.md
@@ -9,8 +9,8 @@ The JSON response includes:
 - List of DataFiles where the FileMetadata is missing.
 - Other failures found when trying to process the Datasets
 
-curl "http://localhost:8080/api/admin/datafiles/auditFiles
-curl "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
-curl "http://localhost:8080/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q
+curl -H "X-Dataverse-key:$API_TOKEN" "http://localhost:8080/api/admin/datafiles/auditFiles"
+curl -H "X-Dataverse-key:$API_TOKEN" "http://localhost:8080/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
+curl -H "X-Dataverse-key:$API_TOKEN" "http://localhost:8080/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/RVNT9Q,doi:10.5072/FK2/RVNT9Q"
 
 For more information, see [the docs](https://dataverse-guide--11016.org.readthedocs.build/en/11016/api/native-api.html#datafile-audit), #11016, and [#220](https://github.com/IQSS/dataverse.harvard.edu/issues/220)

From e06e1d244f89df7ffa392712a2cbca3f5040dcdc Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:38:27 -0500
Subject: [PATCH 24/25] fix api doc

---
 doc/sphinx-guides/source/api/native-api.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index bfcbbb96f93..cedc71c27dc 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6207,17 +6207,17 @@ Produce an audit report of missing files and FileMetadata for Datasets.
 Scans the Datasets in the database and verifies that the stored files exist. If the files are missing or if the FileMetadata is missing, this information is returned in a JSON response.
 The call will return a status code of 200 if the report was generated successfully.  Issues found will be documented in the report and will not return a failure status code unless the report could not be generated::
 
-  curl "$SERVER_URL/api/admin/datafiles/auditFiles"
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles"
 
 Optional Parameters are available for filtering the Datasets scanned.
 
 For auditing the Datasets in a paged manner (firstId and lastId)::
 
-  curl "$SERVER_URL/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?firstId=0&lastId=1000"
 
 Auditing specific Datasets (comma separated list)::
 
-  curl "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019
 
 Sample JSON Audit Response::
 

From 8c79f6710a7f20f2fcc5e8e8c12a10263c44fafc Mon Sep 17 00:00:00 2001
From: Steven Winship <39765413+stevenwinship@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:38:59 -0500
Subject: [PATCH 25/25] fix api doc

---
 doc/sphinx-guides/source/api/native-api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx-guides/source/api/native-api.rst b/doc/sphinx-guides/source/api/native-api.rst
index cedc71c27dc..a24716f715b 100644
--- a/doc/sphinx-guides/source/api/native-api.rst
+++ b/doc/sphinx-guides/source/api/native-api.rst
@@ -6217,7 +6217,7 @@ For auditing the Datasets in a paged manner (firstId and lastId)::
 
 Auditing specific Datasets (comma separated list)::
 
-  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019
+  curl -H "X-Dataverse-key:$API_TOKEN" "$SERVER_URL/api/admin/datafiles/auditFiles?datasetIdentifierList=doi:10.5072/FK2/JXYBJS,doi:10.7910/DVN/MPU019"
 
 Sample JSON Audit Response::