From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Wed, 20 May 2015 08:31:54 +0000 (+0200)
Subject: Fix creation of component key
X-Git-Tag: 5.2-RC1~1900
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=895b846371f62c9cdf8bbc7f47fc921ea72614ff;p=sonarqube.git

Fix creation of component key
---

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java
index e93deaf797a..ebd7c15b209 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistDuplicationsStepTest.java
@@ -344,7 +344,7 @@ public class PersistDuplicationsStepTest extends BaseStepTest {
     Map<String, Object> dto = dbTester.selectFirst("select snapshot_id as \"snapshotId\", text_value as \"textValue\" from project_measures");
     assertThat(dto.get("snapshotId")).isEqualTo(11L);
     assertThat(dto.get("textValue")).isEqualTo(
-      "<duplications><g><b s=\"1\" l=\"5\" r=\"PROJECT_KEY:file:origin/master\"/><b s=\"6\" l=\"5\" r=\"PROJECT_KEY:file:origin/master\"/></g></duplications>");
+      "<duplications><g><b s=\"1\" l=\"5\" r=\"PROJECT_KEY:origin/master:file\"/><b s=\"6\" l=\"5\" r=\"PROJECT_KEY:origin/master:file\"/></g></duplications>");
   }
 
   @Test
diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
index 8378da72d25..c9dd6d1e78e 100644
--- a/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentKeys.java
@@ -131,11 +131,7 @@ public final class ComponentKeys {
   }
 
   public static String createKey(String moduleKey, @Nullable String path, @Nullable String branch) {
-    String effectiveKey = createEffectiveKey(moduleKey, path);
-    if (StringUtils.isNotBlank(branch)) {
-      return String.format(KEY_WITH_BRANCH_FORMAT, effectiveKey, branch);
-    } else {
-      return effectiveKey;
-    }
+    String key = createKey(moduleKey, branch);
+    return createEffectiveKey(key, path);
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java b/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
index 37fd8d45777..85d64836846 100644
--- a/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/component/ComponentKeysTest.java
@@ -43,7 +43,7 @@ public class ComponentKeysTest {
 
   @Test
   public void create_key_from_module_key_path_and_branch() {
-    assertThat(ComponentKeys.createKey("module_key", "file", "origin/master")).isEqualTo("module_key:file:origin/master");
+    assertThat(ComponentKeys.createKey("module_key", "file", "origin/master")).isEqualTo("module_key:origin/master:file");
     assertThat(ComponentKeys.createKey("module_key", "file", null)).isEqualTo("module_key:file");
     assertThat(ComponentKeys.createKey("module_key", null, null)).isEqualTo("module_key");
   }