From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Thu, 22 May 2014 16:50:31 +0000 (+0200)
Subject: SONAR-5007 - Added parentKey to QualityProfileDto
X-Git-Tag: 4.4-RC1~888
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=393195148299c9c27a0440dc2136bd404813fe02;p=sonarqube.git

SONAR-5007 - Added parentKey to QualityProfileDto
---

diff --git a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
index cdf29be0e56..1b6e7aed729 100644
--- a/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/qualityprofile/db/QualityProfileDto.java
@@ -79,6 +79,16 @@ public class QualityProfileDto extends Dto<QualityProfileKey> {
     return parent;
   }
 
+  @CheckForNull
+  public QualityProfileKey getParentKey() {
+    if(getParent() != null && !getParent().isEmpty()) {
+      return QualityProfileKey.of(this.getParent(), this.getLanguage());
+    } else {
+      return null;
+    }
+  }
+
+
   public QualityProfileDto setParent(@Nullable String parent) {
     this.parent = parent;
     return this;
diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java b/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java
index 58b55f9bfb8..1dcedacb505 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/ws/AppAction.java
@@ -175,6 +175,7 @@ public class AppAction implements RequestHandler {
         .prop("name", profile.getName())
         .prop("lang", profile.getLanguage())
         .prop("parent", profile.getParent())
+        .prop("parentKey", profile.getParentKey().toString())
         .endObject();
     }
     json.endArray();