Removal of deprecated ProjectBootstrapper

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 acf0515fbf5ab15e8f48a9976b96a276018b5869..4bf47a5b97057c29e2f1694d69adf2b5ce3781eb 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
@@ -42,7 +42,7 @@ public class BatchComponents {
     // only static stuff
   }
 
-  public static Collection<Object> all(GlobalMode analysisMode) {
+  public static Collection<Object> all() {
     List<Object> components = Lists.newArrayList(
       DefaultResourceTypes.get(),
       // SCM

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
index aa4f22e4e1e2290bf1fa36e0754c211756b7186a..d70dd788f57941be641338c4e7bfd5f4fbdc65e7 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/ExtensionInstaller.java
@@ -34,18 +34,16 @@ public class ExtensionInstaller {
 
   private final PluginRepository pluginRepository;
   private final EnvironmentInformation env;
-  private final GlobalMode globalMode;
 
-  public ExtensionInstaller(PluginRepository pluginRepository, EnvironmentInformation env, GlobalMode globalMode) {
+  public ExtensionInstaller(PluginRepository pluginRepository, EnvironmentInformation env) {
     this.pluginRepository = pluginRepository;
     this.env = env;
-    this.globalMode = globalMode;
   }
 
   public ExtensionInstaller install(ComponentContainer container, ExtensionMatcher matcher) {
 
     // core components
-    for (Object o : BatchComponents.all(globalMode)) {
+    for (Object o : BatchComponents.all()) {
       doInstall(container, matcher, null, o);
     }
 

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java b/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
index a77fab56223b91e5729d4f4cb3f52ce16c61a8e9..3cd6d8ff142b467b7a0c7e8631b14cca4a72d21f 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/MutableProjectReactorProvider.java
@@ -22,38 +22,18 @@ package org.sonar.batch.scan;
 import org.apache.commons.io.FileUtils;
 import org.sonar.batch.analysis.AnalysisProperties;
 import org.picocontainer.injectors.ProviderAdapter;
-import org.sonar.api.batch.bootstrap.ProjectBootstrapper;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
 
-import javax.annotation.Nullable;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
 public class MutableProjectReactorProvider extends ProviderAdapter {
-
-  private final ProjectBootstrapper projectBootstrapper;
   private ProjectReactor reactor = null;
 
-  public MutableProjectReactorProvider(@Nullable ProjectBootstrapper projectBootstrapper) {
-    this.projectBootstrapper = projectBootstrapper;
-  }
-
   public ProjectReactor provide(ProjectReactorBuilder builder, AnalysisProperties settings) {
     if (reactor == null) {
-      // Look for a deprecated custom ProjectBootstrapper for old versions of SQ Runner
-      if (projectBootstrapper == null
-        // Starting from Maven plugin 2.3 then only DefaultProjectBootstrapper should be used.
-        || "true".equals(settings.property("sonar.mojoUseRunner"))) {
-        // Use default SonarRunner project bootstrapper
-        reactor = builder.execute();
-      } else {
-        reactor = projectBootstrapper.bootstrap();
-      }
-      if (reactor == null) {
-        throw new IllegalStateException(projectBootstrapper + " has returned null as ProjectReactor");
-      }
+      reactor = builder.execute();
       cleanDirectory(reactor.getRoot().getWorkDir());
     }
     return reactor;

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
index e31f14a104e1e0579ba9c41109489838b24e1384..c8ddc3d869e1006b859ba876655e4809eb298d97 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java
@@ -34,7 +34,6 @@ import org.sonar.batch.issue.DefaultIssueCallback;
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.InstantiationStrategy;
-import org.sonar.api.batch.bootstrap.ProjectBootstrapper;
 import org.sonar.api.config.Settings;
 import org.sonar.api.resources.Languages;
 import org.sonar.api.resources.Project;
@@ -131,7 +130,7 @@ public class ProjectScanContainer extends ComponentContainer {
       props,
       DefaultAnalysisMode.class,
       projectReactorBuilder(),
-      new MutableProjectReactorProvider(getComponentByType(ProjectBootstrapper.class)),
+      new MutableProjectReactorProvider(),
       new ImmutableProjectReactorProvider(),
       ProjectBuildersExecutor.class,
       ProjectLock.class,

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBootstrapper.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBootstrapper.java
deleted file mode 100644 (file)
index eb4f3e8..0000000
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectBootstrapper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonar.api.batch.bootstrap;
-
-import org.sonar.api.batch.BatchSide;
-import org.sonar.api.ExtensionPoint;
-
-/**
- * This extension point initializes the project structure. It is extended by batch bootstrappers
- * like sonar-runner or Maven plugin. It is not supposed to be used by standard plugins (.NET, ...).
- * Some use-cases :
- * <ul>
- *   <li>Maven Plugins defines project structure from pom.xml</li>
- *   <li>Sonar Runner defines project from sonar-runner.properties</li>
- * </ul>
- * Only one instance is allowed per environment.
- *
- * @since 3.7
- * @deprecated since 4.3 All bootstrappers should use SQ Runner API and provide a set of properties
- */
-@Deprecated
-@BatchSide
-@ExtensionPoint
-public interface ProjectBootstrapper {
-
-  /**
-   * Implement this method to create project reactor
-   */
-  ProjectReactor bootstrap();
-
-}