diff options
3 files changed, 4 insertions, 10 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java index 2386030a5b9..c331932594d 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java @@ -31,7 +31,7 @@ import org.sonar.api.resources.ResourceTypeTree; public final class DefaultResourceTypes extends ExtensionProvider implements BatchExtension, ServerExtension { private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters"; - private static final String CONFIGURABLE = "configurable";; + private static final String CONFIGURABLE = "configurable"; private static final String UPDATABLE_KEY = "updatable_key"; @Override @@ -56,15 +56,10 @@ public final class DefaultResourceTypes extends ExtensionProvider implements Bat .addType(ResourceType.builder(Qualifiers.DIRECTORY) .setProperty(SUPPORTS_MEASURE_FILTERS, true) .build()) - .addType(ResourceType.builder(Qualifiers.PACKAGE) - .build()) .addType(ResourceType.builder(Qualifiers.FILE) .hasSourceCode() .setProperty(SUPPORTS_MEASURE_FILTERS, true) .build()) - .addType(ResourceType.builder(Qualifiers.CLASS) - .hasSourceCode() - .build()) .addType(ResourceType.builder(Qualifiers.UNIT_TEST_FILE) .hasSourceCode() .setProperty(SUPPORTS_MEASURE_FILTERS, true) @@ -73,7 +68,6 @@ public final class DefaultResourceTypes extends ExtensionProvider implements Bat .addRelations(Qualifiers.PROJECT, Qualifiers.MODULE) .addRelations(Qualifiers.MODULE, Qualifiers.DIRECTORY, Qualifiers.PACKAGE) .addRelations(Qualifiers.DIRECTORY, Qualifiers.FILE, Qualifiers.UNIT_TEST_FILE) - .addRelations(Qualifiers.PACKAGE, Qualifiers.CLASS, Qualifiers.UNIT_TEST_FILE) .build(); } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java index 4862afe60c3..c7feb8b2bc3 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/DefaultResourceTypesTest.java @@ -29,10 +29,10 @@ import static org.fest.assertions.Assertions.assertThat; public class DefaultResourceTypesTest { @Test - public void should_provide() { + public void provide_types() { ResourceTypeTree tree = new DefaultResourceTypes().provide(); - assertThat(tree.getTypes()).hasSize(7); + assertThat(tree.getTypes()).hasSize(5); assertThat(tree.getChildren(Qualifiers.PROJECT)).containsExactly(Qualifiers.MODULE); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java b/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java index 34e510525df..a9b1a9bd058 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java +++ b/sonar-batch/src/main/java/org/sonar/batch/source/HighlightableBuilder.java @@ -36,7 +36,7 @@ import java.util.Set; */ public class HighlightableBuilder extends PerspectiveBuilder<Highlightable> { - private static final Set<String> SUPPORTED_QUALIFIERS = ImmutableSet.of(Qualifiers.FILE, Qualifiers.CLASS, Qualifiers.UNIT_TEST_FILE); + private static final Set<String> SUPPORTED_QUALIFIERS = ImmutableSet.of(Qualifiers.FILE, Qualifiers.UNIT_TEST_FILE); private final ComponentDataCache cache; public HighlightableBuilder(ComponentDataCache cache) { |