7 files changed, 41 insertions, 94 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java b/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java
index bb7b126d088..fb0ac071f4b 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java
@@ -48,7 +48,7 @@ import org.sonar.db.issue.IssueChangeDao;
 import org.sonar.db.issue.IssueDao;
 import org.sonar.db.issue.IssueFixedDao;
 import org.sonar.db.measure.LiveMeasureDao;
-import org.sonar.db.measure.MeasureDao;
+import org.sonar.db.measure.ProjectMeasureDao;
 import org.sonar.db.metric.MetricDao;
 import org.sonar.db.newcodeperiod.NewCodePeriodDao;
 import org.sonar.db.notification.NotificationQueueDao;
@@ -148,7 +148,7 @@ public class DaoModule extends Module {
     IssueDao.class,
     IssueFixedDao.class,
     LiveMeasureDao.class,
-    MeasureDao.class,
+    ProjectMeasureDao.class,
     MetricDao.class,
     NewCodePeriodDao.class,
     NotificationQueueDao.class,
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
index 8f68429cbb0..598d3663e1c 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java
@@ -48,7 +48,7 @@ import org.sonar.db.issue.IssueChangeDao;
 import org.sonar.db.issue.IssueDao;
 import org.sonar.db.issue.IssueFixedDao;
 import org.sonar.db.measure.LiveMeasureDao;
-import org.sonar.db.measure.MeasureDao;
+import org.sonar.db.measure.ProjectMeasureDao;
 import org.sonar.db.metric.MetricDao;
 import org.sonar.db.newcodeperiod.NewCodePeriodDao;
 import org.sonar.db.notification.NotificationQueueDao;
@@ -126,7 +126,7 @@ public class DbClient {
   private final SnapshotDao snapshotDao;
   private final ComponentDao componentDao;
   private final ComponentKeyUpdaterDao componentKeyUpdaterDao;
-  private final MeasureDao measureDao;
+  private final ProjectMeasureDao projectMeasureDao;
   private final UserDao userDao;
   private final UserGroupDao userGroupDao;
   private final UserTokenDao userTokenDao;
@@ -220,7 +220,7 @@ public class DbClient {
     snapshotDao = getDao(map, SnapshotDao.class);
     componentDao = getDao(map, ComponentDao.class);
     componentKeyUpdaterDao = getDao(map, ComponentKeyUpdaterDao.class);
-    measureDao = getDao(map, MeasureDao.class);
+    projectMeasureDao = getDao(map, ProjectMeasureDao.class);
     userDao = getDao(map, UserDao.class);
     userGroupDao = getDao(map, UserGroupDao.class);
     userTokenDao = getDao(map, UserTokenDao.class);
@@ -389,8 +389,8 @@ public class DbClient {
     return componentKeyUpdaterDao;
   }
 
-  public MeasureDao measureDao() {
-    return measureDao;
+  public ProjectMeasureDao projectMeasureDao() {
+    return projectMeasureDao;
   }
 
   public UserDao userDao() {
@@ -647,4 +647,3 @@ public class DbClient {
     return projectExportDao;
   }
 }
-
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java b/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java
index e14f8adac8a..543c465f450 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java
@@ -83,8 +83,8 @@ import org.sonar.db.issue.NewCodeReferenceIssueDto;
 import org.sonar.db.issue.PrIssueDto;
 import org.sonar.db.measure.LargestBranchNclocDto;
 import org.sonar.db.measure.LiveMeasureMapper;
-import org.sonar.db.measure.MeasureDto;
-import org.sonar.db.measure.MeasureMapper;
+import org.sonar.db.measure.ProjectMeasureDto;
+import org.sonar.db.measure.ProjectMeasureMapper;
 import org.sonar.db.measure.ProjectLocDistributionDto;
 import org.sonar.db.metric.MetricMapper;
 import org.sonar.db.newcodeperiod.NewCodePeriodMapper;
@@ -226,7 +226,7 @@ public class MyBatis {
     confBuilder.loadAlias("Impact", ImpactDto.class);
     confBuilder.loadAlias("Issue", IssueDto.class);
     confBuilder.loadAlias("NewCodeReferenceIssue", NewCodeReferenceIssueDto.class);
-    confBuilder.loadAlias("Measure", MeasureDto.class);
+    confBuilder.loadAlias("ProjectMeasure", ProjectMeasureDto.class);
     confBuilder.loadAlias("LargestBranchNclocDto", LargestBranchNclocDto.class);
     confBuilder.loadAlias("NotificationQueue", NotificationQueueDto.class);
     confBuilder.loadAlias("PermissionTemplateCharacteristic", PermissionTemplateCharacteristicDto.class);
@@ -304,7 +304,7 @@ public class MyBatis {
       IssueChangeMapper.class,
       IssueMapper.class,
       IssueFixedMapper.class,
-      MeasureMapper.class,
+      ProjectMeasureMapper.class,
       MetricMapper.class,
       NewCodePeriodMapper.class,
       NotificationQueueMapper.class,
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/PastMeasureDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/PastMeasureDto.java
deleted file mode 100644
index 71ec6f669aa..00000000000
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/PastMeasureDto.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.db.measure;
-
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
-import static java.util.Objects.requireNonNull;
-
-public class PastMeasureDto {
-
-  private String metricUuid;
-
-  @CheckForNull
-  private Double value;
-
-  public double getValue() {
-    requireNonNull(value);
-    return value;
-  }
-
-  PastMeasureDto setValue(@Nullable Double value) {
-    this.value = value;
-    return this;
-  }
-
-  public boolean hasValue() {
-    return value != null;
-  }
-
-  public String getMetricUuid() {
-    return metricUuid;
-  }
-
-  PastMeasureDto setMetricUuid(String i) {
-    this.metricUuid = i;
-    return this;
-  }
-}
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureDao.java
index db2407623df..c0709a83cb4 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureDao.java
@@ -27,19 +27,19 @@ import org.sonar.core.util.UuidFactory;
 import org.sonar.db.Dao;
 import org.sonar.db.DbSession;
 
-public class MeasureDao implements Dao {
+public class ProjectMeasureDao implements Dao {
 
   private final UuidFactory uuidFactory;
 
-  public MeasureDao(UuidFactory uuidFactory) {
+  public ProjectMeasureDao(UuidFactory uuidFactory) {
     this.uuidFactory = uuidFactory;
   }
 
-  public Optional<MeasureDto> selectLastMeasure(DbSession dbSession, String componentUuid, String metricKey) {
+  public Optional<ProjectMeasureDto> selectLastMeasure(DbSession dbSession, String componentUuid, String metricKey) {
     return Optional.ofNullable(mapper(dbSession).selectLastMeasure(componentUuid, metricKey));
   }
 
-  public Optional<MeasureDto> selectMeasure(DbSession dbSession, String analysisUuid, String componentUuid, String metricKey) {
+  public Optional<ProjectMeasureDto> selectMeasure(DbSession dbSession, String analysisUuid, String componentUuid, String metricKey) {
     return Optional.ofNullable(mapper(dbSession).selectMeasure(analysisUuid, componentUuid, metricKey));
   }
 
@@ -52,28 +52,28 @@ public class MeasureDao implements Dao {
    *
    * If no constraints on dates, all the history is returned
    */
-  public List<MeasureDto> selectPastMeasures(DbSession dbSession, PastMeasureQuery query) {
+  public List<ProjectMeasureDto> selectPastMeasures(DbSession dbSession, PastMeasureQuery query) {
     return mapper(dbSession).selectPastMeasuresOnSeveralAnalyses(query);
   }
 
-  public void insert(DbSession session, MeasureDto measureDto) {
-    measureDto.setUuid(uuidFactory.create());
-    mapper(session).insert(measureDto);
+  public void insert(DbSession session, ProjectMeasureDto projectMeasureDto) {
+    projectMeasureDto.setUuid(uuidFactory.create());
+    mapper(session).insert(projectMeasureDto);
   }
 
-  public void insert(DbSession session, Collection<MeasureDto> items) {
-    for (MeasureDto item : items) {
+  public void insert(DbSession session, Collection<ProjectMeasureDto> items) {
+    for (ProjectMeasureDto item : items) {
       item.setUuid(uuidFactory.create());
       insert(session, item);
     }
   }
 
-  public void insert(DbSession session, MeasureDto item, MeasureDto... others) {
+  public void insert(DbSession session, ProjectMeasureDto item, ProjectMeasureDto... others) {
     insert(session, Lists.asList(item, others));
   }
 
-  private static MeasureMapper mapper(DbSession session) {
-    return session.getMapper(MeasureMapper.class);
+  private static ProjectMeasureMapper mapper(DbSession session) {
+    return session.getMapper(ProjectMeasureMapper.class);
   }
 
 }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureDto.java
index 0c70d6143ba..fe65d2929c3 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureDto.java
@@ -24,7 +24,7 @@ import java.nio.charset.StandardCharsets;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
-public class MeasureDto {
+public class ProjectMeasureDto {
   private static final int MAX_TEXT_VALUE_LENGTH = 4000;
 
   private String uuid;
@@ -37,6 +37,10 @@ public class MeasureDto {
   private String analysisUuid;
   private String metricUuid;
 
+  public ProjectMeasureDto() {
+    // empty constructor
+  }
+
   public String getUuid() {
     return uuid;
   }
@@ -50,7 +54,7 @@ public class MeasureDto {
     return value;
   }
 
-  public MeasureDto setValue(@Nullable Double value) {
+  public ProjectMeasureDto setValue(@Nullable Double value) {
     this.value = value;
     return this;
   }
@@ -59,7 +63,7 @@ public class MeasureDto {
     return componentUuid;
   }
 
-  public MeasureDto setComponentUuid(String s) {
+  public ProjectMeasureDto setComponentUuid(String s) {
     this.componentUuid = s;
     return this;
   }
@@ -72,7 +76,7 @@ public class MeasureDto {
     return textValue;
   }
 
-  public MeasureDto setData(@Nullable String data) {
+  public ProjectMeasureDto setData(@Nullable String data) {
     if (data == null) {
       this.textValue = null;
       this.dataValue = null;
@@ -92,7 +96,7 @@ public class MeasureDto {
     return alertStatus;
   }
 
-  public MeasureDto setAlertStatus(@Nullable String alertStatus) {
+  public ProjectMeasureDto setAlertStatus(@Nullable String alertStatus) {
     this.alertStatus = alertStatus;
     return this;
   }
@@ -102,7 +106,7 @@ public class MeasureDto {
     return alertText;
   }
 
-  public MeasureDto setAlertText(@Nullable String alertText) {
+  public ProjectMeasureDto setAlertText(@Nullable String alertText) {
     this.alertText = alertText;
     return this;
   }
@@ -111,7 +115,7 @@ public class MeasureDto {
     return metricUuid;
   }
 
-  public MeasureDto setMetricUuid(String metricUuid) {
+  public ProjectMeasureDto setMetricUuid(String metricUuid) {
     this.metricUuid = metricUuid;
     return this;
   }
@@ -120,7 +124,7 @@ public class MeasureDto {
     return analysisUuid;
   }
 
-  public MeasureDto setAnalysisUuid(String s) {
+  public ProjectMeasureDto setAnalysisUuid(String s) {
     this.analysisUuid = s;
     return this;
   }
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureMapper.java
index de9e823f186..4d59b61de3d 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/MeasureMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasureMapper.java
@@ -23,23 +23,23 @@ import java.util.List;
 import javax.annotation.CheckForNull;
 import org.apache.ibatis.annotations.Param;
 
-public interface MeasureMapper {
+public interface ProjectMeasureMapper {
 
   @CheckForNull
-  MeasureDto selectLastMeasure(
+  ProjectMeasureDto selectLastMeasure(
     @Param("componentUuid") String componentUuid,
     @Param("metricKey") String metricKey
   );
 
   @CheckForNull
-  MeasureDto selectMeasure(
+  ProjectMeasureDto selectMeasure(
     @Param("analysisUuid") String analysisUuid,
     @Param("componentUuid") String componentUuid,
     @Param("metricKey") String metricKey
   );
 
-  List<MeasureDto> selectPastMeasuresOnSeveralAnalyses(@Param("query") PastMeasureQuery query);
+  List<ProjectMeasureDto> selectPastMeasuresOnSeveralAnalyses(@Param("query") PastMeasureQuery query);
 
-  void insert(MeasureDto measureDto);
+  void insert(ProjectMeasureDto projectMeasureDto);
 
 }