SONAR-6471 Remove BaseDao from GroupDao

SonarSource · May 22, 2015 · e1712a8 · e1712a8
1 parent b15cb8e
commit e1712a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
@@ -312,7 +312,7 @@ public boolean apply(@Nullable GroupDto input) {
         return input != null && input.getKey().equals(defaultGroup);
       }
     })) {
-      GroupDto groupDto = dbClient.groupDao().getByKey(dbSession, defaultGroup);
+      GroupDto groupDto = dbClient.groupDao().selectByKey(dbSession, defaultGroup);
       dbClient.userGroupDao().insert(dbSession, new UserGroupDto().setUserId(userDto.getId()).setGroupId(groupDto.getId()));
     }
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java b/server/sonar-server/src/main/java/org/sonar/server/user/db/GroupDao.java
@@ -21,29 +21,33 @@
 package org.sonar.server.user.db;
 
 import org.sonar.api.utils.System2;
+import org.sonar.core.persistence.DaoComponent;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.user.GroupDto;
 import org.sonar.core.user.GroupMapper;
-import org.sonar.server.db.BaseDao;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * @since 3.2
  */
-public class GroupDao extends BaseDao<GroupMapper, GroupDto, String> {
+public class GroupDao implements DaoComponent {
+
+  private System2 system;
 
   public GroupDao(System2 system) {
-    super(GroupMapper.class, system);
+    this.system = system;
   }
 
-  @Override
+  public GroupDto selectByKey(DbSession session, String key) {
-  protected GroupDto doGetNullableByKey(DbSession session, String key) {
     return mapper(session).selectByKey(key);
   }
 
-  @Override
+  public GroupDto insert(DbSession session, GroupDto item) {
-  protected GroupDto doInsert(DbSession session, GroupDto item) {
+    Date createdAt = new Date(system.now());
+    item.setCreatedAt(createdAt)
+      .setUpdatedAt(createdAt);
     mapper(session).insert(item);
     return item;
   }
@@ -52,4 +56,7 @@ public List<GroupDto> findByUserLogin(DbSession session, String login){
     return mapper(session).selectByUserLogin(login);
   }
 
+  private GroupMapper mapper(DbSession session) {
+    return session.getMapper(GroupMapper.class);
+  }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/db/GroupDaoTest.java
@@ -55,7 +55,7 @@ public void tearDown() {
   public void select_by_key() {
     setupData("select_by_key");
 
-    GroupDto group = new GroupDao(system2).getByKey(session, "sonar-users");
+    GroupDto group = new GroupDao(system2).selectByKey(session, "sonar-users");
     assertThat(group).isNotNull();
     assertThat(group.getId()).isEqualTo(1L);
     assertThat(group.getName()).isEqualTo("sonar-users");