Add method findById to UserFinder and make it available as BatchComponent

2 files changed, 22 insertions, 2 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/components/DefaultUserFinder.java b/sonar-core/src/main/java/org/sonar/core/components/DefaultUserFinder.java
index 648aa104fb5..0545b9bc93d 100644
--- a/sonar-core/src/main/java/org/sonar/core/components/DefaultUserFinder.java
+++ b/sonar-core/src/main/java/org/sonar/core/components/DefaultUserFinder.java
@@ -35,6 +35,11 @@ public class DefaultUserFinder implements UserFinder {
     this.sessionFactory = sessionFactory;
   }
 
+  public User findById(int id) {
+    DatabaseSession session = sessionFactory.getSession();
+    return session.getSingleResult(User.class, "id", id);
+  }
+
   public User findByLogin(String login) {
     DatabaseSession session = sessionFactory.getSession();
     return session.getSingleResult(User.class, "login", login);
diff --git a/sonar-core/src/test/java/org/sonar/core/components/DefaultUserFinderTest.java b/sonar-core/src/test/java/org/sonar/core/components/DefaultUserFinderTest.java
index a944e3ae193..16a6275d224 100644
--- a/sonar-core/src/test/java/org/sonar/core/components/DefaultUserFinderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/components/DefaultUserFinderTest.java
@@ -52,11 +52,26 @@ public class DefaultUserFinderTest extends AbstractDbUnitTestCase {
     assertThat(user.getLogin(), is("godin"));
     assertThat(user.getName(), is("Evgeny Mandrikov"));
     assertThat(user.getEmail(), is("evgeny.mandrikov@sonarsource.com"));
+
+    user = userFinder.findByLogin("user");
+    assertThat(user, nullValue());
   }
 
   @Test
-  public void userNotExists() {
-    User user = userFinder.findByLogin("user");
+  public void shouldFindUserById() {
+    User user = userFinder.findById(1);
+    assertThat(user.getId(), is(1));
+    assertThat(user.getLogin(), is("simon"));
+    assertThat(user.getName(), is("Simon Brandhof"));
+    assertThat(user.getEmail(), is("simon.brandhof@sonarsource.com"));
+
+    user = userFinder.findById(2);
+    assertThat(user.getId(), is(2));
+    assertThat(user.getLogin(), is("godin"));
+    assertThat(user.getName(), is("Evgeny Mandrikov"));
+    assertThat(user.getEmail(), is("evgeny.mandrikov@sonarsource.com"));
+
+    user = userFinder.findById(3);
     assertThat(user, nullValue());
   }