SONAR-3755 Fix issue where Issues updated at was not set

diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueMapper.java
index 78891c3a34feb5a796bfc680133eed161556fd4a..31839f222bb11f1a8593c8803ec82bb208abea9c 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/issue/IssueMapper.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueMapper.java
@@ -31,7 +31,7 @@ public interface IssueMapper {
 
   void insert(IssueDto issueDto);
 
-  void update(IssueDto review);
+  void update(IssueDto issueDto);
 
   IssueDto findById(long issueId);
 

diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml
index c5606385bf0a7de3a2b92f357c7520a2225b43ab..eff67a6a6db8735a29afd7eb167a001778c2a6af 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml
@@ -48,7 +48,6 @@
 
   <update id="update" parameterType="Issue">
     update issues set
-    uuid=#{uuid},
     resource_id=#{resourceId},
     rule_id=#{ruleId},
     severity=#{severity},
@@ -68,7 +67,7 @@
     created_at=#{createdAt},
     updated_at=#{updatedAt},
     closed_at=#{closedAt}
-    where id = #{id}
+    where uuid = #{uuid}
   </update>
 
   <select id="findById" parameterType="long" resultType="Issue">

diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
index 3cf6e80e3d86feb53f31583f3401bba5f0993030..7d85b47802b0836a1206b7b4f8df4cf5a46eadd5 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueDaoTest.java
@@ -26,7 +26,6 @@ import org.sonar.api.issue.IssueQuery;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.core.persistence.AbstractDaoTestCase;
 
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -73,8 +72,11 @@ public class IssueDaoTest extends AbstractDaoTestCase {
   @Test
   public void update() {
     setupData("update");
-    Collection<IssueDto> issues = newArrayList(dao.findById(100L));
-    IssueDto issue = issues.iterator().next();
+
+    IssueDto issue = new IssueDto();
+    issue.setUuid("100");
+    issue.setResourceId(400);
+    issue.setRuleId(500);
     issue.setLine(1000);
     issue.setResolution("NEW_RESOLUTION");
     issue.setStatus("NEW_STATUS");
@@ -83,11 +85,12 @@ public class IssueDaoTest extends AbstractDaoTestCase {
     issue.setManualSeverity(true);
     issue.setManualIssue(false);
     issue.setTitle("NEW_TITLE");
+    issue.setUserLogin("user");
     issue.setCreatedAt(DateUtils.parseDate("2012-05-18"));
     issue.setUpdatedAt(DateUtils.parseDate("2012-07-01"));
     issue.setData("big=bang");
 
-    dao.update(issues);
+    dao.update(newArrayList(issue));
 
     checkTables("update", "issues");
   }