Apply conventions to IssueDao

5 files changed, 6 insertions, 6 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
index 43db7373616..291f5ccf08b 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
@@ -289,7 +289,7 @@ public class IssueService {
   IssueDto getByKeyForUpdate(DbSession session, String key) {
     // Load from index to check permission : if the user has no permission to see the issue an exception will be generated
     Issue authorizedIssueIndex = getByKey(key);
-    return dbClient.issueDao().selectByKey(session, authorizedIssueIndex.key());
+    return dbClient.issueDao().selectByKeyOrFail(session, authorizedIssueIndex.key());
   }
 
   void saveIssue(DbSession session, DefaultIssue issue, IssueChangeContext context, @Nullable String comment) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java
index 99a2ff07088..f8e5ea995c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/actionplan/ActionPlanService.java
@@ -113,7 +113,7 @@ public class ActionPlanService {
   private List<IssueDto> findIssuesByActionPlan(String actionPlanKey) {
     DbSession session = dbClient.openSession(false);
     try {
-      return dbClient.issueDao().findByActionPlan(session, actionPlanKey);
+      return dbClient.issueDao().selectByActionPlan(session, actionPlanKey);
     } finally {
       session.close();
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java
index e052f12cd1b..b87c580a21d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/actionplan/ActionPlanServiceTest.java
@@ -162,7 +162,7 @@ public class ActionPlanServiceTest {
     when(resourceDao.selectResource(any(ResourceQuery.class))).thenReturn(new ResourceDto().setKey(projectKey).setId(1l));
 
     IssueDto issueDto = new IssueDto().setId(100L).setStatus(Issue.STATUS_OPEN).setRuleKey("squid", "s100").setIssueCreationDate(new Date());
-    when(issueDao.findByActionPlan(session, "ABCD")).thenReturn(newArrayList(issueDto));
+    when(issueDao.selectByActionPlan(session, "ABCD")).thenReturn(newArrayList(issueDto));
     when(issueUpdater.plan(any(DefaultIssue.class), eq((ActionPlan) null), any(IssueChangeContext.class))).thenReturn(true);
 
     ArgumentCaptor<DefaultIssue> captor = ArgumentCaptor.forClass(DefaultIssue.class);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
index 14c1f67d00e..efe9cb14bac 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java
@@ -150,7 +150,7 @@ public class BulkDeleteActionTest {
     assertThat(dbClient.snapshotDao().selectById(dbSession, snapshotId4)).isNull();
     assertThat(dbClient.snapshotDao().selectById(dbSession, snapshotId2)).isNotNull();
     assertThat(dbClient.issueDao().selectByKeys(dbSession, Arrays.asList("issue-key-1", "issue-key-3", "issue-key-4"))).isEmpty();
-    assertThat(dbClient.issueDao().selectByKey(dbSession, "issue-key-2")).isNotNull();
+    assertThat(dbClient.issueDao().selectByKeyOrFail(dbSession, "issue-key-2")).isNotNull();
   }
 
   @Test
diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
index f7d51ce48c1..a8ae4d057d8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java
@@ -150,8 +150,8 @@ public class DeleteActionTest {
     assertThat(dbClient.componentDao().selectOrFailByUuid(dbSession, "project-uuid-2")).isNotNull();
     assertThat(dbClient.snapshotDao().selectById(dbSession, snapshotId1)).isNull();
     assertThat(dbClient.snapshotDao().selectById(dbSession, snapshotId2)).isNotNull();
-    assertThat(dbClient.issueDao().selectNullableByKey(dbSession, "issue-key-1")).isNull();
-    assertThat(dbClient.issueDao().selectByKey(dbSession, "issue-key-2")).isNotNull();
+    assertThat(dbClient.issueDao().selectByKey(dbSession, "issue-key-1").isPresent()).isFalse();
+    assertThat(dbClient.issueDao().selectByKeyOrFail(dbSession, "issue-key-2")).isNotNull();
   }
 
   @Test