REST call to get activities on an adjunct#836
Conversation
935c743 to
d1ab00c
Compare
Conflict - tweaks to AdjunctResource, easily resolved
|
By the way, I don't entirely trust merge commits inside a pull request. It has seemed to me previously that I know that you have quite a sophisticated way of using git branches and merges locally, but when it reaches the PR stage is it not possible to just have it rebased against master such that it appears as a series of normal commits on top of brooklyn-server master? |
| @ApiParam(value = "Application ID or name", required = true) @PathParam("application") String applicationId, | ||
| @ApiParam(value = "Entity ID or name", required = true) @PathParam("entity") String entityId, | ||
| @ApiParam(value = "Adjunct ID or name", required = true) @PathParam("adjunct") String adjunctToken, | ||
| @ApiParam(value = "Max number of tasks, or -1 for all (default 200)", required = false) |
There was a problem hiding this comment.
I'm not a fan of -1 for all. But it's already used in EntityApi.listTasks so I'll live with it.
There was a problem hiding this comment.
yes for me it is simply "least bad"
|
@aledsage the one thing i find with merges is that it's a bit difficult to see changes made to resolve conflicts as part of the merge commit. i always forget the exact command but manage to find it. however it keeps much better history, e.g. it's usually prettier but even here not hard to see more impressive is: making it super easy to see. and bear in mind this at one point built on 3 other branches. if i'd ever rebased this or any of those branches, the ability to reconcile changes would be gone. with |
A single small commit to get via REST the activities related to an adjunct, and descendant tasks.
This depends on #821 and #835 -- where most of the prep work is done -- but once those are in the only changes should be those in d1ab00c .