diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 23:39:51 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 23:39:51 +0100 |
commit | e0433a61af4e1b9796cee8f095486fec85eb136f (patch) | |
tree | e7ba14d6da8ef93100a4b5b0c8b2c0d4031bd9be /src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java | |
parent | b83c4eed1a75e9e68279ab6f84cd7b5eb602abec (diff) | |
download | esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.gz esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.bz2 esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.tar.xz esper-testing-e0433a61af4e1b9796cee8f095486fec85eb136f.zip |
NavbarService:
o Renamed to NavTabService.
o Listing builds per server, with paging.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java b/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java index 450463b..e36952c 100755 --- a/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java +++ b/src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java @@ -93,14 +93,26 @@ public class JenkinsResource extends AbstractResource { @GET @Path("/build") @Produces(MediaType.APPLICATION_JSON) - public List<JenkinsBuildJson> getBuilds(@MagicParam(query = "job") final UUID job, @MagicParam final PageRequest page) throws Exception { + public List<JenkinsBuildJson> getBuilds(@MagicParam(query = "job") final UUID job, + @MagicParam(query = "server") final UUID server, + @MagicParam final PageRequest page) throws Exception { return da.inTransaction(new JenkinsDaosCallback<List<JenkinsBuildJson>>() { protected List<JenkinsBuildJson> run() throws SQLException { - List<JenkinsBuildJson> builds = new ArrayList<>(); + List<JenkinsBuildDto> daos; + if(job != null) { - for (JenkinsBuildDto dto : daos.jenkinsDao.selectBuildByJob(job, page)) { - builds.add(getJenkinsBuildJson.apply(dto)); - } + daos = this.daos.jenkinsDao.selectBuildByJob(job, page); + } + else if(server != null) { + daos = this.daos.jenkinsDao.selectBuildByServer(server, page); + } + else { + throw new WebApplicationException(Response.Status.BAD_REQUEST); + } + + List<JenkinsBuildJson> builds = new ArrayList<>(); + for (JenkinsBuildDto dto : daos) { + builds.add(getJenkinsBuildJson.apply(dto)); } return builds; } |