aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantoine.vinot <antoine.vinot@sonarsource.com>2025-01-10 11:47:50 +0100
committerAntoine Vinot <antoine.vinot@sonarsource.com>2025-01-10 12:08:40 +0100
commit41a1e1d7e67d81cb566ba75e9a4a5ee91b95309e (patch)
tree2d7139af2b0449ab35b7dc92dae7c2e1cdb0f571
parent4b01d1b8d0d0c9d217fd466484cda461bf548a13 (diff)
downloadsonar-scanner-cli-41a1e1d7e67d81cb566ba75e9a4a5ee91b95309e.tar.gz
sonar-scanner-cli-41a1e1d7e67d81cb566ba75e9a4a5ee91b95309e.zip
SCANCLI-165 Remove Redundant loggin as moved to the Scanner Java Library
-rw-r--r--src/main/java/org/sonarsource/scanner/cli/Main.java11
-rw-r--r--src/test/java/org/sonarsource/scanner/cli/MainTest.java26
2 files changed, 0 insertions, 37 deletions
diff --git a/src/main/java/org/sonarsource/scanner/cli/Main.java b/src/main/java/org/sonarsource/scanner/cli/Main.java
index b103418..fe53f1c 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Main.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Main.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonarsource.scanner.lib.ScannerEngineBootstrapper;
-import org.sonarsource.scanner.lib.ScannerEngineFacade;
import org.sonarsource.scanner.lib.ScannerProperties;
/**
@@ -73,7 +72,6 @@ public class Main {
configureLogging(p);
init(p);
try (var engine = scannerEngineBootstrapper.bootstrap()) {
- logServerType(engine);
var success = engine.analyze((Map) p);
if (success) {
displayExecutionResult(stats, "SUCCESS");
@@ -92,15 +90,6 @@ public class Main {
}
}
- private static void logServerType(ScannerEngineFacade engine) {
- if (engine.isSonarCloud()) {
- LOG.info("Communicating with SonarCloud");
- } else {
- String serverVersion = engine.getServerVersion();
- LOG.info("Communicating with SonarQube Server {}", serverVersion);
- }
- }
-
private void checkSkip(Properties properties) {
if ("true".equalsIgnoreCase(properties.getProperty(ScannerProperties.SKIP))) {
LOG.info("SonarScanner CLI analysis skipped");
diff --git a/src/test/java/org/sonarsource/scanner/cli/MainTest.java b/src/test/java/org/sonarsource/scanner/cli/MainTest.java
index 36e21a4..746f5c9 100644
--- a/src/test/java/org/sonarsource/scanner/cli/MainTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/MainTest.java
@@ -227,32 +227,6 @@ class MainTest {
}
@Test
- void shouldLogServerVersion() {
- when(engine.isSonarCloud()).thenReturn(false);
- when(engine.getServerVersion()).thenReturn("5.5");
- Properties p = new Properties();
- when(cli.isDisplayVersionOnly()).thenReturn(true);
- when(cli.getInvokedFrom()).thenReturn("");
- when(conf.properties()).thenReturn(p);
-
- Main main = new Main(exit, cli, conf, scannerEngineBootstrapperFactory);
- main.analyze();
- assertThat(logTester.logs(Level.INFO)).contains("Communicating with SonarQube Server 5.5");
- }
-
- @Test
- void should_log_SonarCloud_server() {
- when(engine.isSonarCloud()).thenReturn(true);
- Properties p = new Properties();
- when(conf.properties()).thenReturn(p);
- when(cli.getInvokedFrom()).thenReturn("");
-
- Main main = new Main(exit, cli, conf, scannerEngineBootstrapperFactory);
- main.analyze();
- assertThat(logTester.logs(Level.INFO)).contains("Communicating with SonarCloud");
- }
-
- @Test
void should_configure_logging() {
Properties analysisProps = testLogging("sonar.verbose", "true");
assertThat(analysisProps.getProperty("sonar.verbose")).isEqualTo("true");