Scanner cleanup

* Fail fast when a WS call is made in medium test mode
* Rename many Batch* -> Scanner*

sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java

@@ -136,7 +136,7 @@ public Batch executeTask(Map<String, String> analysisProperties, IssueListener i
 
   private void checkStarted() {
     if (!started) {
-      throw new IllegalStateException("Batch is not started. Unable to execute task.");
+      throw new IllegalStateException("Scanner engine is not started. Unable to execute task.");
     }
   }
 

sonar-scanner-engine/src/main/java/org/sonar/scanner/analysis/DefaultAnalysisMode.java

@@ -26,7 +26,6 @@
 import org.sonar.api.CoreProperties;
 import org.sonar.scanner.bootstrap.AbstractAnalysisMode;
 import org.sonar.scanner.bootstrap.GlobalProperties;
-import org.sonar.scanner.mediumtest.FakePluginInstaller;
 
 /**
  * @since 4.0
@@ -36,17 +35,12 @@ public class DefaultAnalysisMode extends AbstractAnalysisMode {
   private static final Logger LOG = LoggerFactory.getLogger(DefaultAnalysisMode.class);
   private static final String KEY_SCAN_ALL = "sonar.scanAllFiles";
 
-  private boolean mediumTestMode;
   private boolean scanAllFiles;
 
   public DefaultAnalysisMode(GlobalProperties globalProps, AnalysisProperties props) {
     init(globalProps.properties(), props.properties());
   }
 
-  public boolean isMediumTest() {
-    return mediumTestMode;
-  }
-
   public boolean scanAllFiles() {
     return scanAllFiles;
   }
@@ -67,7 +61,7 @@ private void load(Map<String, String> globalProps, Map<String, String> analysisP
     String mode = getPropertyWithFallback(analysisProps, globalProps, CoreProperties.ANALYSIS_MODE);
     validate(mode);
     issues = CoreProperties.ANALYSIS_MODE_ISSUES.equals(mode) || CoreProperties.ANALYSIS_MODE_PREVIEW.equals(mode);
-    mediumTestMode = "true".equals(getPropertyWithFallback(analysisProps, globalProps, FakePluginInstaller.MEDIUM_TEST_ENABLED));
+    mediumTestMode = "true".equals(getPropertyWithFallback(analysisProps, globalProps, MEDIUM_TEST_ENABLED));
     String scanAllStr = getPropertyWithFallback(analysisProps, globalProps, KEY_SCAN_ALL);
     scanAllFiles = !issues || "true".equals(scanAllStr);
   }

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/AbstractAnalysisMode.java

@@ -19,18 +19,19 @@
  */
 package org.sonar.scanner.bootstrap;
 
+import java.util.Arrays;
 import org.apache.commons.lang.StringUtils;
 import org.sonar.api.CoreProperties;
-
-import java.util.Arrays;
-
 import org.sonar.api.batch.AnalysisMode;
 
 public abstract class AbstractAnalysisMode implements AnalysisMode {
+
   private static final String[] VALID_MODES = {CoreProperties.ANALYSIS_MODE_PREVIEW, CoreProperties.ANALYSIS_MODE_PUBLISH, CoreProperties.ANALYSIS_MODE_ISSUES};
+  public static final String MEDIUM_TEST_ENABLED = "sonar.mediumTest.enabled";
 
   protected boolean preview;
   protected boolean issues;
+  protected boolean mediumTestMode;
 
   protected AbstractAnalysisMode() {
   }
@@ -50,6 +51,10 @@ public boolean isPublish() {
     return !preview && !issues;
   }
 
+  public boolean isMediumTest() {
+    return mediumTestMode;
+  }
+
   protected static void validate(String mode) {
     if (StringUtils.isEmpty(mode)) {
       return;

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalContainer.java

@@ -73,18 +73,18 @@ private void addBootstrapComponents() {
     Version apiVersion = ApiVersion.load(System2.INSTANCE);
     add(
       // plugins
-      BatchPluginRepository.class,
+      ScannerPluginRepository.class,
       PluginLoader.class,
       PluginClassloaderFactory.class,
-      BatchPluginJarExploder.class,
-      BatchPluginPredicate.class,
+      ScannerPluginJarExploder.class,
+      ScannerPluginPredicate.class,
       ExtensionInstaller.class,
 
       new SonarQubeVersion(apiVersion),
       SonarRuntimeImpl.forSonarQube(apiVersion, SonarQubeSide.SCANNER),
       StoragesManager.class,
       GlobalSettings.class,
-      new BatchWsClientProvider(),
+      new ScannerWsClientProvider(),
       DefaultServer.class,
       new GlobalTempFolderProvider(),
       DefaultHttpDownloader.class,
@@ -93,7 +93,7 @@ private void addBootstrapComponents() {
       System2.INSTANCE,
       new GlobalRepositoriesProvider(),
       UuidFactoryImpl.INSTANCE);
-    addIfMissing(BatchPluginInstaller.class, PluginInstaller.class);
+    addIfMissing(ScannerPluginInstaller.class, PluginInstaller.class);
     addIfMissing(DefaultGlobalRepositoriesLoader.class, GlobalRepositoriesLoader.class);
   }
 

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/GlobalMode.java

@@ -30,13 +30,17 @@ public GlobalMode(GlobalProperties props) {
     String mode = props.property(CoreProperties.ANALYSIS_MODE);
     validate(mode);
     issues = CoreProperties.ANALYSIS_MODE_ISSUES.equals(mode) || CoreProperties.ANALYSIS_MODE_PREVIEW.equals(mode);
-
+    mediumTestMode = "true".equals(props.property(MEDIUM_TEST_ENABLED));
     if (preview) {
       LOG.debug("Preview global mode");
     } else if (issues) {
       LOG.debug("Issues global mode");
     } else {
       LOG.debug("Publish global mode");
     }
+    if (mediumTestMode) {
+      LOG.info("Medium test mode");
+    }
   }
+
 }

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/PluginInstaller.java

@@ -36,7 +36,7 @@ public interface PluginInstaller {
 
   /**
    * Used only by tests.
-   * @see org.sonar.scanner.mediumtest.BatchMediumTester
+   * @see org.sonar.scanner.mediumtest.ScannerMediumTester
    */
   Map<String, Plugin> installLocals();
 }

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchExtensionDictionnary.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerExtensionDictionnary.java

@@ -53,15 +53,15 @@
 /**
  * @since 2.6
  */
-public class BatchExtensionDictionnary {
+public class ScannerExtensionDictionnary {
 
   private final ComponentContainer componentContainer;
   private final SensorContext sensorContext;
   private final SensorOptimizer sensorOptimizer;
   private final PostJobContext postJobContext;
   private final PostJobOptimizer postJobOptimizer;
 
-  public BatchExtensionDictionnary(ComponentContainer componentContainer, DefaultSensorContext sensorContext, SensorOptimizer sensorOptimizer, PostJobContext postJobContext,
+  public ScannerExtensionDictionnary(ComponentContainer componentContainer, DefaultSensorContext sensorContext, SensorOptimizer sensorOptimizer, PostJobContext postJobContext,
     PostJobOptimizer postJobOptimizer) {
     this.componentContainer = componentContainer;
     this.sensorContext = sensorContext;

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginInstaller.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginInstaller.java

@@ -50,16 +50,16 @@
  * Downloads the plugins installed on server and stores them in a local user cache
  * (see {@link FileCacheProvider}).
  */
-public class BatchPluginInstaller implements PluginInstaller {
+public class ScannerPluginInstaller implements PluginInstaller {
 
-  private static final Logger LOG = Loggers.get(BatchPluginInstaller.class);
+  private static final Logger LOG = Loggers.get(ScannerPluginInstaller.class);
   private static final String PLUGINS_INDEX_URL = "/deploy/plugins/index.txt";
 
   private final FileCache fileCache;
-  private final BatchPluginPredicate pluginPredicate;
-  private final BatchWsClient wsClient;
+  private final ScannerPluginPredicate pluginPredicate;
+  private final ScannerWsClient wsClient;
 
-  public BatchPluginInstaller(BatchWsClient wsClient, FileCache fileCache, BatchPluginPredicate pluginPredicate) {
+  public ScannerPluginInstaller(ScannerWsClient wsClient, FileCache fileCache, ScannerPluginPredicate pluginPredicate) {
     this.fileCache = fileCache;
     this.pluginPredicate = pluginPredicate;
     this.wsClient = wsClient;
@@ -89,7 +89,7 @@ private Map<String, PluginInfo> loadPlugins(List<RemotePlugin> remotePlugins) {
 
   /**
    * Returns empty on purpose. This method is used only by tests.
-   * @see org.sonar.scanner.mediumtest.BatchMediumTester
+   * @see org.sonar.scanner.mediumtest.ScannerMediumTester
    */
   @Override
   public Map<String, Plugin> installLocals() {

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginJarExploder.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginJarExploder.java

@@ -34,11 +34,11 @@
 import static org.sonar.core.util.FileUtils.deleteQuietly;
 
 @ScannerSide
-public class BatchPluginJarExploder extends PluginJarExploder {
+public class ScannerPluginJarExploder extends PluginJarExploder {
 
   private final FileCache fileCache;
 
-  public BatchPluginJarExploder(FileCache fileCache) {
+  public ScannerPluginJarExploder(FileCache fileCache) {
     this.fileCache = fileCache;
   }
 

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginPredicate.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginPredicate.java

@@ -41,9 +41,9 @@
  * Filters the plugins to be enabled during analysis
  */
 @ScannerSide
-public class BatchPluginPredicate implements Predicate<String> {
+public class ScannerPluginPredicate implements Predicate<String> {
 
-  private static final Logger LOG = Loggers.get(BatchPluginPredicate.class);
+  private static final Logger LOG = Loggers.get(ScannerPluginPredicate.class);
 
   private static final String BUILDBREAKER_PLUGIN_KEY = "buildbreaker";
   private static final Joiner COMMA_JOINER = Joiner.on(", ");
@@ -52,7 +52,7 @@ public class BatchPluginPredicate implements Predicate<String> {
   private final Set<String> blacks = newHashSet();
   private final GlobalMode mode;
 
-  public BatchPluginPredicate(Settings settings, GlobalMode mode) {
+  public ScannerPluginPredicate(Settings settings, GlobalMode mode) {
     this.mode = mode;
     if (mode.isPreview() || mode.isIssues()) {
       // These default values are not supported by Settings because the class CorePlugin

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchPluginRepository.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginRepository.java

@@ -34,16 +34,16 @@
 /**
  * Orchestrates the installation and loading of plugins
  */
-public class BatchPluginRepository implements PluginRepository, Startable {
-  private static final Logger LOG = Loggers.get(BatchPluginRepository.class);
+public class ScannerPluginRepository implements PluginRepository, Startable {
+  private static final Logger LOG = Loggers.get(ScannerPluginRepository.class);
 
   private final PluginInstaller installer;
   private final PluginLoader loader;
 
   private Map<String, Plugin> pluginInstancesByKeys;
   private Map<String, PluginInfo> infosByKeys;
 
-  public BatchPluginRepository(PluginInstaller installer, PluginLoader loader) {
+  public ScannerPluginRepository(PluginInstaller installer, PluginLoader loader) {
     this.installer = installer;
     this.loader = loader;
   }

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClient.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerWsClient.java

@@ -21,6 +21,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -43,16 +44,18 @@
 import static java.net.HttpURLConnection.HTTP_FORBIDDEN;
 import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
 
-public class BatchWsClient {
+public class ScannerWsClient {
 
-  private static final Logger LOG = Loggers.get(BatchWsClient.class);
+  private static final Logger LOG = Loggers.get(ScannerWsClient.class);
 
   private final WsClient target;
   private final boolean hasCredentials;
+  private final GlobalMode globalMode;
 
-  public BatchWsClient(WsClient target, boolean hasCredentials) {
+  public ScannerWsClient(WsClient target, boolean hasCredentials, GlobalMode globalMode) {
     this.target = target;
     this.hasCredentials = hasCredentials;
+    this.globalMode = globalMode;
   }
 
   /**
@@ -65,6 +68,7 @@ public BatchWsClient(WsClient target, boolean hasCredentials) {
    * @throws HttpException if the response code is not in range [200..300)
    */
   public WsResponse call(WsRequest request) {
+    Preconditions.checkState(!globalMode.isMediumTest(), "No WS call should be made in medium test mode");
     Profiler profiler = Profiler.createIfDebug(LOG).start();
     WsResponse response = target.wsConnector().call(request);
     profiler.stopDebug(format("%s %d %s", request.getMethod(), response.code(), response.requestUrl()));

sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/BatchWsClientProvider.java → sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerWsClientProvider.java

@@ -31,15 +31,15 @@
 import static org.apache.commons.lang.StringUtils.defaultIfBlank;
 
 @ScannerSide
-public class BatchWsClientProvider extends ProviderAdapter {
+public class ScannerWsClientProvider extends ProviderAdapter {
 
   static final int CONNECT_TIMEOUT_MS = 5_000;
   static final String READ_TIMEOUT_SEC_PROPERTY = "sonar.ws.timeout";
   static final int DEFAULT_READ_TIMEOUT_SEC = 60;
 
-  private BatchWsClient wsClient;
+  private ScannerWsClient wsClient;
 
-  public synchronized BatchWsClient provide(final GlobalProperties settings, final EnvironmentInformation env) {
+  public synchronized ScannerWsClient provide(final GlobalProperties settings, final EnvironmentInformation env, GlobalMode globalMode) {
     if (wsClient == null) {
       String url = defaultIfBlank(settings.property("sonar.host.url"), CoreProperties.SERVER_BASE_URL_DEFAULT_VALUE);
       HttpConnector.Builder connectorBuilder = HttpConnector.newBuilder();
@@ -59,7 +59,7 @@ public synchronized BatchWsClient provide(final GlobalProperties settings, final
         connectorBuilder.proxyCredentials(proxyUser, System.getProperty("http.proxyPassword"));
       }
 
-      wsClient = new BatchWsClient(WsClientFactories.getDefault().newClient(connectorBuilder.build()), login != null);
+      wsClient = new ScannerWsClient(WsClientFactories.getDefault().newClient(connectorBuilder.build()), login != null, globalMode);
     }
     return wsClient;
   }

sonar-scanner-engine/src/main/java/org/sonar/scanner/issue/tracking/DefaultServerLineHashesLoader.java

@@ -29,13 +29,13 @@
 import org.apache.commons.io.IOUtils;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.api.utils.log.Profiler;
-import org.sonar.scanner.bootstrap.BatchWsClient;
+import org.sonar.scanner.bootstrap.ScannerWsClient;
 import org.sonar.scanner.util.BatchUtils;
 
 public class DefaultServerLineHashesLoader implements ServerLineHashesLoader {
-  private BatchWsClient wsClient;
+  private ScannerWsClient wsClient;
 
-  public DefaultServerLineHashesLoader(BatchWsClient wsClient) {
+  public DefaultServerLineHashesLoader(ScannerWsClient wsClient) {
     this.wsClient = wsClient;
   }
 

sonar-scanner-engine/src/main/java/org/sonar/scanner/mediumtest/FakePluginInstaller.java

@@ -27,7 +27,6 @@
 import org.sonar.scanner.bootstrap.PluginInstaller;
 
 public class FakePluginInstaller implements PluginInstaller {
-  public static final String MEDIUM_TEST_ENABLED = "sonar.mediumTest.enabled";
 
   private final Map<String, PluginInfo> infosByKeys = new HashMap<>();
   private final Map<String, Plugin> instancesByKeys = new HashMap<>();