SONAR-18740 Drop the 'logs' response field of api/ce/activity and api/ce/component

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
index 3eb95c03c77c9db24098fc9b2c334f8b7016d429..1b6fa75b1b2fe2de726c05b6584f408ca1eea945 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ActivityAction.java
@@ -111,6 +111,7 @@ public class ActivityAction implements CeWsAction {
         new Change("6.6", "fields \"branch\" and \"branchType\" added"),
         new Change("7.1", "field \"pullRequest\" added"),
         new Change("7.6", format("The use of module keys in parameters '%s' is deprecated", TEXT_QUERY)),
+        new Change("8.8", "field \"logs\" is dropped"),
         new Change("10.0", "Remove deprecated field 'componentId'"))
       .setSince("5.2");
 

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
index 9268dc8644909cfef55ce4e8b6e7416a1004b532..6273a27cbe7d49cf222df7e82591fdeaadd99eab 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/ws/ComponentAction.java
@@ -68,6 +68,7 @@ public class ComponentAction implements CeWsAction {
         new Change("6.1", "field \"logs\" is deprecated and its value is always false"),
         new Change("6.6", "fields \"branch\" and \"branchType\" added"),
         new Change("7.6", format("The use of module keys in parameter \"%s\" is deprecated", PARAM_COMPONENT)),
+        new Change("8.8", "field \"logs\" is dropped"),
         new Change("8.8", "Deprecated parameter 'componentId' has been removed."),
         new Change("8.8", "Parameter 'component' is now required."))
       .setHandler(this);

diff --git a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json
index 318d2eaded2b5006cfe4f5f60d2ae3f93c6041d4..5e37d0d80c09243c8c80624193cdc4a70dff66eb 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json
@@ -15,7 +15,6 @@
       "startedAt": "2015-08-13T23:35:00+0200",
       "executedAt": "2015-08-13T23:35:10+0200",
       "executionTimeMs": 10000,
-      "logs": false,
       "hasErrorStacktrace": false,
       "hasScannerContext": true
     },
@@ -32,7 +31,6 @@
       "startedAt": "2015-09-17T23:35:00+0200",
       "executedAt": "2015-08-13T23:37:00+0200",
       "executionTimeMs": 120000,
-      "logs": false,
       "errorMessage": "Failed to unzip analysis report",
       "hasErrorStacktrace": true,
       "hasScannerContext": true

diff --git a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json
index 2c2dfe3ca15bf189c63c2a3f8cee70b60375cec1..4f021d65cecbd8023cdfa3b981a890fa7ee6e122 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json
+++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/component-example.json
@@ -9,8 +9,7 @@
       "componentName": "HttpRequest",
       "componentQualifier": "TRK",
       "status": "PENDING",
-      "submittedAt": "2015-09-21T19:28:54+0200",
-      "logs": false
+      "submittedAt": "2015-09-21T19:28:54+0200"
     }
   ],
   "current": {
@@ -27,7 +26,6 @@
     "startedAt": "2015-09-21T19:25:57+0200",
     "finishedAt": "2015-09-21T19:25:58+0200",
     "executionTimeMs": 1371,
-    "logs": false,
     "errorMessage": "the error message",
     "errorType": "the optional error type",
     "hasErrorStacktrace": false,