Fix measure data not being evicted anymore

2 files changed, 5 insertions, 5 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureMapper.java b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureMapper.java
index f9362533a76..e5ca6ecac0e 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureMapper.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/database/model/MeasureMapper.java
@@ -22,7 +22,7 @@ package org.sonar.api.database.model;
 public interface MeasureMapper {
   void insert(MeasureModel measure);
 
-  void insertData(MeasureModel data);
+  void insertData(MeasureData data);
 
   void deleteData(MeasureModel data);
 
diff --git a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
index cb892f7009a..bbc0ba808ea 100644
--- a/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
+++ b/sonar-plugin-api/src/main/resources/org/sonar/api/database/model/MeasureMapper.xml
@@ -16,9 +16,9 @@
     )
   </insert>
 
-  <insert id="insertData" parameterType="MeasureModel" useGeneratedKeys="true">
+  <insert id="insertData" parameterType="MeasureData" useGeneratedKeys="true" keyProperty="id">
     INSERT INTO measure_data (measure_id, snapshot_id, data)
-    VALUES (#{id}, #{snapshotId}, #{measureData.data})
+    VALUES (#{measure.id}, #{measure.snapshotId}, #{data})
   </insert>
 
   <update id="deleteData" parameterType="MeasureModel">
@@ -64,9 +64,9 @@
     )
   </insert>
 
-  <insert id="insertData" databaseId="oracle" parameterType="MeasureModel" useGeneratedKeys="true">
+  <insert id="insertData" databaseId="oracle" parameterType="MeasureData" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
     INSERT INTO measure_data (id, measure_id, snapshot_id, data)
-    VALUES (measure_data_seq.NEXTVAL, #{id}, #{snapshotId}, #{measureData.data})
+    VALUES (measure_data_seq.NEXTVAL, #{measure.id}, #{measure.snapshotId}, #{data})
   </insert>
 
 </mapper>