Fix definition of core component qualifiers

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 847b5234a228c190766fe322166e0977720a92dc..fc5d6d50cab989a63659b1c89b789e780b27dc5f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -343,7 +343,7 @@ public class PlatformLevel4 extends PlatformLevel {
       DistributionAreaChart.class,
       Views.class,
       ResourceTypes.class,
-      DefaultResourceTypes.class,
+      DefaultResourceTypes.get(),
       SettingsChangeNotifier.class,
       PageDecorations.class,
       DefaultResourcePermissions.class,

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
index f679ae3f8ce5cbe9fc0728879c6fbf5fdd497e62..5dd2b76f8b59ad1d6c3dbafa2ce9b0bee7a49124 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchComponents.java
@@ -84,7 +84,7 @@ public class BatchComponents {
 
   public static Collection all(DefaultAnalysisMode analysisMode) {
     List components = Lists.newArrayList(
-      DefaultResourceTypes.class,
+      DefaultResourceTypes.get(),
 
       // Maven
       MavenProjectBootstrapper.class, MavenProjectConverter.class, MavenProjectBuilder.class,

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java
index 76e880536099f758f6edcb54ade5ea7e8ad16740..fcd6ffdab73da7a4b057bd839c8a8d66277c138b 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourceTypes.java
@@ -19,9 +19,7 @@
  */
 package org.sonar.core.resource;
 
-import org.sonar.api.ExtensionProvider;
 import org.sonar.api.batch.BatchSide;
-import org.sonar.api.batch.InstantiationStrategy;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.ResourceType;
 import org.sonar.api.resources.ResourceTypeTree;
@@ -29,16 +27,17 @@ import org.sonar.api.server.ServerSide;
 
 @BatchSide
 @ServerSide
-@InstantiationStrategy(InstantiationStrategy.PER_BATCH)
-public final class DefaultResourceTypes extends ExtensionProvider {
+public final class DefaultResourceTypes {
 
   private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
   private static final String CONFIGURABLE = "configurable";
   private static final String UPDATABLE_KEY = "updatable_key";
 
-  @Override
-  public ResourceTypeTree provide() {
+  private DefaultResourceTypes() {
+    // only static methods
+  }
 
+  public static ResourceTypeTree get() {
     return ResourceTypeTree.builder()
       .addType(ResourceType.builder(Qualifiers.PROJECT)
         .setProperty("deletable", true)

diff --git a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java
index ed418b96709ac6bcb46396b171ce62d4c1e95074..a09303ff2b9699845ab4a9de8ca032d7db12a14a 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/resource/DefaultResourceTypesTest.java
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class DefaultResourceTypesTest {
   @Test
   public void provide_types() {
-    ResourceTypeTree tree = new DefaultResourceTypes().provide();
+    ResourceTypeTree tree = DefaultResourceTypes.get();
 
     assertThat(tree.getTypes()).hasSize(7);
     assertThat(tree.getChildren(Qualifiers.PROJECT)).containsExactly(Qualifiers.MODULE);
@@ -37,7 +37,7 @@ public class DefaultResourceTypesTest {
 
   @Test
   public void projects_should_be_available_for_global_widgets() {
-    ResourceTypeTree tree = new DefaultResourceTypes().provide();
+    ResourceTypeTree tree = DefaultResourceTypes.get();
 
     ResourceType projectResourceType = tree.getTypes().get(0);