Remove Component.moduleKey

diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
index ea287b50d3e313bb1bda6b7dd4a27ae9c14bf4d8..20f893145d60ad4a9325bd0f4211f947c8d84144 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentDto.java
@@ -28,13 +28,7 @@ public class ComponentDto implements Component {
 
   private Long id;
   private String kee;
-
-  // TODO delete it
   private String path;
-
-  // TODO delete it
-  private String moduleKey;
-
   private String name;
   private String longName;
   private String qualifier;
@@ -70,16 +64,6 @@ public class ComponentDto implements Component {
     return this;
   }
 
-  @Override
-  public String moduleKey() {
-    return moduleKey;
-  }
-
-  public ComponentDto setModuleKey(String moduleKey) {
-    this.moduleKey = moduleKey;
-    return this;
-  }
-
   @Override
   public String name() {
     return name;

diff --git a/sonar-core/src/main/java/org/sonar/core/component/ComponentVertex.java b/sonar-core/src/main/java/org/sonar/core/component/ComponentVertex.java
index 7f3b65dd55ef03d69b030a7e3fa4deba025979a6..a4bbdbed6382b8fa8485f758d3c0da98ee40d068 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/component/ComponentVertex.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ComponentVertex.java
@@ -32,10 +32,6 @@ public class ComponentVertex extends BeanVertex implements Component {
     return (String) getProperty("path");
   }
 
-  public String moduleKey() {
-    return (String) getProperty("moduleKey");
-  }
-
   public String name() {
     return (String) getProperty("name");
   }
@@ -51,7 +47,6 @@ public class ComponentVertex extends BeanVertex implements Component {
   void copyFrom(Component component) {
     setProperty("key", component.key());
     setProperty("path", component.path());
-    setProperty("moduleKey", component.moduleKey());
     setProperty("name", component.name());
     setProperty("longName", component.longName());
     setProperty("qualifier", component.qualifier());

diff --git a/sonar-core/src/main/java/org/sonar/core/component/ResourceComponent.java b/sonar-core/src/main/java/org/sonar/core/component/ResourceComponent.java
index 6ae69cb3d3ccfcba5790fbb468f9320beb6cd077..a818164409e0f31c6fd2793ed139a7f07b42f58f 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/component/ResourceComponent.java
+++ b/sonar-core/src/main/java/org/sonar/core/component/ResourceComponent.java
@@ -20,7 +20,6 @@
 package org.sonar.core.component;
 
 import com.google.common.base.Strings;
-import org.apache.commons.lang.StringUtils;
 import org.sonar.api.component.Component;
 import org.sonar.api.database.model.Snapshot;
 import org.sonar.api.resources.Resource;
@@ -30,7 +29,6 @@ import javax.annotation.Nullable;
 public class ResourceComponent implements Component {
   private String key;
   private String path;
-  private String moduleKey;
   private String name;
   private String longName;
   private String qualifier;
@@ -41,8 +39,6 @@ public class ResourceComponent implements Component {
   public ResourceComponent(Resource resource, @Nullable Snapshot snapshot) {
     this.key = resource.getEffectiveKey();
     this.path = resource.getPath();
-    // Kind of a hack as it depends on format of resource effective key
-    this.moduleKey = StringUtils.removeEnd(resource.getEffectiveKey(), ":" + resource.getKey());
     if (Strings.isNullOrEmpty(key)) {
       throw new IllegalArgumentException("Missing component key");
     }
@@ -69,11 +65,6 @@ public class ResourceComponent implements Component {
     return path;
   }
 
-  @Override
-  public String moduleKey() {
-    return moduleKey;
-  }
-
   public String name() {
     return name;
   }

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
index 9196f989db27b604de9277d8451235c266e437e8..f68ebc61fb52bb4a350e763dfb3842acff771b8e 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java
@@ -301,7 +301,6 @@ public class ResourceDao {
     return new ComponentDto()
       .setId(resourceDto.getId())
       .setKey(resourceDto.getKey())
-      .setModuleKey(resourceDto.getModuleKey())
       .setPath(resourceDto.getPath())
       .setLongName(resourceDto.getLongName())
       .setName(resourceDto.getName())

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
index c0831aa8e9918f7de69d7f076a5962fbc846df2b..93dff81318e91018367c182bde66fcda60d16ab5 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDto.java
@@ -29,7 +29,6 @@ public class ResourceDto {
   private String name;
   private String longName;
   private Long rootId;
-  private String moduleKey;
   private String path;
   private String scope;
   private String qualifier;
@@ -94,15 +93,6 @@ public class ResourceDto {
     return this;
   }
 
-  public String getModuleKey() {
-    return moduleKey;
-  }
-
-  public ResourceDto setModuleKey(String s) {
-    this.moduleKey = s;
-    return this;
-  }
-
   public String getLongName() {
     return longName;
   }

diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
index 6af9cbefeb27dad5b3889472b3c43decce7e3f78..73ea46711a8c3346e85ae5546281d7b5ee1520ed 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml
@@ -54,7 +54,6 @@
     <result property="key" column="kee"/>
     <result property="deprecatedKey" column="deprecated_kee"/>
     <result property="path" column="path"/>
-    <result property="moduleKey" column="moduleKey"/>
     <result property="name" column="name"/>
     <result property="longName" column="long_name"/>
     <result property="rootId" column="root_id"/>
@@ -69,8 +68,7 @@
   </resultMap>
 
   <select id="selectResources" parameterType="map" resultMap="resourceResultMap">
-    select p.*, r.kee moduleKey
-    from projects p left outer join projects r on p.root_id=r.id
+    select * from projects p
     <where>
       <if test="qualifiers != null and qualifiers.length!=0">
         and p.qualifier in
@@ -103,8 +101,7 @@
   </select>
 
   <select id="selectResource" parameterType="long" resultMap="resourceResultMap">
-    select p.*, r.kee moduleKey
-    from projects p left outer join projects r on p.root_id=r.id
+    select * from projects p
     where p.id=#{id}
   </select>
 

diff --git a/sonar-core/src/test/java/org/sonar/core/component/ComponentVertexTest.java b/sonar-core/src/test/java/org/sonar/core/component/ComponentVertexTest.java
index eba9be60b8bb6ef55a6254c0123f2693ca76df67..5a4a608ca9c00f5629631def9f6b7babb4f322b9 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/component/ComponentVertexTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/component/ComponentVertexTest.java
@@ -44,7 +44,6 @@ public class ComponentVertexTest {
     assertThat(vertex.name()).isEqualTo("Foo.java");
     assertThat(vertex.qualifier()).isEqualTo(Qualifiers.FILE);
     assertThat(vertex.path()).isEqualTo("src/org/Foo.java");
-    assertThat(vertex.moduleKey()).isEqualTo("myproject");
   }
 
   @Test

diff --git a/sonar-core/src/test/java/org/sonar/core/component/ResourceComponentTest.java b/sonar-core/src/test/java/org/sonar/core/component/ResourceComponentTest.java
index 218b048948dfb9985e17553eb51bf557fe848130..aa83169c91a6b1c56cb0c8636d13137ba87f6dac 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/component/ResourceComponentTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/component/ResourceComponentTest.java
@@ -61,7 +61,6 @@ public class ResourceComponentTest {
   public void should_use_effective_key() {
     ResourceComponent component = new ResourceComponent(file);
     assertThat(component.key()).isEqualTo("myproject:path/to/foo.c");
-    assertThat(component.moduleKey()).isEqualTo("myproject");
   }
 
   @Test

diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
index cbceab126b2e2a65fb517689df90b118d8d187e9..4de4f06202476a1474287afa153a1bca915393e3 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java
@@ -73,7 +73,6 @@ public class ResourceDaoTest extends AbstractDaoTestCase {
     ResourceDto resource = dao.getResource(1L);
 
     assertThat(resource.getPath()).isNull();
-    assertThat(resource.getModuleKey()).isNull();
     assertThat(resource.getName()).isEqualTo("Struts");
     assertThat(resource.getLongName()).isEqualTo("Apache Struts");
     assertThat(resource.getScope()).isEqualTo("PRJ");
@@ -88,11 +87,9 @@ public class ResourceDaoTest extends AbstractDaoTestCase {
 
     ResourceDto dir = dao.getResource(3L);
     assertThat(dir.getPath()).isEqualTo("src/org/struts");
-    assertThat(dir.getModuleKey()).isEqualTo("org.struts:struts-core");
 
     ResourceDto file = dao.getResource(4L);
     assertThat(file.getPath()).isEqualTo("src/org/struts/RequestContext.java");
-    assertThat(file.getModuleKey()).isEqualTo("org.struts:struts-core");
   }
 
   @Test

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
index 1c0a3153f8692113f77cce4e9ac65505e00574e2..e68ed4cfa424668b5fc92c25ad42cf556fea5477 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/Component.java
@@ -32,14 +32,6 @@ public interface Component<C extends Component> {
   @CheckForNull
   String path();
 
-  /**
-   * Key of the module this component belong to.
-   * @return null for components that are module themself
-   * @since 4.2
-   */
-  @CheckForNull
-  String moduleKey();
-
   String name();
 
   String longName();

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java b/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
index 66741f6243641c0297f404981275d4fd9e8f687b..1c6e70a7863da45e9bb1d320ab44ce486aa0960f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/component/mock/MockSourceFile.java
@@ -52,11 +52,6 @@ public class MockSourceFile implements SourceFile {
     return this;
   }
 
-  @Override
-  public String moduleKey() {
-    return moduleKey;
-  }
-
   public MockSourceFile setModuleKey(String moduleKey) {
     this.moduleKey = moduleKey;
     return this;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index 3b64635aa50473f9ead34473b1e46c9f624d98ff..7eafff80610701cdaa2d4f378266fc8e2d6e22ca 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -491,11 +491,6 @@ public class Project extends Resource implements Component {
     return getKey();
   }
 
-  @Override
-  public String moduleKey() {
-    return null;
-  }
-
   @Override
   public String name() {
     return getName();