SONAR-24021 Invoke method(s) only conditionally

2 files changed, 12 insertions, 9 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringGlobalContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringGlobalContainer.java
index a6193218f31..782eaa9364a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringGlobalContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringGlobalContainer.java
@@ -19,10 +19,10 @@
  */
 package org.sonar.scanner.bootstrap;
 
+import jakarta.annotation.Priority;
 import java.time.Clock;
 import java.util.List;
 import java.util.Map;
-import jakarta.annotation.Priority;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -141,7 +141,9 @@ public class SpringGlobalContainer extends SpringComponentContainer {
     }
     new SpringScannerContainer(this).execute();
 
-    LOG.info("Analysis total time: {}", formatTime(System.currentTimeMillis() - startTime));
+    if (LOG.isInfoEnabled()) {
+      LOG.info("Analysis total time: {}", formatTime(System.currentTimeMillis() - startTime));
+    }
   }
 
   private void installRequiredPlugins() {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
index c368316f7fb..a0df8c926ed 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/bootstrap/SpringScannerContainer.java
@@ -19,8 +19,8 @@
  */
 package org.sonar.scanner.bootstrap;
 
-import javax.annotation.Nullable;
 import jakarta.annotation.Priority;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.batch.fs.internal.FileMetadata;
@@ -160,10 +160,12 @@ public class SpringScannerContainer extends SpringComponentContainer {
 
   private void addSuffixesDeprecatedProperties() {
     add(
-    /* This is needed to support properly the deprecated sonar.rpg.suffixes property when the download optimization feature is enabled.
-       The value of the property is needed at the preprocessing stage, but being defined by an optional analyzer means that at preprocessing
-       it won't be properly available. This will be removed in SQ 11.0 together with the drop of the property from the rpg analyzer.
-       See SONAR-21514 */
+      /*
+       * This is needed to support properly the deprecated sonar.rpg.suffixes property when the download optimization feature is enabled.
+       * The value of the property is needed at the preprocessing stage, but being defined by an optional analyzer means that at preprocessing
+       * it won't be properly available. This will be removed in SQ 11.0 together with the drop of the property from the rpg analyzer.
+       * See SONAR-21514
+       */
       PropertyDefinition.builder("sonar.rpg.file.suffixes")
         .deprecatedKey("sonar.rpg.suffixes")
         .multiValues(true)
@@ -308,8 +310,7 @@ public class SpringScannerContainer extends SpringComponentContainer {
       GitlabCi.class,
       Jenkins.class,
       SemaphoreCi.class,
-      TravisCi.class
-    );
+      TravisCi.class);
 
     add(GitScmSupport.getObjects());
     add(SvnScmSupport.getObjects());