Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

swagger fix

Browse Source
This commit is contained in:
Athou
2013-07-08 07:17:55 +02:00
parent c6ebadcb0f
commit e3adc676df
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -268,10 +268,10 @@ public class AdminREST extends AbstractResourceREST {
return Response.ok(map).build(); return Response.ok(map).build();
} }
@Path("cleanup/merge") @Path("/cleanup/merge")
@POST @POST
@ApiOperation(value = "Merge feeds", notes = "Merge feeds together") @ApiOperation(value = "Merge feeds", notes = "Merge feeds together")
public Response mergeFeeds(FeedMergeRequest request) { public Response mergeFeeds(@ApiParam(required = true) FeedMergeRequest request) {
Feed into = feedDAO.findById(request.getIntoFeedId()); Feed into = feedDAO.findById(request.getIntoFeedId());
List<Feed> feeds = Lists.newArrayList(); List<Feed> feeds = Lists.newArrayList();