From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Mon, 3 Oct 2016 16:31:21 +0000 (+0200)
Subject: SONAR-8134 change signature of GroupDao#selectByName()
X-Git-Tag: 6.2-RC1~452
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0870706bd681026b1d1c7b01f912c825c9409468;p=sonarqube.git

SONAR-8134 change signature of GroupDao#selectByName()
---

diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java
index 385ecd7a226..34ddd528c46 100644
--- a/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/GroupDao.java
@@ -68,12 +68,12 @@ public class GroupDao implements Dao {
 
   /**
    * @param dbSession
-   * @param organizationKey non-null key of organization (no support of "default" organization)
+   * @param organizationUuid non-null UUID of organization (no support of "default" organization)
    * @param name non-null group name
    * @return the group with the given organization key and name
    */
-  public Optional<GroupDto> selectByName(DbSession dbSession, String organizationKey, String name) {
-    return Optional.ofNullable(mapper(dbSession).selectByName(organizationKey,name));
+  public Optional<GroupDto> selectByName(DbSession dbSession, String organizationUuid, String name) {
+    return Optional.ofNullable(mapper(dbSession).selectByName(organizationUuid, name));
   }
 
   /**
diff --git a/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java
index 95536546842..b0090796def 100644
--- a/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java
+++ b/sonar-db/src/main/java/org/sonar/db/user/GroupMapper.java
@@ -47,5 +47,5 @@ public interface GroupMapper {
   void deleteById(long groupId);
 
   @CheckForNull
-  GroupDto selectByName(@Param("organizationKey") String organizationKey, @Param("name")String name);
+  GroupDto selectByName(@Param("organizationUuid") String organizationUuid, @Param("name")String name);
 }
diff --git a/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml
index 8ea087c27c7..c36161d25c5 100644
--- a/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml
+++ b/sonar-db/src/main/resources/org/sonar/db/user/GroupMapper.xml
@@ -17,17 +17,14 @@
     select
     <include refid="groupColumns"/>
     from groups g
-    inner join organizations o on o.uuid = g.organization_uuid
-    where o.kee = #{organizationKey} and g.name = #{name}
+    where g.organization_uuid = #{organizationUuid} and g.name = #{name}
   </select>
 
   <select id="selectByKey" parameterType="string" resultType="Group">
     SELECT
     <include refid="groupColumns"/>
     FROM groups g
-    <where>
-      g.name=#{id}
-    </where>
+    where g.name=#{id}
   </select>
 
   <select id="selectById" parameterType="long" resultType="Group">
diff --git a/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java b/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java
index a2fcd979bd3..b516e118159 100644
--- a/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/user/GroupDaoTest.java
@@ -70,7 +70,7 @@ public class GroupDaoTest {
   public void selectByName() {
     db.getDbClient().groupDao().insert(dbSession, aGroup);
 
-    GroupDto group = underTest.selectByName(dbSession, AN_ORGANIZATION.getKey(), aGroup.getName()).get();
+    GroupDto group = underTest.selectByName(dbSession, AN_ORGANIZATION.getUuid(), aGroup.getName()).get();
 
     assertThat(group.getId()).isNotNull();
     assertThat(group.getOrganizationUuid()).isEqualTo(aGroup.getOrganizationUuid());
@@ -82,7 +82,7 @@ public class GroupDaoTest {
 
   @Test
   public void selectByName_returns_absent() {
-    Optional<GroupDto> group = underTest.selectByName(dbSession, AN_ORGANIZATION.getKey(), "missing");
+    Optional<GroupDto> group = underTest.selectByName(dbSession, AN_ORGANIZATION.getUuid(), "missing");
 
     assertThat(group).isNotPresent();
   }