From 7839d6e3c8fd4045efca1b4cb76db0709189965f Mon Sep 17 00:00:00 2001
From: Matteo Mara <matteo.mara@sonarsource.com>
Date: Mon, 18 Dec 2023 17:25:34 +0100
Subject: SONAR-21197 add a property to enable the download of the required
 plugins only

---
 .../org/sonar/scanner/bootstrap/ScannerPluginRepository.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'sonar-scanner-engine/src/main/java')

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginRepository.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginRepository.java
index 6b875da7620..fb2834604f6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginRepository.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/ScannerPluginRepository.java
@@ -40,6 +40,7 @@ import org.sonar.scanner.mediumtest.LocalPlugin;
 
 import static java.util.stream.Collectors.toMap;
 import static org.sonar.api.utils.Preconditions.checkState;
+import static org.sonar.core.config.ScannerProperties.PLUGIN_LOADING_OPTIMIZATION_KEY;
 
 /**
  * Orchestrates the installation and loading of plugins
@@ -56,7 +57,7 @@ public class ScannerPluginRepository implements PluginRepository, Startable {
   private Map<String, Plugin> pluginInstancesByKeys;
   private Map<String, ScannerPlugin> pluginsByKeys;
   private Map<ClassLoader, String> keysByClassLoader;
-  private boolean shouldLoadAllPluginsOnStart;
+  private boolean shouldLoadOnlyRequiredPluginsOnStart;
 
   public ScannerPluginRepository(PluginInstaller installer, PluginJarExploder pluginJarExploder, PluginClassLoader loader, Configuration properties) {
     this.installer = installer;
@@ -67,9 +68,9 @@ public class ScannerPluginRepository implements PluginRepository, Startable {
 
   @Override
   public void start() {
-    shouldLoadAllPluginsOnStart = properties.getBoolean("sonar.plugins.loadAll").orElse(false);
-    if (shouldLoadAllPluginsOnStart) {
-      LOG.warn("sonar.plugins.loadAll is true, so ALL available plugins will be downloaded");
+    shouldLoadOnlyRequiredPluginsOnStart = properties.getBoolean(PLUGIN_LOADING_OPTIMIZATION_KEY).orElse(true);
+    if (!shouldLoadOnlyRequiredPluginsOnStart) {
+      LOG.warn("{} is false, so ALL available plugins will be downloaded", PLUGIN_LOADING_OPTIMIZATION_KEY);
       pluginsByKeys = new HashMap<>(installer.installAllPlugins());
     } else {
       pluginsByKeys = new HashMap<>(installer.installRequiredPlugins());
@@ -96,7 +97,7 @@ public class ScannerPluginRepository implements PluginRepository, Startable {
   }
 
   public Collection<PluginInfo> installPluginsForLanguages(Set<String> languageKeys) {
-    if (shouldLoadAllPluginsOnStart) {
+    if (!shouldLoadOnlyRequiredPluginsOnStart) {
       return Collections.emptySet();
     }
 
-- 
cgit v1.2.3