Skip to content

Commit c75403b

Browse files
committed
Remove redundant null checks for dataverse in storage driver endpoints
1 parent 2828602 commit c75403b

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,10 +2055,6 @@ public Response getStorageDriver(@Context ContainerRequestContext crc, @PathPara
20552055
@QueryParam("getEffective") Boolean getEffective) throws WrappedResponse {
20562056

20572057
Dataverse dataverse = findDataverseOrDie(id);
2058-
2059-
if (dataverse == null) {
2060-
return error(Response.Status.NOT_FOUND, "Could not find dataverse based on the identifier supplied: " + id + ".");
2061-
}
20622058

20632059
return response(req -> {
20642060
String storageDriver = execCommand(new GetDataverseStorageDriverCommand(req, dataverse, getEffective));
@@ -2072,9 +2068,7 @@ public Response getStorageDriver(@Context ContainerRequestContext crc, @PathPara
20722068
public Response setStorageDriver(@Context ContainerRequestContext crc,
20732069
@PathParam("identifier") String id, String label) throws WrappedResponse {
20742070
Dataverse dataverse = findDataverseOrDie(id);
2075-
if (dataverse == null) {
2076-
return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + id + ".");
2077-
}
2071+
20782072
try {
20792073
AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
20802074
if (!user.isSuperuser()) {
@@ -2099,10 +2093,6 @@ public Response setStorageDriver(@Context ContainerRequestContext crc,
20992093
public Response resetStorageDriver(@Context ContainerRequestContext crc, @PathParam("identifier") String id) throws WrappedResponse {
21002094

21012095
Dataverse dataverse = findDataverseOrDie(id);
2102-
if (dataverse == null) {
2103-
return error(Response.Status.NOT_FOUND, "Could not find dataverse based on alias supplied: " + id + ".");
2104-
}
2105-
21062096
try {
21072097
AuthenticatedUser user = getRequestAuthenticatedUserOrDie(crc);
21082098
if (!user.isSuperuser()) {
@@ -2123,7 +2113,6 @@ public Response listStorageDrivers(@Context ContainerRequestContext crc, @PathPa
21232113

21242114
Dataverse dv = findDataverseOrDie(id);
21252115

2126-
21272116
/*
21282117
* TODO: This endpoint ad GetDataverseAllowedStorageDriverCommand needs to be completed,
21292118
* currently it mocks things that will be required to model the behavior requested by Jim Myers,

0 commit comments

Comments
 (0)