SONAR-6236 Remove BaseDao from DashboardDao

diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java
index df5efdf9d7b82e337979fe65535b55ddd5704f57..3869ffb3b87d61660fed6f5a62a46f5f260580f7 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/db/DashboardDao.java
@@ -19,23 +19,18 @@
  */
 package org.sonar.server.dashboard.db;
 
-import org.sonar.api.utils.System2;
 import org.sonar.core.dashboard.DashboardDto;
 import org.sonar.core.dashboard.DashboardMapper;
+import org.sonar.core.persistence.DaoComponent;
 import org.sonar.core.persistence.DbSession;
-import org.sonar.server.db.BaseDao;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
-public class DashboardDao extends BaseDao<DashboardMapper, DashboardDto, Long> {
+public class DashboardDao implements DaoComponent {
 
-  public DashboardDao(System2 system2) {
-    super(DashboardMapper.class, system2);
-  }
-
-  @Override
-  protected DashboardDto doGetNullableByKey(DbSession session, Long key) {
+  @CheckForNull
+  public DashboardDto getNullableByKey(DbSession session, Long key) {
     return mapper(session).selectById(key);
   }
 
@@ -47,4 +42,9 @@ public class DashboardDao extends BaseDao<DashboardMapper, DashboardDto, Long> {
   public DashboardDto getAllowedByKey(DbSession session, Long key, @Nullable Long userId) {
     return mapper(session).selectAllowedById(key, userId != null ? userId : -1L);
   }
+
+  private DashboardMapper mapper(DbSession session) {
+    return session.getMapper(DashboardMapper.class);
+  }
+
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java
index 2f3f0ee7612ca5e67f0df2d4a0b2fe95a5bf2c67..39f93d8888d9bf4990ed3e5811a3c26e1bf5221f 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RenameIssueWidgetsTest.java
@@ -75,7 +75,7 @@ public class RenameIssueWidgetsTest {
         new WidgetPropertyDao(dbTester.myBatis()),
         new IssueFilterDao(dbTester.myBatis()),
         new LoadedTemplateDao(dbTester.myBatis()),
-        new DashboardDao(system2)
+        new DashboardDao()
       ),
       system2,
       null);