diff options
author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-09-14 17:19:46 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2016-09-14 17:19:46 +0200 |
commit | c6d074bc2b2d450a3602b24f10a9dcf0c9b63b3e (patch) | |
tree | 8095f40be77837e9e7dfb0a4eeb44a72a8f14640 /sonar-db/src | |
parent | 3f5215522dcc45910bc1e02f172d6eb9b5a9c783 (diff) | |
download | sonarqube-c6d074bc2b2d450a3602b24f10a9dcf0c9b63b3e.tar.gz sonarqube-c6d074bc2b2d450a3602b24f10a9dcf0c9b63b3e.zip |
SONAR-8079 drop methods suffixed with "kee" in RuleRepositoryDto
Diffstat (limited to 'sonar-db/src')
-rw-r--r-- | sonar-db/src/main/java/org/sonar/db/rule/RuleRepositoryDto.java | 12 | ||||
-rw-r--r-- | sonar-db/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java | 8 |
2 files changed, 7 insertions, 13 deletions
diff --git a/sonar-db/src/main/java/org/sonar/db/rule/RuleRepositoryDto.java b/sonar-db/src/main/java/org/sonar/db/rule/RuleRepositoryDto.java index 150c1d3924b..772395b4f88 100644 --- a/sonar-db/src/main/java/org/sonar/db/rule/RuleRepositoryDto.java +++ b/sonar-db/src/main/java/org/sonar/db/rule/RuleRepositoryDto.java @@ -21,12 +21,13 @@ package org.sonar.db.rule; public class RuleRepositoryDto { + // do not rename "key" as MyBatis maps it with the db column "kee" private String kee; private String language; private String name; public RuleRepositoryDto() { - + // used by MyBatis } public RuleRepositoryDto(String kee, String language, String name) { @@ -35,13 +36,6 @@ public class RuleRepositoryDto { this.name = name; } - public String getKee() { - return kee; - } - - /** - * Kept for compatibility with ruby code - */ public String getKey() { return kee; } @@ -54,7 +48,7 @@ public class RuleRepositoryDto { return name; } - public RuleRepositoryDto setKee(String s) { + public RuleRepositoryDto setKey(String s) { this.kee = s; return this; } diff --git a/sonar-db/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java b/sonar-db/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java index 32989ef4807..d50b4497e39 100644 --- a/sonar-db/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/rule/RuleRepositoryDaoTest.java @@ -48,7 +48,7 @@ public class RuleRepositoryDaoTest { List<RuleRepositoryDto> rows = underTest.selectAll(dbSession); assertThat(rows).hasSize(1); RuleRepositoryDto row = rows.get(0); - assertThat(row.getKee()).isEqualTo("findbugs"); + assertThat(row.getKey()).isEqualTo("findbugs"); assertThat(row.getName()).isEqualTo("Findbugs"); assertThat(row.getLanguage()).isEqualTo("java"); } @@ -61,7 +61,7 @@ public class RuleRepositoryDaoTest { RuleRepositoryDto dto3 = new RuleRepositoryDto("cobol-lint", "cobol", "Cobol Lint"); underTest.insert(dbSession, asList(dto1, dto2, dto3)); - assertThat(underTest.selectAll(dbSession)).extracting(RuleRepositoryDto::getKee) + assertThat(underTest.selectAll(dbSession)).extracting(RuleRepositoryDto::getKey) // ordered by key .containsExactly("cobol-lint", "findbugs", "squid"); } @@ -74,7 +74,7 @@ public class RuleRepositoryDaoTest { RuleRepositoryDto dto3 = new RuleRepositoryDto("cobol-lint", "cobol", "Cobol Lint"); underTest.insert(dbSession, asList(dto1, dto2, dto3)); - assertThat(underTest.selectByLanguage(dbSession, "java")).extracting(RuleRepositoryDto::getKee) + assertThat(underTest.selectByLanguage(dbSession, "java")).extracting(RuleRepositoryDto::getKey) // ordered by key .containsExactly("findbugs", "squid"); } @@ -94,7 +94,7 @@ public class RuleRepositoryDaoTest { RuleRepositoryDto dto1 = new RuleRepositoryDto("findbugs", "java", "Findbugs"); underTest.insert(dbSession, asList(dto1)); - assertThat(underTest.selectByKey(dbSession, "findbugs").get().getKee()).isEqualTo("findbugs"); + assertThat(underTest.selectByKey(dbSession, "findbugs").get().getKey()).isEqualTo("findbugs"); assertThat(underTest.selectByKey(dbSession, "missing")).isNotPresent(); } |