sonar/sonarqube-community-branch-plugin
1
0
Fork 0
mirror of https://github.com/mc1arke/sonarqube-community-branch-plugin.git synced 2024-11-24 08:42:28 +02:00
Code Issues Releases Activity

Remove references to deprecated Sonar logger

Browse Source 
The Sonar logger has been deprecated in favour of SLF4J's Logger and
LoggerFactory, so the references have been replaced throughout the
plugin, and log lines updated to use formats and conditional execution.
Includes fixes to make Pi Test work in the Gradle build.
This commit is contained in:
Michael Clarke 2023-12-30 22:31:03 +00:00 committed by Michael Clarke
parent 18332f6a10
commit b8087c946e
12 changed files with 104 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -20,7 +20,7 @@ plugins {
id('java')
id('jacoco')
id('org.sonarqube') version('2.8')
id('info.solidsoft.pitest') version('1.4.0')
id('info.solidsoft.pitest') version('1.15.0')
id('com.github.johnrengelman.shadow') version('5.1.0')
id('net.researchgate.release') version('2.6.0')
}
@ -134,8 +134,9 @@ tasks.withType(JavaCompile) {
assemble.dependsOn('shadowJar')
pitest {
junit5PluginVersion = '1.2.1'
timestampedReports = false
avoidCallsTo = ['org.sonar.api.utils.log.Logger']
avoidCallsTo = ['org.slf4j.Logger']
}
jacocoTestReport {

10
src/main/java/com/github/mc1arke/sonarqube/plugin/CommunityBranchAgent.java
View File

@ -24,8 +24,8 @@ import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtMethod;
import javassist.NotFoundException;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.core.platform.EditionProvider;
import java.io.IOException;
@ -39,7 +39,7 @@ import java.util.Optional;
public final class CommunityBranchAgent {
private static final Logger LOGGER = Loggers.get(CommunityBranchAgent.class);
private static final Logger LOGGER = LoggerFactory.getLogger(CommunityBranchAgent.class);
private CommunityBranchAgent() {
super();
@ -73,7 +73,7 @@ public final class CommunityBranchAgent {
return byteCode;
}
LOGGER.debug("Transforming class " + targetClassName);
LOGGER.debug("Transforming class {}", targetClassName);
try {
ClassPool cp = ClassPool.getDefault();
CtClass cc = cp.get(targetClassName);
@ -83,7 +83,7 @@ public final class CommunityBranchAgent {
byteCode = cc.toBytecode();
cc.detach();
} catch (NotFoundException | CannotCompileException | IOException e) {
LOGGER.error(String.format("Could not transform class %s, will use default class definition", targetClassName), e);
LOGGER.error("Could not transform class {}}, will use default class definition", targetClassName, e);
}
return byteCode;

35
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/azuredevops/AzureDevopsRestClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Michael Clarke
* Copyright (C) 2021-2023 Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -36,8 +36,8 @@ import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.URLEncoder;
@ -49,7 +49,7 @@ import java.util.function.Supplier;
public class AzureDevopsRestClient implements AzureDevopsClient {
private static final Logger LOGGER = Loggers.get(AzureDevopsRestClient.class);
private static final Logger LOGGER = LoggerFactory.getLogger(AzureDevopsRestClient.class);
private static final String API_VERSION = "4.1";
private static final String API_VERSION_PREVIEW = API_VERSION + "-preview";
@ -143,22 +143,21 @@ public class AzureDevopsRestClient implements AzureDevopsClient {
return;
}
String responseContent = Optional.ofNullable(httpResponse.getEntity()).map(entity -> {
try {
return EntityUtils.toString(entity, StandardCharsets.UTF_8);
} catch (IOException ex) {
LOGGER.warn("Could not decode response entity", ex);
return "";
}
}).orElse("");
LOGGER.atError().setMessage("Azure Devops response status did not match expected value. Expected: 200 {}{}{}{}")
.addArgument(System::lineSeparator)
.addArgument(httpResponse::getStatusLine)
.addArgument(System::lineSeparator)
.addArgument(() -> Optional.ofNullable(httpResponse.getEntity()).map(entity -> {
try {
return EntityUtils.toString(entity, StandardCharsets.UTF_8);
} catch (IOException ex) {
LOGGER.warn("Could not decode response entity", ex);
return "";
}
}).orElse(""))
.log();
LOGGER.error("Azure Devops response status did not match expected value. Expected: 200"
+ System.lineSeparator()
+ httpResponse.getStatusLine().toString()
+ System.lineSeparator()
+ responseContent);
throw new IllegalStateException("An unexpected response code was returned from the Azure Devops API - Expected: 200, Got: " + httpResponse.getStatusLine().getStatusCode());
}

22
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/bitbucket/BitbucketCloudClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Marvin Wichmann, Michael Clarke
* Copyright (C) 2020-2023 Marvin Wichmann, Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,6 +19,7 @@
package com.github.mc1arke.sonarqube.plugin.almclient.bitbucket;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.mc1arke.sonarqube.plugin.almclient.bitbucket.model.AnnotationUploadLimit;
import com.github.mc1arke.sonarqube.plugin.almclient.bitbucket.model.BitbucketConfiguration;
@ -35,8 +36,8 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@ -52,7 +53,7 @@ import static java.lang.String.format;
class BitbucketCloudClient implements BitbucketClient {
private static final Logger LOGGER = Loggers.get(BitbucketCloudClient.class);
private static final Logger LOGGER = LoggerFactory.getLogger(BitbucketCloudClient.class);
private static final MediaType APPLICATION_JSON_MEDIA_TYPE = MediaType.get("application/json");
private static final String TITLE = "SonarQube";
private static final String REPORTER = "SonarQube";
@ -133,7 +134,14 @@ class BitbucketCloudClient implements BitbucketClient {
.build();
LOGGER.info("Creating annotations on bitbucket cloud");
LOGGER.debug("Create annotations: " + objectMapper.writeValueAsString(annotations));
LOGGER.atDebug().setMessage("Create annotations: {}").addArgument(() -> {
try {
return objectMapper.writeValueAsString(annotations);
} catch (JsonProcessingException e) {
return "An error occurred whilst converting annotations to JSON: " + e.getClass().getName() + ": " + e.getMessage();
}
}).log();
try (Response response = okHttpClient.newCall(req).execute()) {
validate(response);
@ -156,8 +164,8 @@ class BitbucketCloudClient implements BitbucketClient {
.url(targetUrl)
.build();
LOGGER.info("Create report on bitbucket cloud: " + targetUrl);
LOGGER.debug("Create report: " + body);
LOGGER.info("Create report on bitbucket cloud: {}", targetUrl);
LOGGER.debug("Create report: {}", body);
try (Response response = okHttpClient.newCall(req).execute()) {
validate(response);

18
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/bitbucket/BitbucketServerClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Mathias Åhsberg, Michael Clarke
* Copyright (C) 2020-2023 Mathias Åhsberg, Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -37,8 +37,8 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.time.Instant;
@ -50,7 +50,7 @@ import java.util.stream.Collectors;
import static java.lang.String.format;
class BitbucketServerClient implements BitbucketClient {
private static final Logger LOGGER = Loggers.get(BitbucketServerClient.class);
private static final Logger LOGGER = LoggerFactory.getLogger(BitbucketServerClient.class);
private static final MediaType APPLICATION_JSON_MEDIA_TYPE = MediaType.get("application/json");
private static final String TITLE = "SonarQube";
private static final String REPORTER = "SonarQube";
@ -140,12 +140,16 @@ class BitbucketServerClient implements BitbucketClient {
public boolean supportsCodeInsights() {
try {
ServerProperties server = getServerProperties();
LOGGER.debug(format("Your Bitbucket Server installation is version %s", server.getVersion()));
LOGGER.atDebug()
.setMessage("Your Bitbucket Server installation is version {}")
.addArgument(server::getVersion)
.log();
if (server.hasCodeInsightsApi()) {
return true;
} else {
LOGGER.info("Bitbucket Server version is to old. %s is the minimum version that supports Code Insights",
ServerProperties.CODE_INSIGHT_VERSION);
LOGGER.atInfo().setMessage("Bitbucket Server version is to old. {} is the minimum version that supports Code Insights")
.addArgument(ServerProperties.CODE_INSIGHT_VERSION)
.log();
}
} catch (IOException e) {
LOGGER.error("Could not determine Bitbucket Server version", e);

8
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/bitbucket/DefaultBitbucketClientFactory.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Marvin Wichmann, Michael Clarke
* Copyright (C) 2020-2023 Marvin Wichmann, Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -28,11 +28,11 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.logging.HttpLoggingInterceptor;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.ce.ComputeEngineSide;
import org.sonar.api.config.internal.Settings;
import org.sonar.api.server.ServerSide;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.db.alm.setting.ALM;
import org.sonar.db.alm.setting.AlmSettingDto;
import org.sonar.db.alm.setting.ProjectAlmSettingDto;
@ -45,7 +45,7 @@ import static java.lang.String.format;
@ComputeEngineSide
public class DefaultBitbucketClientFactory implements BitbucketClientFactory {
private static final Logger LOGGER = Loggers.get(DefaultBitbucketClientFactory.class);
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultBitbucketClientFactory.class);
private final HttpClientBuilderFactory httpClientBuilderFactory;
private final Settings settings;

12
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/github/v4/GraphqlGithubClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Michael Clarke
* Copyright (C) 2020-2023 Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -31,8 +31,8 @@ import io.aexp.nodes.graphql.GraphQLResponseEntity;
import io.aexp.nodes.graphql.GraphQLTemplate;
import io.aexp.nodes.graphql.InputObject;
import io.aexp.nodes.graphql.internal.Error;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.MalformedURLException;
@ -50,7 +50,7 @@ import static org.apache.commons.lang.ArrayUtils.isEmpty;
public class GraphqlGithubClient implements GithubClient {
private static final Logger LOGGER = Loggers.get(GraphqlGithubClient.class);
private static final Logger LOGGER = LoggerFactory.getLogger(GraphqlGithubClient.class);
private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
.withZone(ZoneId.of("UTC"));
private static final String INPUT = "input";
@ -230,11 +230,11 @@ public class GraphqlGithubClient implements GithubClient {
private static <R> GraphQLResponseEntity<R> executeRequest(
BiFunction<GraphQLRequestEntity, Class<R>, GraphQLResponseEntity<R>> executor, GraphQLRequestEntity graphQLRequestEntity, Class<R> responseType) {
LOGGER.debug("Using request: " + graphQLRequestEntity.getRequest());
LOGGER.atDebug().setMessage("Using request: {}").addArgument(graphQLRequestEntity::getRequest).log();
GraphQLResponseEntity<R> response = executor.apply(graphQLRequestEntity, responseType);
LOGGER.debug("Received response: " + response.toString());
LOGGER.debug("Received response: {}", response);
if (!isEmpty(response.getErrors())) {
List<String> errors = new ArrayList<>();

39
src/main/java/com/github/mc1arke/sonarqube/plugin/almclient/gitlab/GitlabRestClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2021 Michael Clarke
* Copyright (C) 2021-2023 Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -39,8 +39,8 @@ import org.apache.http.entity.ContentType;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.net.URLEncoder;
@ -55,7 +55,7 @@ import java.util.function.Supplier;
class GitlabRestClient implements GitlabClient {
private static final Logger LOGGER = Loggers.get(GitlabRestClient.class);
private static final Logger LOGGER = LoggerFactory.getLogger(GitlabRestClient.class);
private final String baseGitlabApiUrl;
private final String authToken;
@ -211,24 +211,23 @@ class GitlabRestClient implements GitlabClient {
private static void validateResponse(HttpResponse httpResponse, int expectedStatus, String successLogMessage) {
if (httpResponse.getStatusLine().getStatusCode() == expectedStatus) {
LOGGER.debug(Optional.ofNullable(successLogMessage).map(v -> v + System.lineSeparator()).orElse("") + httpResponse);
LOGGER.atDebug().setMessage(() -> Optional.ofNullable(successLogMessage).map(v -> v + System.lineSeparator()).orElse("") + httpResponse).log();
return;
}
String responseContent = Optional.ofNullable(httpResponse.getEntity()).map(entity -> {
try {
return EntityUtils.toString(entity, StandardCharsets.UTF_8);
} catch (IOException ex) {
LOGGER.warn("Could not decode response entity", ex);
return "";
}
}).orElse("");
LOGGER.error("Gitlab response status did not match expected value. Expected: " + expectedStatus
+ System.lineSeparator()
+ httpResponse
+ System.lineSeparator()
+ responseContent);
LOGGER.atError().setMessage("Gitlab response status did not match expected value. Expected: {}{}{}{}{}")
.addArgument(expectedStatus)
.addArgument(System::lineSeparator)
.addArgument(httpResponse)
.addArgument(System::lineSeparator)
.addArgument(() -> Optional.ofNullable(httpResponse.getEntity()).map(entity -> {
try {
return EntityUtils.toString(entity, StandardCharsets.UTF_8);
} catch (IOException ex) {
LOGGER.warn("Could not decode response entity", ex);
return "";
}
}).orElse(""))
.log();
throw new IllegalStateException("An unexpected response code was returned from the Gitlab API - Expected: " + expectedStatus + ", Got: " + httpResponse.getStatusLine().getStatusCode());

15
src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/PullRequestPostAnalysisTask.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Michael Clarke
* Copyright (C) 2020-2023 Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -18,12 +18,12 @@
*/
package com.github.mc1arke.sonarqube.plugin.ce.pullrequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.ce.posttask.Analysis;
import org.sonar.api.ce.posttask.Branch;
import org.sonar.api.ce.posttask.PostProjectAnalysisTask;
import org.sonar.api.ce.posttask.QualityGate;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.alm.setting.ALM;
@ -38,7 +38,7 @@ import java.util.Optional;
public class PullRequestPostAnalysisTask implements PostProjectAnalysisTask {
private static final Logger LOGGER = Loggers.get(PullRequestPostAnalysisTask.class);
private static final Logger LOGGER = LoggerFactory.getLogger(PullRequestPostAnalysisTask.class);
private final List<PullRequestBuildStatusDecorator> pullRequestDecorators;
private final PostAnalysisIssueVisitor postAnalysisIssueVisitor;
@ -60,7 +60,8 @@ public class PullRequestPostAnalysisTask implements PostProjectAnalysisTask {
@Override
public void finished(Context context) {
ProjectAnalysis projectAnalysis = context.getProjectAnalysis();
LOGGER.debug("Found " + pullRequestDecorators.size() + " pull request decorators");
LOGGER.atDebug().setMessage("Found {} pull request decorators").addArgument(pullRequestDecorators::size).log();
Optional<Branch> optionalPullRequest =
projectAnalysis.getBranch().filter(branch -> Branch.Type.PULL_REQUEST == branch.getType());
if (optionalPullRequest.isEmpty()) {
@ -134,7 +135,7 @@ public class PullRequestPostAnalysisTask implements PostProjectAnalysisTask {
postAnalysisIssueVisitor.getIssues(), qualityGate, projectAnalysis);
PullRequestBuildStatusDecorator pullRequestDecorator = optionalPullRequestDecorator.get();
LOGGER.info("Using pull request decorator " + pullRequestDecorator.getClass().getName());
LOGGER.info("Using pull request decorator {}", pullRequestDecorator.getClass().getName());
DecorationResult decorationResult = pullRequestDecorator.decorateQualityGateStatus(analysisDetails, almSettingDto, projectAlmSettingDto);
decorationResult.getPullRequestUrl().ifPresent(pullRequestUrl -> persistPullRequestUrl(pullRequestUrl, projectAnalysis, optionalPullRequestId.get()));
@ -151,7 +152,7 @@ public class PullRequestPostAnalysisTask implements PostProjectAnalysisTask {
}
}
LOGGER.warn("No decorator could be found matching " + alm);
LOGGER.warn("No decorator could be found matching {}", alm);
return Optional.empty();
}

8
src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/azuredevops/AzureDevOpsPullRequestDecorator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Markus Heberling, Michael Clarke
* Copyright (C) 2020-2023 Markus Heberling, Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -42,9 +42,9 @@ import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.report.AnalysisIssueSu
import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.report.AnalysisSummary;
import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.report.ReportGenerator;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.ce.posttask.QualityGate;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository;
import org.sonar.db.alm.setting.ALM;
import org.sonar.db.alm.setting.AlmSettingDto;
@ -62,7 +62,7 @@ import java.util.stream.Collectors;
public class AzureDevOpsPullRequestDecorator extends DiscussionAwarePullRequestDecorator<AzureDevopsClient, PullRequest, Void, CommentThread, Comment> implements PullRequestBuildStatusDecorator {
private static final Logger logger = Loggers.get(AzureDevOpsPullRequestDecorator.class);
private static final Logger logger = LoggerFactory.getLogger(AzureDevOpsPullRequestDecorator.class);
private static final Pattern NOTE_MARKDOWN_LEGACY_SEE_LINK_PATTERN = Pattern.compile("^\\[See in SonarQube]\\((.*?)\\)$");
private final AzureDevopsClientFactory azureDevopsClientFactory;
private final MarkdownFormatterFactory markdownFormatterFactory;

8
src/main/java/com/github/mc1arke/sonarqube/plugin/ce/pullrequest/bitbucket/BitbucketPullRequestDecorator.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2022 Mathias Åhsberg, Michael Clarke
* Copyright (C) 2020-2023 Mathias Åhsberg, Michael Clarke
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -34,12 +34,12 @@ import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.AnalysisDetails;
import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.DecorationResult;
import com.github.mc1arke.sonarqube.plugin.ce.pullrequest.PullRequestBuildStatusDecorator;
import com.google.common.annotations.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.ce.posttask.QualityGate;
import org.sonar.api.issue.Issue;
import org.sonar.api.rule.Severity;
import org.sonar.api.rules.RuleType;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.db.alm.setting.ALM;
import org.sonar.db.alm.setting.AlmSettingDto;
import org.sonar.db.alm.setting.ProjectAlmSettingDto;
@ -61,7 +61,7 @@ import static java.util.stream.Collectors.toSet;
public class BitbucketPullRequestDecorator implements PullRequestBuildStatusDecorator {
private static final Logger LOGGER = Loggers.get(BitbucketPullRequestDecorator.class);
private static final Logger LOGGER = LoggerFactory.getLogger(BitbucketPullRequestDecorator.class);
private static final DecorationResult DEFAULT_DECORATION_RESULT = DecorationResult.builder().build();

12
src/main/java/com/github/mc1arke/sonarqube/plugin/scanner/CommunityBranchConfigurationLoader.java
View File

@ -28,10 +28,10 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.utils.MessageException;
import org.sonar.api.utils.System2;
import org.sonar.api.utils.log.Logger;
import org.sonar.api.utils.log.Loggers;
import org.sonar.core.config.ScannerProperties;
import org.sonar.scanner.scan.branch.BranchConfiguration;
import org.sonar.scanner.scan.branch.BranchConfigurationLoader;
@ -43,7 +43,7 @@ import org.sonar.scanner.scan.branch.ProjectBranches;
*/
public class CommunityBranchConfigurationLoader implements BranchConfigurationLoader {
private static final Logger LOGGER = Loggers.get(CommunityBranchConfigurationLoader.class);
private static final Logger LOGGER = LoggerFactory.getLogger(CommunityBranchConfigurationLoader.class);
private static final Set<String> BRANCH_ANALYSIS_PARAMETERS =
new HashSet<>(Collections.singletonList(ScannerProperties.BRANCH_NAME));
@ -84,7 +84,11 @@ public class CommunityBranchConfigurationLoader implements BranchConfigurationLo
Optional<BranchConfiguration> optionalBranchConfiguration = branchAutoConfigurer.detectConfiguration(system2, projectBranches);
if (optionalBranchConfiguration.isPresent()) {
BranchConfiguration branchConfiguration = optionalBranchConfiguration.get();
LOGGER.info("Auto detected {} configuration with source {} using {}", branchConfiguration.branchType(), branchConfiguration.branchName(), branchAutoConfigurer.getClass().getName());
LOGGER.atInfo().setMessage("Auto detected {} configuration with source {} using {}")
.addArgument(branchConfiguration::branchType)
.addArgument(branchConfiguration::branchName)
.addArgument(() -> branchAutoConfigurer.getClass().getName())
.log();
return branchConfiguration;
}
}