Rename ComponentDao methods according to new conventions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
index 39d64ce68edcc58e6575164591fb9ac4f0a7f91e..c9e21ccbb40b66192ae0cd00c6b5dbc68d6eae52 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/duplication/ws/DuplicationsParser.java
@@ -86,7 +86,7 @@ public class DuplicationsParser {
   private Duplication createDuplication(Map<String, ComponentDto> componentsByKey, String from, String size, String componentKey, DbSession session) {
     ComponentDto component = componentsByKey.get(componentKey);
     if (component == null) {
-      component = componentDao.selectNonNullByKey(session, componentKey);
+      component = componentDao.selectOrFailByKey(session, componentKey);
       componentsByKey.put(componentKey, component);
     }
     return new Duplication(component, Integer.valueOf(from), Integer.valueOf(size));

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java
index 7d539f65b8cfe177f8e20acab7c077dd12c1a732..f9947d7314dd6c557a4a7a82c1b079c0a2c4e4a5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ActionService.java
@@ -104,7 +104,7 @@ public class ActionService {
       }
 
       IssueChangeContext changeContext = IssueChangeContext.createUser(new Date(), userSession.getLogin());
-      Component project = dbClient.componentDao().selectNonNullByKey(session, issue.projectKey());
+      Component project = dbClient.componentDao().selectOrFailByKey(session, issue.projectKey());
       FunctionContext functionContext = new FunctionContext(issue, updater, changeContext, getProjectSettings(project));
       for (Function function : action.functions()) {
         function.execute(functionContext);

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 8af900a154ba60f3c1bd8c2343c1c2939206e735..43db7373616b19815eae4ce46ff9ac94f8848bf2 100644 (file)
--- 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
@@ -299,13 +299,13 @@ public class IssueService {
     }
     issueStorage.save(session, issue);
     Rule rule = getNullableRuleByKey(issue.ruleKey());
-    ComponentDto project = dbClient.componentDao().selectNonNullByKey(session, projectKey);
+    ComponentDto project = dbClient.componentDao().selectOrFailByKey(session, projectKey);
     notificationService.scheduleForSending(new IssueChangeNotification()
       .setIssue(issue)
       .setChangeAuthorLogin(context.login())
       .setRuleName(rule != null ? rule.getName() : null)
       .setProject(project.getKey(), project.name())
-      .setComponent(dbClient.componentDao().selectNonNullByKey(session, issue.componentKey()))
+      .setComponent(dbClient.componentDao().selectOrFailByKey(session, issue.componentKey()))
       .setComment(comment));
   }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java
index 19fbdc3c6a3a9f73be9222eb319c18f7988c7033..edf38a6c9660462a6f673a0d9520ba1c10c4a949 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ServerIssueStorage.java
@@ -64,10 +64,10 @@ public class ServerIssueStorage extends IssueStorage {
   }
 
   protected ComponentDto component(DbSession session, DefaultIssue issue) {
-    return getDbClient().componentDao().selectNonNullByKey(session, issue.componentKey());
+    return getDbClient().componentDao().selectOrFailByKey(session, issue.componentKey());
   }
 
   protected ComponentDto project(DbSession session, DefaultIssue issue) {
-    return getDbClient().componentDao().selectNonNullByKey(session, issue.projectKey());
+    return getDbClient().componentDao().selectOrFailByKey(session, issue.projectKey());
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
index ffc2b760acdf4d2671b555e471784be52f3c3e79..feac37274fa47a78ee5960a58f67db4464b8886a 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
@@ -117,7 +117,7 @@ public class ApplyPermissionsStepTest extends BaseStepTest {
     step.execute();
     dbSession.commit();
 
-    assertThat(dbClient.componentDao().selectNonNullByKey(dbSession, PROJECT_KEY).getAuthorizationUpdatedAt()).isNotNull();
+    assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, PROJECT_KEY).getAuthorizationUpdatedAt()).isNotNull();
     assertThat(dbClient.roleDao().selectGroupPermissions(dbSession, DefaultGroups.ANYONE, projectDto.getId())).containsOnly(UserRole.USER);
     List<SearchHit> issueAuthorizationHits = esTester.getDocuments(IssueIndexDefinition.INDEX, IssueIndexDefinition.TYPE_AUTHORIZATION);
     assertThat(issueAuthorizationHits).hasSize(1);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
index 992a5aea2b2fe8301615b63a2d719bf498740347..93e413acdf2f93929d1d2c03e782f17e2dd82a3b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java
@@ -73,17 +73,17 @@ public class DuplicationsParserTest {
     // Current file
     String key1 = "org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/utils/command/CommandExecutor.java";
     currentFile = ComponentTesting.newFileDto(project1).setId(10L).setKey(key1).setLongName("CommandExecutor");
-    when(componentDao.selectNonNullByKey(session, key1)).thenReturn(currentFile);
+    when(componentDao.selectOrFailByKey(session, key1)).thenReturn(currentFile);
 
     // File on same project
     String key2 = "org.codehaus.sonar:sonar-plugin-api:src/main/java/com/sonar/orchestrator/util/CommandExecutor.java";
     fileOnSameProject = ComponentTesting.newFileDto(project1).setId(11L).setKey(key2).setLongName("CommandExecutor");
-    when(componentDao.selectNonNullByKey(session, key2)).thenReturn(fileOnSameProject);
+    when(componentDao.selectOrFailByKey(session, key2)).thenReturn(fileOnSameProject);
 
     // File on different project
     String key3 = "com.sonarsource.orchestrator:sonar-orchestrator:src/main/java/com/sonar/orchestrator/util/CommandExecutor.java";
     fileOnDifferentProject = ComponentTesting.newFileDto(project2).setId(12L).setKey(key3).setLongName("CommandExecutor");
-    when(componentDao.selectNonNullByKey(session, key3)).thenReturn(fileOnDifferentProject);
+    when(componentDao.selectOrFailByKey(session, key3)).thenReturn(fileOnDifferentProject);
 
     parser = new DuplicationsParser(componentDao);
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java
index e61d6f7a947c14a0e77113c245c2f335b2d6456b..85f01b75a75c2e8201c05dc88d955a81ddceb873 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ActionServiceTest.java
@@ -98,7 +98,7 @@ public class ActionServiceTest {
     Function function1 = mock(Function.class);
     Function function2 = mock(Function.class);
 
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     actions.add("link-to-jira").setConditions(new AlwaysMatch()).setFunctions(function1, function2);
@@ -117,7 +117,7 @@ public class ActionServiceTest {
     UserSession userSession = mock(ThreadLocalUserSession.class);
     when(userSession.getLogin()).thenReturn("arthur");
 
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     actions.add("link-to-jira").setConditions(new AlwaysMatch()).setFunctions(function);
@@ -134,7 +134,7 @@ public class ActionServiceTest {
     UserSession userSession = mock(ThreadLocalUserSession.class);
     when(userSession.getLogin()).thenReturn("arthur");
 
-    when(componentDao.selectNonNullByKey(session, "struts")).thenReturn(new ComponentDto().setKey("struts"));
+    when(componentDao.selectOrFailByKey(session, "struts")).thenReturn(new ComponentDto().setKey("struts"));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue.setProjectKey("struts"));
 
     actions.add("link-to-jira").setConditions(new AlwaysMatch()).setFunctions(function);
@@ -147,7 +147,7 @@ public class ActionServiceTest {
   public void not_execute_function_if_action_not_found() {
     Function function = mock(Function.class);
 
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     actions.add("link-to-jira").setConditions(new AlwaysMatch()).setFunctions(function);
@@ -164,7 +164,7 @@ public class ActionServiceTest {
   public void not_execute_function_if_action_is_not_supported() {
     Function function = mock(Function.class);
 
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     actions.add("link-to-jira").setConditions(new NeverMatch()).setFunctions(function);
@@ -179,7 +179,7 @@ public class ActionServiceTest {
 
   @Test
   public void list_available_supported_actions() {
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     actions.add("link-to-jira").setConditions(new AlwaysMatch());
@@ -189,7 +189,7 @@ public class ActionServiceTest {
 
   @Test
   public void return_no_action() {
-    when(componentDao.selectNonNullByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
+    when(componentDao.selectOrFailByKey(eq(session), anyString())).thenReturn(mock(ComponentDto.class));
     when(issueService.getByKeyForUpdate(session, "ABCD")).thenReturn(issue);
 
     assertThat(actionService.listAvailableActions("ABCD")).isEmpty();

diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index eccbc11f9d965d4b5fd08c2b0cd312cf567c4c82..d2199aee6473c839d98b656d10460be8f2dc962f 100644 (file)
--- a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -135,14 +135,14 @@ public class ComponentDaoTest {
 
     db.prepareDbUnit(getClass(), "shared.xml");
 
-    underTest.selectNonNullByKey(db.getSession(), "unknown");
+    underTest.selectOrFailByKey(db.getSession(), "unknown");
   }
 
   @Test
   public void get_by_key_on_disabled_component() {
     db.prepareDbUnit(getClass(), "shared.xml");
 
-    ComponentDto result = underTest.selectNonNullByKey(db.getSession(), "org.disabled.project");
+    ComponentDto result = underTest.selectOrFailByKey(db.getSession(), "org.disabled.project");
     assertThat(result.isEnabled()).isFalse();
   }
 
@@ -150,7 +150,7 @@ public class ComponentDaoTest {
   public void get_by_key_on_a_root_project() {
     db.prepareDbUnit(getClass(), "shared.xml");
 
-    ComponentDto result = underTest.selectNonNullByKey(db.getSession(), "org.struts:struts");
+    ComponentDto result = underTest.selectOrFailByKey(db.getSession(), "org.struts:struts");
     assertThat(result.key()).isEqualTo("org.struts:struts");
     assertThat(result.deprecatedKey()).isEqualTo("org.struts:struts");
     assertThat(result.path()).isNull();