From 3c664c31994c3e93f40e395f7b8339e8fa43ae11 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 17 Mar 2014 15:44:09 +0100 Subject: [PATCH] Remove Component.moduleKey --- .../org/sonar/core/component/ComponentDto.java | 16 ---------------- .../sonar/core/component/ComponentVertex.java | 5 ----- .../sonar/core/component/ResourceComponent.java | 9 --------- .../org/sonar/core/resource/ResourceDao.java | 1 - .../org/sonar/core/resource/ResourceDto.java | 10 ---------- .../org/sonar/core/resource/ResourceMapper.xml | 7 ++----- .../core/component/ComponentVertexTest.java | 1 - .../core/component/ResourceComponentTest.java | 1 - .../org/sonar/core/resource/ResourceDaoTest.java | 3 --- .../java/org/sonar/api/component/Component.java | 8 -------- .../sonar/api/component/mock/MockSourceFile.java | 5 ----- .../java/org/sonar/api/resources/Project.java | 5 ----- 12 files changed, 2 insertions(+), 69 deletions(-) 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 ea287b50d3e..20f893145d6 100644 --- 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 7f3b65dd55e..a4bbdbed638 100644 --- 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 6ae69cb3d3c..a818164409e 100644 --- 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 9196f989db2..f68ebc61fb5 100644 --- 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 c0831aa8e99..93dff81318e 100644 --- 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 6af9cbefeb2..73ea46711a8 100644 --- 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 @@ - @@ -69,8 +68,7 @@ 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 eba9be60b8b..5a4a608ca9c 100644 --- 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 218b048948d..aa83169c91a 100644 --- 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 cbceab126b2..4de4f062024 100644 --- 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 1c0a3153f86..e68ed4cfa42 100644 --- 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 { @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 66741f62436..1c6e70a7863 100644 --- 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 3b64635aa50..7eafff80610 100644 --- 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(); -- 2.39.5