From 9a3a741ca211aafce25e24ed354194df1044d04c Mon Sep 17 00:00:00 2001 From: Janos Gyerik Date: Wed, 15 Aug 2018 15:29:19 +0200 Subject: [PATCH] SONAR-11137 Add isNew flag in /api/sources/lines --- .../org/sonar/server/source/index/FileSourceTesting.java | 1 + .../java/org/sonar/server/source/ws/LinesAction.java | 4 +++- .../ws/LinesActionTest/convert_deprecated_data.json | 3 ++- .../ws/LinesActionTest/display_deprecated_fields.json | 3 ++- .../source/ws/LinesActionTest/hide_scmAuthors.json | 3 ++- .../source/ws/LinesActionTest/show_paginated_lines.json | 3 ++- .../source/ws/LinesActionTest/show_scmAuthors.json | 3 ++- .../server/source/ws/LinesActionTest/show_source.json | 9 ++++++--- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java index dec0a8956ad..b7391d3c4b4 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/source/index/FileSourceTesting.java @@ -65,6 +65,7 @@ public class FileSourceTesting { .setHighlighting("HIGHLIGHTING_" + i) .setSymbols("SYMBOLS_" + i) .addAllDuplication(Arrays.asList(i)) + .setIsNewLine(true) .build(); } return dataBuilder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java index bd62f627c4c..d4a0ab06ad0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java @@ -95,7 +95,8 @@ public class LinesAction implements SourcesWsAction { "has been renamed \"lineHits\", \"conditions\" and \"coveredConditions\""), new Change("6.2", "fields \"itLineHits\", \"itConditions\" and \"itCoveredConditions\" " + "are no more returned"), - new Change("6.6", "field \"branch\" added")) + new Change("6.6", "field \"branch\" added"), + new Change("7.4", "field \"isNew\" added")) .setHandler(this); action @@ -201,6 +202,7 @@ public class LinesAction implements SourcesWsAction { json.prop("coveredConditions", coveredConditions.get()); } json.prop("duplicated", line.getDuplicationCount() > 0); + json.prop("isNew", line.getIsNewLine()); json.endObject(); } json.endArray(); diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json index 44f70ebdf6f..8040c2b7d44 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/convert_deprecated_data.json @@ -9,7 +9,8 @@ "lineHits": 1, "conditions": 2, "coveredConditions": 3, - "duplicated": false + "duplicated": false, + "isNew": false } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json index 595b76c33bf..39fa90dca54 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/display_deprecated_fields.json @@ -12,7 +12,8 @@ "utConditions": 2, "coveredConditions": 3, "utCoveredConditions": 3, - "duplicated": true + "duplicated": true, + "isNew": true } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json index d1c3b51952a..2fd47642208 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/hide_scmAuthors.json @@ -5,7 +5,8 @@ "code": "\u003cp\u003eSOURCE_1\u003c/p\u003e", "scmRevision": "REVISION_1", "scmDate": "1974-10-03T03:40:00+0100", - "duplicated": false + "duplicated": false, + "isNew": false } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json index 4be06fa1a3a..4cc6dad6487 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_paginated_lines.json @@ -9,7 +9,8 @@ "lineHits": 3, "conditions": 4, "coveredConditions": 5, - "duplicated": true + "duplicated": true, + "isNew": true } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json index f2f362cbc13..6386535cf73 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_scmAuthors.json @@ -6,7 +6,8 @@ "scmAuthor": "isaac@asimov.com", "scmRevision": "REVISION_1", "scmDate": "1974-10-03T03:40:00+0100", - "duplicated": false + "duplicated": false, + "isNew": false } ] } diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json index beb67322c54..5571ba74903 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json +++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/LinesActionTest/show_source.json @@ -9,7 +9,8 @@ "lineHits": 1, "conditions": 2, "coveredConditions": 3, - "duplicated": true + "duplicated": true, + "isNew": true }, { "line": 2, @@ -20,7 +21,8 @@ "lineHits": 2, "conditions": 3, "coveredConditions": 4, - "duplicated": true + "duplicated": true, + "isNew": true }, { "line": 3, @@ -31,7 +33,8 @@ "lineHits": 3, "conditions": 4, "coveredConditions": 5, - "duplicated": true + "duplicated": true, + "isNew": true } ] } -- 2.39.5