Rename MetricDao methods following the new convention

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
index 7fb1fc44f99c700eead7939d71ef3523904550b2..a55b37b381a85a9cb477f22029b92ddec600aa1b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
@@ -159,7 +159,7 @@ public class CreateAction implements CustomMeasuresWsAction {
     checkArgument(metricId != null ^ metricKey != null, "The metric id or the metric key must be provided, not both.");
 
     if (metricId != null) {
-      return dbClient.metricDao().selectById(dbSession, metricId);
+      return dbClient.metricDao().selectOrFailById(dbSession, metricId);
     }
 
     return dbClient.metricDao().selectOrFailByKey(dbSession, metricKey);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
index b9c15ea2f093d6fc9a2053be248745e5152237b1..6fcaa248631084097a2df1cd490fc886b03d9d1d 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/UpdateAction.java
@@ -94,7 +94,7 @@ public class UpdateAction implements CustomMeasuresWsAction {
     DbSession dbSession = dbClient.openSession(true);
     try {
       CustomMeasureDto customMeasure = dbClient.customMeasureDao().selectOrFail(dbSession, id);
-      MetricDto metric = dbClient.metricDao().selectById(dbSession, customMeasure.getMetricId());
+      MetricDto metric = dbClient.metricDao().selectOrFailById(dbSession, customMeasure.getMetricId());
       ComponentDto component = dbClient.componentDao().selectOrFailByUuid(dbSession, customMeasure.getComponentUuid());
       checkPermissions(userSession, component);
       User user = userIndex.getByLogin(userSession.getLogin());

diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java b/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java
index e6eb24eb131fcfca6034b215f2db2e6a574d96c9..de2b0e5ce2a935fce476b6d9d887a082fc9c37e6 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/metric/DefaultMetricFinder.java
@@ -46,7 +46,7 @@ public class DefaultMetricFinder implements MetricFinder {
   public Metric findById(int id) {
     DbSession session = dbClient.openSession(false);
     try {
-      MetricDto dto = dbClient.metricDao().selectNullableById(session, id);
+      MetricDto dto = dbClient.metricDao().selectById(session, id);
       if (dto != null && dto.isEnabled()) {
         return ToMetric.INSTANCE.apply(dto);
       }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
index ce27a51a3b2f210a148ceff90c1a6f9676fc61f5..5ca92eca9dc31666f847fd66c64e9304d64544d0 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/UpdateAction.java
@@ -107,7 +107,7 @@ public class UpdateAction implements MetricsWsAction {
     DbSession dbSession = dbClient.openSession(false);
     try {
       MetricDto metricTemplate = newMetricTemplate(request);
-      MetricDto metricInDb = dbClient.metricDao().selectNullableById(dbSession, id);
+      MetricDto metricInDb = dbClient.metricDao().selectById(dbSession, id);
       checkMetricInDbAndTemplate(dbSession, metricInDb, metricTemplate);
 
       updateMetricInDb(dbSession, metricInDb, metricTemplate);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
index 0461721139dd4aae3c0f33c85deb8853021a6f36..0fb2442a85971c3066f2f100fc1a6dc3ba7a8df8 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/UpdateActionTest.java
@@ -101,7 +101,7 @@ public class UpdateActionTest {
       .execute();
     dbSession.commit();
 
-    MetricDto result = dbClient.metricDao().selectNullableById(dbSession, id);
+    MetricDto result = dbClient.metricDao().selectById(dbSession, id);
     assertThat(result.getKey()).isEqualTo("another-key");
     assertThat(result.getShortName()).isEqualTo("another-name");
     assertThat(result.getValueType()).isEqualTo(ValueType.BOOL.name());
@@ -121,7 +121,7 @@ public class UpdateActionTest {
       .execute();
     dbSession.commit();
 
-    MetricDto result = dbClient.metricDao().selectNullableById(dbSession, id);
+    MetricDto result = dbClient.metricDao().selectById(dbSession, id);
     assertThat(result.getKey()).isEqualTo(DEFAULT_KEY);
     assertThat(result.getShortName()).isEqualTo(DEFAULT_NAME);
     assertThat(result.getValueType()).isEqualTo(DEFAULT_TYPE);

diff --git a/sonar-db/src/main/java/org/sonar/db/metric/MetricDao.java b/sonar-db/src/main/java/org/sonar/db/metric/MetricDao.java
index c0178b419e9f7da15031fdee9b513ee9dcc63f6c..171eb8b1cecf54a65f59af2c924cdfd22355f835 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/metric/MetricDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/metric/MetricDao.java
@@ -143,11 +143,12 @@ public class MetricDao implements Dao {
     mapper(session).update(metric);
   }
 
-  public MetricDto selectNullableById(DbSession session, long id) {
+  @CheckForNull
+  public MetricDto selectById(DbSession session, long id) {
     return mapper(session).selectById(id);
   }
 
-  public MetricDto selectById(DbSession session, int id) {
+  public MetricDto selectOrFailById(DbSession session, int id) {
     MetricDto metric = mapper(session).selectById(id);
     if (metric == null) {
       throw new IllegalStateException(String.format("Metric id '%d' not found", id));