From 2dcb4bac6217bcbbaceb6af2101533ee74eb5db3 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 22 May 2013 17:37:47 +0200 Subject: SONAR-4301 Add maxResultsReached parameter on Issues WS --- .../src/main/java/org/sonar/wsclient/issue/IssueParser.java | 1 + .../src/main/java/org/sonar/wsclient/issue/Issues.java | 10 ++++++++++ .../test/java/org/sonar/wsclient/issue/IssueParserTest.java | 2 +- .../wsclient/issue/IssueParserTest/issue-with-comments.json | 3 ++- .../wsclient/issue/IssueParserTest/issue-with-components.json | 3 ++- .../wsclient/issue/IssueParserTest/issue-with-projects.json | 3 ++- .../sonar/wsclient/issue/IssueParserTest/issue-with-users.json | 3 ++- .../org/sonar/wsclient/issue/IssueParserTest/search.json | 3 ++- 8 files changed, 22 insertions(+), 6 deletions(-) (limited to 'sonar-ws-client') diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueParser.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueParser.java index 0f225f03f8e..537d1ceeb62 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueParser.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/IssueParser.java @@ -75,6 +75,7 @@ class IssueParser { Map paging = (Map) jsonRoot.get("paging"); result.setPaging(new Paging(paging)); result.setSecurityExclusions(JsonUtils.getBoolean(jsonRoot, "securityExclusions")); + result.setMaxResultsReached(JsonUtils.getBoolean(jsonRoot, "maxResultsReached")); return result; } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java index ab0c8f36ca9..ea06ffdf8f7 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Issues.java @@ -39,6 +39,7 @@ public class Issues { private final Map projectsByKey = new HashMap(); private Paging paging; private Boolean securityExclusions; + private Boolean maxResultsReached; public List list() { return list; @@ -91,6 +92,10 @@ public class Issues { return securityExclusions; } + public Boolean maxResultsReached() { + return maxResultsReached; + } + Issues add(Issue issue) { list.add(issue); return this; @@ -125,4 +130,9 @@ public class Issues { this.securityExclusions = securityExclusions; return this; } + + Issues setMaxResultsReached(Boolean maxResultsReached) { + this.maxResultsReached = maxResultsReached; + return this; + } } diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java index 6bc95d9fdc3..82dd222875d 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/issue/IssueParserTest.java @@ -79,6 +79,7 @@ public class IssueParserTest { assertThat(paging.total()).isEqualTo(2); assertThat(issues.securityExclusions()).isTrue(); + assertThat(issues.maxResultsReached()).isTrue(); } @Test @@ -90,7 +91,6 @@ public class IssueParserTest { assertThat(issues.rules()).isEmpty(); } - @Test public void test_GET_transitions() throws Exception { String json = IOUtils.toString(getClass().getResourceAsStream("/org/sonar/wsclient/issue/IssueParserTest/getTransitions.json")); diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-comments.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-comments.json index e5a213f7ba6..4378189dbba 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-comments.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-comments.json @@ -38,5 +38,6 @@ "total": 2, "pages": 1 }, - "securityExclusions": true + "securityExclusions": true, + "maxResultsReached": false } \ No newline at end of file diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-components.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-components.json index 86655ee1470..37711422340 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-components.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-components.json @@ -46,5 +46,6 @@ "total": 2, "pages": 1 }, - "securityExclusions": true + "securityExclusions": true, + "maxResultsReached": false } \ No newline at end of file diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-projects.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-projects.json index f0542d4f8bd..c999362047b 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-projects.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-projects.json @@ -54,5 +54,6 @@ "total": 2, "pages": 1 }, - "securityExclusions": true + "securityExclusions": true, + "maxResultsReached": false } \ No newline at end of file diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-users.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-users.json index f076b290b4d..32d3a8e323f 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-users.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/issue-with-users.json @@ -52,5 +52,6 @@ "total": 2, "pages": 1 }, - "securityExclusions": true + "securityExclusions": true, + "maxResultsReached": false } \ No newline at end of file diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json index c88120f2dd9..6931c7de92b 100644 --- a/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json +++ b/sonar-ws-client/src/test/resources/org/sonar/wsclient/issue/IssueParserTest/search.json @@ -51,5 +51,6 @@ "total": 2, "pages": 1 }, - "securityExclusions": true + "securityExclusions": true, + "maxResultsReached": true } \ No newline at end of file -- cgit v1.2.3