SONAR-5921 Use uuid instead of key for attribute name in WS response

9 files changed, 18 insertions, 18 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java
index 6dccf049159..0cef6f868a3 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java
@@ -164,7 +164,7 @@ public class QProfileProjectsAction implements BaseQProfileWsAction {
     json.name("results").beginArray();
     for (ProjectQprofileAssociationDto project : projects) {
       json.beginObject()
-        .prop("key", project.getProjectUuid())
+        .prop("uuid", project.getProjectUuid())
         .prop("name", project.getProjectName())
         .prop("selected", project.isAssociated())
         .endObject();
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json
index 941b9cd15ee..186208afb24 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json
@@ -2,22 +2,22 @@
   "results":
   [
     {
-      "key": "DEFA",
+      "uuid": "DEFA",
       "name": "Project Four",
       "selected": false
     },
     {
-      "key": "ABCD",
+      "uuid": "ABCD",
       "name": "Project One",
       "selected": true
     },
     {
-      "key": "CDEF",
+      "uuid": "CDEF",
       "name": "Project Three",
       "selected": false
     },
     {
-      "key": "BCDE",
+      "uuid": "BCDE",
       "name": "Project Two",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json
index 6eed637dcd8..06877249e6c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json
@@ -2,12 +2,12 @@
   "results":
   [
     {
-      "key": "CDEF",
+      "uuid": "CDEF",
       "name": "Project Three",
       "selected": false
     },
     {
-      "key": "BCDE",
+      "uuid": "BCDE",
       "name": "Project Two",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json
index 52108a29446..f5b73779077 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json
@@ -2,7 +2,7 @@
   "results":
   [
     {
-      "key": "ABCD",
+      "uuid": "ABCD",
       "name": "Project One",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json
index c5adddd68ff..2a0ecdb15c7 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json
@@ -2,12 +2,12 @@
   "results":
   [
     {
-      "key": "DEFA",
+      "uuid": "DEFA",
       "name": "Project Four",
       "selected": false
     },
     {
-      "key": "CDEF",
+      "uuid": "CDEF",
       "name": "Project Three",
       "selected": false
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json
index 803a536e742..70668d5b7d5 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json
@@ -2,12 +2,12 @@
   "results":
   [
     {
-      "key": "DEFA",
+      "uuid": "DEFA",
       "name": "Project Four",
       "selected": true
     },
     {
-      "key": "ABCD",
+      "uuid": "ABCD",
       "name": "Project One",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json
index 1092ac3e4e8..6b6fd49358b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json
@@ -2,12 +2,12 @@
   "results":
   [
     {
-      "key": "CDEF",
+      "uuid": "CDEF",
       "name": "Project Three",
       "selected": true
     },
     {
-      "key": "BCDE",
+      "uuid": "BCDE",
       "name": "Project Two",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json
index 978447e76b6..9c803fba2be 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json
@@ -2,17 +2,17 @@
   "results":
   [
     {
-      "key": "DEFA",
+      "uuid": "DEFA",
       "name": "Project Four",
       "selected": true
     },
     {
-      "key": "ABCD",
+      "uuid": "ABCD",
       "name": "Project One",
       "selected": true
     },
     {
-      "key": "CDEF",
+      "uuid": "CDEF",
       "name": "Project Three",
       "selected": true
     }
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json
index daf6e7e6660..28f8cd7b86b 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json
@@ -2,7 +2,7 @@
   "results":
   [
     {
-      "key": "BCDE",
+      "uuid": "BCDE",
       "name": "Project Two",
       "selected": true
     }