Skip to content

Commit 4ca3f33

Browse files
committed
change defaultToOwner to getEffective
1 parent b88796c commit 4ca3f33

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

doc/release-notes/11695-change-api-get-storage-driver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ The API for getting the Storage Driver info has been changed/extended.
77
/api/admin/dataverse/{dataverse-alias}/storageDriver
88
changed "message" to "name" and added "type" and "label"
99

10-
Also added query param for /api/admin/dataverse/{dataverse-alias}/storageDriver?defaultToOwner=true to recurse the chain of parents to find the effective storageDriver
10+
Also added query param for /api/admin/dataverse/{dataverse-alias}/storageDriver?getEffective=true to recurse the chain of parents to find the effective storageDriver
1111

1212
See also [the guides](https://dataverse-guide--11664.org.readthedocs.build/en/11664/api/native-api.html#configure-a-dataset-to-store-all-new-files-in-a-specific-file-store), #11695, and #11664.

doc/sphinx-guides/source/admin/dataverses-datasets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The current driver can be seen using::
6262

6363
Or to recurse the chain of parents to find the effective storageDriver::
6464

65-
curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver?defaultToOwner=true
65+
curl -H "X-Dataverse-key: $API_TOKEN" http://$SERVER/api/admin/dataverse/$dataverse-alias/storageDriver?getEffective=true
6666

6767
(Note that for ``dataverse.files.store1.label=MyLabel``, ``store1`` will be returned.)
6868

src/main/java/edu/harvard/iq/dataverse/api/Admin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ public Response addRoleAssignementsToChildren(@Context ContainerRequestContext c
21842184
@AuthRequired
21852185
@Path("/dataverse/{alias}/storageDriver")
21862186
public Response getStorageDriver(@Context ContainerRequestContext crc, @PathParam("alias") String alias,
2187-
@QueryParam("defaultToOwner") Boolean defaultToOwner) throws WrappedResponse {
2187+
@QueryParam("getEffective") Boolean getEffective) throws WrappedResponse {
21882188
Dataverse dataverse = dataverseSvc.findByAlias(alias);
21892189
if (dataverse == null) {
21902190
return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + alias + ".");
@@ -2198,7 +2198,7 @@ public Response getStorageDriver(@Context ContainerRequestContext crc, @PathPara
21982198
return wr.getResponse();
21992199
}
22002200

2201-
if (defaultToOwner != null && defaultToOwner) {
2201+
if (getEffective != null && getEffective) {
22022202
return ok(JsonPrinter.jsonStorageDriver(dataverse.getEffectiveStorageDriverId(), null));
22032203
} else {
22042204
return ok(JsonPrinter.jsonStorageDriver(dataverse.getStorageDriverId(), null));

src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2913,8 +2913,8 @@ static Response listStorageDrivers(String apiToken) {
29132913
static Response getStorageDriver(String dvAlias, String apiToken) {
29142914
return getStorageDriver(dvAlias, apiToken, null);
29152915
}
2916-
static Response getStorageDriver(String dvAlias, String apiToken, Boolean defaultToOwner) {
2917-
String params = defaultToOwner != null ? "?defaultToOwner=" + defaultToOwner : "";
2916+
static Response getStorageDriver(String dvAlias, String apiToken, Boolean getEffective) {
2917+
String params = getEffective != null ? "?getEffective=" + getEffective : "";
29182918
return given()
29192919
.header(API_TOKEN_HTTP_HEADER, apiToken)
29202920
.get("/api/admin/dataverse/" + dvAlias + "/storageDriver" + params);

0 commit comments

Comments
 (0)