SONAR-11137 Add isNew flag in /api/sources/lines

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 dec0a8956adf5c514a83e4992afbdf095748901f..b7391d3c4b46e6cd684b7ef8558800428290895d 100644 (file)
--- 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 bd62f627c4c40c0d1de6908ce8190796c112a78b..d4a0ab06ad0b887df0a3bb59ea2b4412137a321e 100644 (file)
--- 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 44f70ebdf6fbd857f8939160ff4561a8f285bc70..8040c2b7d446b1f8a3a009bee55e261463b08317 100644 (file)
--- 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 595b76c33bff0c5bb62ffe1dec47cb40fc4f6235..39fa90dca54399ecba3c2a52490a54cf73ab7027 100644 (file)
--- 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 d1c3b51952a2fa7f4c5b166c06b952be5cc7ae00..2fd47642208d5719729cf3aa74c85b070d6641f7 100644 (file)
--- 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 4be06fa1a3a656db1de59c6618baea2c61d83b1b..4cc6dad6487da42ff47ca6f5e3caf70af20308e0 100644 (file)
--- 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 f2f362cbc1358ddd5f5997e799a7f132c321cb9e..6386535cf73f5bdc9ac1f780ce8a5ab8c1a1ab7f 100644 (file)
--- 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 beb67322c54ca3bebebe073f1f12043d65dfed88..5571ba7490309b13893e2b1eb15c3a2f9888a43d 100644 (file)
--- 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
     }
   ]
 }