diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-17 22:56:32 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-17 22:56:32 +0100 |
commit | 20f0391fc5cc5e87f96f838767bed8b4d707928d (patch) | |
tree | a96a11db8d57845ca6b5534453a5a2f9d5c6daa7 /src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java | |
parent | 4e75fdc85ff2a9e04d1820a3a2f8dc62e431295b (diff) | |
download | esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.gz esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.bz2 esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.xz esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.zip |
o Adding "jenkins_users" to the JSON representation of a person.
o Showing the avatar on the person page too.
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java index e95b7fa..9a69a75 100755 --- a/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java +++ b/src/main/java/io/trygvis/esper/testing/web/resource/CoreResource.java @@ -35,11 +35,6 @@ public class CoreResource extends AbstractResource { @Path("/person") public List<PersonDetailJson> getPersons(@MagicParam final PageRequest pageRequest, @QueryParam("query") final String query) throws Exception { - - int sleep = 1; - System.out.println("Awesome"); - Thread.sleep(sleep * 1000); - return da.inTransaction(new CoreDaosCallback<List<PersonDetailJson>>() { protected List<PersonDetailJson> run() throws SQLException { List<PersonDetailJson> list = new ArrayList<>(); @@ -190,11 +185,13 @@ public class CoreResource extends AbstractResource { badgesInProgress.add(getBadge(progress)); } + List<UUID> jenkinsUserUuid = daos.personDao.selectJenkinsUserUuidsByPerson(person.uuid); + return new PersonDetailJson( getPersonJson.apply(person), badges, - badgesInProgress - ); + badgesInProgress, + jenkinsUserUuid); } }; |