From 2e0239d5170db953f631fa4a443b2025f8d3fe5b Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 9 Feb 2015 14:23:56 +0100 Subject: [PATCH] Fix SearchOptions#setPage(int page, int pageSize) when pageSize is zero --- .../org/sonar/server/es/SearchOptions.java | 2 +- .../sonar/server/es/SearchOptionsTest.java | 4 ++-- .../issue/index/IssueIndexMediumTest.java | 2 +- .../java/org/sonar/wsclient/issue/Issues.java | 2 -- .../issue/internal/DefaultIssues.java | 20 +++++-------------- .../issue/internal/IssueJsonParser.java | 1 - .../issue/internal/IssueJsonParserTest.java | 3 --- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java b/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java index 57cf4904cef..0c01aaccb68 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/SearchOptions.java @@ -89,7 +89,7 @@ public class SearchOptions { * Sets the limit on the number of results to return. */ public SearchOptions setLimit(int limit) { - if (limit < 0) { + if (limit <= 0) { this.limit = MAX_LIMIT; } else { this.limit = Math.min(limit, MAX_LIMIT); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java index e4cac26fca3..8eea2257555 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/SearchOptionsTest.java @@ -61,9 +61,9 @@ public class SearchOptionsTest { @Test public void with_zero_page_size() throws Exception { SearchOptions options = new SearchOptions().setPage(1, 0); - assertThat(options.getLimit()).isEqualTo(0); + assertThat(options.getLimit()).isEqualTo(SearchOptions.MAX_LIMIT); assertThat(options.getOffset()).isEqualTo(0); - assertThat(options.getPage()).isEqualTo(0); + assertThat(options.getPage()).isEqualTo(1); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java index bcb26d6a3e2..8f55539d654 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexMediumTest.java @@ -786,7 +786,7 @@ public class IssueIndexMediumTest { assertThat(result.getTotal()).isEqualTo(12); result = index.search(IssueQuery.builder().build(), new SearchOptions().setOffset(2).setLimit(0)); - assertThat(result.getDocs()).hasSize(0); + assertThat(result.getDocs()).hasSize(10); assertThat(result.getTotal()).isEqualTo(12); } diff --git a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java index 702b83760ae..a3baba1b8ce 100644 --- a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java +++ b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java @@ -69,6 +69,4 @@ public interface Issues { Paging paging(); - Boolean maxResultsReached(); - } diff --git a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java index cfacd6111a0..5f89a1a32bd 100644 --- a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java +++ b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/DefaultIssues.java @@ -28,9 +28,11 @@ import org.sonar.wsclient.rule.Rule; import org.sonar.wsclient.user.User; import javax.annotation.CheckForNull; -import javax.annotation.Nullable; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @since 3.6 @@ -45,7 +47,6 @@ public class DefaultIssues implements Issues { private final Map projectsByKey = new HashMap(); private final Map actionPlansByKey = new HashMap(); private Paging paging; - private Boolean maxResultsReached; @Override public List list() { @@ -128,12 +129,6 @@ public class DefaultIssues implements Issues { return paging; } - @Override - @Nullable - public Boolean maxResultsReached() { - return maxResultsReached; - } - DefaultIssues add(Issue issue) { list.add(issue); return this; @@ -169,9 +164,4 @@ public class DefaultIssues implements Issues { this.paging = paging; return this; } - - DefaultIssues setMaxResultsReached(@Nullable Boolean maxResultsReached) { - this.maxResultsReached = maxResultsReached; - return this; - } } diff --git a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/IssueJsonParser.java b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/IssueJsonParser.java index 40608c48e7d..02cad915e57 100644 --- a/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/IssueJsonParser.java +++ b/server/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/internal/IssueJsonParser.java @@ -63,7 +63,6 @@ public class IssueJsonParser { private void parsePaging(DefaultIssues result, Map jsonRoot) { Map paging = (Map) jsonRoot.get("paging"); result.setPaging(new Paging(paging)); - result.setMaxResultsReached(JsonUtils.getBoolean(jsonRoot, "maxResultsReached")); } private void parseProjects(DefaultIssues result, Map jsonRoot) { diff --git a/server/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java b/server/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java index c4db8a6f4e5..49295988c6a 100644 --- a/server/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java +++ b/server/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/internal/IssueJsonParserTest.java @@ -84,8 +84,6 @@ public class IssueJsonParserTest { assertThat(paging.pageSize()).isEqualTo(100); assertThat(paging.pages()).isEqualTo(1); assertThat(paging.total()).isEqualTo(2); - - assertThat(issues.maxResultsReached()).isTrue(); } @Test @@ -95,7 +93,6 @@ public class IssueJsonParserTest { assertThat(issues).isNotNull(); assertThat(issues.list()).isEmpty(); assertThat(issues.rules()).isEmpty(); - assertThat(issues.maxResultsReached()).isFalse(); } @Test -- 2.39.5