diff options
4 files changed, 6 insertions, 6 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDao.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDao.java index b5e8ab11311..9526ac287f8 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDao.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDao.java @@ -59,11 +59,11 @@ public class IssueChangeDao implements BatchComponent, ServerComponent { } } - public Collection<IssueChangeDto> selectByIssue(String issueUuid) { + public Collection<IssueChangeDto> selectByIssue(String issueKey) { SqlSession session = mybatis.openSession(); try { IssueChangeMapper mapper = session.getMapper(IssueChangeMapper.class); - return mapper.selectByIssue(issueUuid); + return mapper.selectByIssue(issueKey); } finally { MyBatis.closeQuietly(session); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDto.java b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDto.java index 07e93714b22..52e34e2f9f6 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDto.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/IssueChangeDto.java @@ -47,7 +47,7 @@ public final class IssueChangeDto { return this; } - public String getIssueUuid() { + public String getIssueKey() { return issueKey; } 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 12200a5ca6a..a2724453b20 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/IssueMapper.xml @@ -43,9 +43,9 @@ <selectKey order="BEFORE" resultType="Long" keyProperty="id"> select issues_seq.NEXTVAL from DUAL </selectKey> - INSERT INTO issues (kee, uuid, resource_id, rule_id, severity, manual_severity, manual_issue, title, description, line, cost, status, + INSERT INTO issues (kee, resource_id, rule_id, severity, manual_severity, manual_issue, title, description, line, cost, status, resolution, checksum, user_login, assignee_login, author_login, attributes, created_at, updated_at, closed_at) - VALUES (#{kee}, #{uuid}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{title}, #{description}, #{line}, #{cost}, #{status}, + VALUES (#{kee}, #{resourceId}, #{ruleId}, #{severity}, #{manualSeverity}, #{manualIssue}, #{title}, #{description}, #{line}, #{cost}, #{status}, #{resolution}, #{checksum}, #{userLogin}, #{assignee}, #{authorLogin}, #{attributes}, #{createdAt}, #{updatedAt}, #{closedAt}) </insert> diff --git a/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeDaoTest.java index 436a3e31b98..62c4adb7fc4 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/IssueChangeDaoTest.java @@ -63,7 +63,7 @@ public class IssueChangeDaoTest extends AbstractDaoTestCase { IssueChangeDto dto = dao.findById(100L); assertThat(dto.getId()).isEqualTo(100L); - assertThat(dto.getIssueUuid()).isEqualTo("100"); + assertThat(dto.getIssueKey()).isEqualTo("100"); assertThat(dto.getUserLogin()).isEqualTo("arthur"); assertThat(dto.getChangeType()).isEqualTo("type"); assertThat(dto.getChangeData()).isEqualTo("data"); |