diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-05-04 10:34:31 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-05-04 10:34:31 +0200 |
| commit | b9e0daf97c2107da6575bb7c4977c35193952248 (patch) | |
| tree | c2deed41a318950b45f64de46b971615dded79c3 /sonar-core | |
| parent | 7fbb12369a4f13802a7636535c34ad23956b7e75 (diff) | |
| download | sonarqube-b9e0daf97c2107da6575bb7c4977c35193952248.tar.gz sonarqube-b9e0daf97c2107da6575bb7c4977c35193952248.zip | |
SONAR-3755 refactor issue sorting
Diffstat (limited to 'sonar-core')
6 files changed, 12 insertions, 15 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java b/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java index 23015627eb7..c5eaabf0b4d 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/ChangeDtoConverter.java @@ -29,6 +29,10 @@ import java.util.List; class ChangeDtoConverter { + private ChangeDtoConverter() { + // only static methods + } + static final String TYPE_FIELD_CHANGE = "change"; static final String TYPE_COMMENT = "comment"; diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java index f28fb0ac60f..9e6bcf82f4c 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDao.java @@ -43,13 +43,6 @@ public class IssueDao implements BatchComponent, ServerComponent { private final MyBatis mybatis; - private static final Map<String, String> SORTS = ImmutableMap.of( - "created", "i.issue_creation_date", - "updated", "i.issue_update_date", - "closed", "i.issue_close_date", - "assignee", "i.assignee" - ); - public IssueDao(MyBatis mybatis) { this.mybatis = mybatis; } diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java index 91394566a71..8999a8f6f05 100644 --- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java +++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java @@ -119,7 +119,7 @@ public class PluginClassloaders { } else { parent = new ResourcesClassloader(resources, baseClassloader); } - final ClassRealm realm; + ClassRealm realm; if (plugin.isUseChildFirstClassLoader()) { ClassRealm parentRealm = world.newRealm(plugin.getKey() + "-parent", parent); realm = parentRealm.createChildRealm(plugin.getKey()); diff --git a/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java b/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java index 16df96a3010..eff897901d1 100644 --- a/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java +++ b/sonar-core/src/main/java/org/sonar/core/source/HtmlSourceDecorator.java @@ -45,7 +45,7 @@ public class HtmlSourceDecorator implements ServerComponent { } @VisibleForTesting - protected HtmlSourceDecorator(SnapshotSourceDao snapshotSourceDao, SnapshotDataDao snapshotDataDao) { + HtmlSourceDecorator(SnapshotSourceDao snapshotSourceDao, SnapshotDataDao snapshotDataDao) { this.snapshotSourceDao = snapshotSourceDao; this.snapshotDataDao= snapshotDataDao; } diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml index 4f0c14f67d2..7b0ea92b70c 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml @@ -215,16 +215,16 @@ <if test="sort != null"> order by <choose> - <when test="'created'.equals(sort)"> + <when test="'CREATION_DATE'.equals(sort.name())"> i.issue_creation_date </when> - <when test="'updated'.equals(sort)"> + <when test="'UPDATE_DATE'.equals(sort.name())"> i.issue_update_date </when> - <when test="'closed'.equals(sort)"> + <when test="'CLOSE_DATE'.equals(sort.name())"> i.issue_close_date </when> - <when test="'assignee'.equals(sort)"> + <when test="'ASSIGNEE'.equals(sort.name())"> i.assignee_login </when> </choose> diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java index 7592dae2f08..7a9461e2a0d 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java @@ -173,8 +173,8 @@ public class IssueDaoTest extends AbstractDaoTestCase { public void should_select_sort_by_assignee() { setupData("shared", "should_select_returned_sorted_result"); - IssueQuery query = IssueQuery.builder().sort("assignee").asc(true).build(); - List<IssueDto> results = newArrayList(dao.select(query)); + IssueQuery query = IssueQuery.builder().sort(IssueQuery.Sort.ASSIGNEE).asc(true).build(); + List < IssueDto > results = newArrayList(dao.select(query)); assertThat(results).hasSize(3); assertThat(results.get(0).getAssignee()).isEqualTo("arthur"); assertThat(results.get(1).getAssignee()).isEqualTo("henry"); |