Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
*/
public class BatchDeleteRequest
{
private String internalId;

private Set<String> paths;

private String filesystem;
Expand All @@ -42,11 +44,20 @@ public void setFilesystem(String filesystem) {
this.filesystem = filesystem;
}

public String getInternalId()
{
return internalId;
}

public void setInternalId( String internalId )
{
this.internalId = internalId;
}

@Override
public String toString() {
return "BatchDeleteRequest{" +
"paths=" + paths +
", filesystem='" + filesystem + '\'' +
'}';
public String toString()
{
return "BatchDeleteRequest{" + "internalId='" + internalId + '\'' + ", paths=" + paths + ", filesystem='"
+ filesystem + '\'' + '}';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@ public Response purgeFilesystem( final @PathParam( "filesystem" ) String filesys
description = "Cleanup done (some folders may have failed, see result object)." ) } )
@Consumes( APPLICATION_JSON )
@Produces( APPLICATION_JSON )
@DELETE
@POST
@Path( "folders/empty" )
public Response cleanupEmptyFolders( BatchDeleteRequest request )
{
logger.info( "Cleanup empty folders: filesystem={}, paths={}", request.getFilesystem(), request.getPaths() );
logger.info( "Cleanup empty folders, request: {}", request );
BatchDeleteResult result = controller.cleanupEmptyFolders( request.getFilesystem(), request.getPaths() );
return Response.ok(result).build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void testCleanupEmptyFolders_HttpLevel() {
.contentType(MediaType.APPLICATION_JSON)
.body(request)
.when()
.delete("/api/storage/maint/folders/empty")
.post("/api/storage/maint/folders/empty")
.then()
.statusCode(200)
.extract().as(BatchDeleteResult.class);
Expand Down