Skip to content

Commit ccb5cc8

Browse files
committed
Change maint/folders/empty api from DELETE to POST
1 parent 6e09f5c commit ccb5cc8

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

src/main/java/org/commonjava/service/storage/dto/BatchDeleteRequest.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
*/
2323
public class BatchDeleteRequest
2424
{
25+
private String internalId;
26+
2527
private Set<String> paths;
2628

2729
private String filesystem;
@@ -42,11 +44,20 @@ public void setFilesystem(String filesystem) {
4244
this.filesystem = filesystem;
4345
}
4446

47+
public String getInternalId()
48+
{
49+
return internalId;
50+
}
51+
52+
public void setInternalId( String internalId )
53+
{
54+
this.internalId = internalId;
55+
}
56+
4557
@Override
46-
public String toString() {
47-
return "BatchDeleteRequest{" +
48-
"paths=" + paths +
49-
", filesystem='" + filesystem + '\'' +
50-
'}';
58+
public String toString()
59+
{
60+
return "BatchDeleteRequest{" + "internalId='" + internalId + '\'' + ", paths=" + paths + ", filesystem='"
61+
+ filesystem + '\'' + '}';
5162
}
5263
}

src/main/java/org/commonjava/service/storage/jaxrs/StorageMaintResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ public Response purgeFilesystem( final @PathParam( "filesystem" ) String filesys
109109
description = "Cleanup done (some folders may have failed, see result object)." ) } )
110110
@Consumes( APPLICATION_JSON )
111111
@Produces( APPLICATION_JSON )
112-
@DELETE
112+
@POST
113113
@Path( "folders/empty" )
114114
public Response cleanupEmptyFolders( BatchDeleteRequest request )
115115
{
116-
logger.info( "Cleanup empty folders: filesystem={}, paths={}", request.getFilesystem(), request.getPaths() );
116+
logger.info( "Cleanup empty folders, request: {}", request );
117117
BatchDeleteResult result = controller.cleanupEmptyFolders( request.getFilesystem(), request.getPaths() );
118118
return Response.ok(result).build();
119119
}

src/test/java/org/commonjava/service/storage/StorageMaintResourceIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testCleanupEmptyFolders_HttpLevel() {
9393
.contentType(MediaType.APPLICATION_JSON)
9494
.body(request)
9595
.when()
96-
.delete("/api/storage/maint/folders/empty")
96+
.post("/api/storage/maint/folders/empty")
9797
.then()
9898
.statusCode(200)
9999
.extract().as(BatchDeleteResult.class);

0 commit comments

Comments
 (0)