diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 22:52:09 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-22 22:52:09 +0100 |
commit | b83c4eed1a75e9e68279ab6f84cd7b5eb602abec (patch) | |
tree | 0a1a24ba310fa53e793db3bb298536a81b01f3c3 /src/main/java/io/trygvis/esper/testing/web/resource/JenkinsResource.java | |
parent | 498fd62e043e31bf5beddfff0e9b5f7f889b884c (diff) | |
download | esper-testing-b83c4eed1a75e9e68279ab6f84cd7b5eb602abec.tar.gz esper-testing-b83c4eed1a75e9e68279ab6f84cd7b5eb602abec.tar.bz2 esper-testing-b83c4eed1a75e9e68279ab6f84cd7b5eb602abec.tar.xz esper-testing-b83c4eed1a75e9e68279ab6f84cd7b5eb602abec.zip |
NavbarService:
o Storing the current tab with $location.search.
JenkinsApp:
o Implementing job search.
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 | 17 |
1 files changed, 15 insertions, 2 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 fd8ea91..450463b 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 @@ -16,6 +16,9 @@ import java.util.List; import javax.ws.rs.*; import javax.ws.rs.core.*; +import static fj.data.Option.fromNull; +import static org.apache.commons.lang.StringUtils.trimToNull; + @Path("/resource/jenkins") public class JenkinsResource extends AbstractResource { @@ -54,11 +57,21 @@ public class JenkinsResource extends AbstractResource { @GET @Path("/job") @Produces(MediaType.APPLICATION_JSON) - public List<JenkinsJobJson> getJobs(@MagicParam(query = "server") final UUID server, @MagicParam final PageRequest page) throws Exception { + public List<JenkinsJobJson> getJobs(@MagicParam(query = "server") final UUID server, + @MagicParam final PageRequest page, + @QueryParam("query") final String query) throws Exception { + if (server == null) { + throw new WebApplicationException(Response.Status.BAD_REQUEST); + } + return da.inTransaction(new JenkinsDaosCallback<List<JenkinsJobJson>>() { protected List<JenkinsJobJson> run() throws SQLException { + List<JenkinsJobDto> dtos; + + dtos = daos.jenkinsDao.selectJobsByServer(server, page, fromNull(trimToNull(query))); + List<JenkinsJobJson> jobs = new ArrayList<>(); - for (JenkinsJobDto job : daos.jenkinsDao.selectJobsByServer(server, page)) { + for (JenkinsJobDto job : dtos) { jobs.add(getJenkinsJobJson.apply(job)); } return jobs; |