aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-alm-client/src
diff options
context:
space:
mode:
authorWojtek Wajerowicz <115081248+wojciech-wajerowicz-sonarsource@users.noreply.github.com>2023-06-13 14:11:28 +0200
committersonartech <sonartech@sonarsource.com>2023-06-13 20:03:37 +0000
commit6c88709145ecf40500f5600d420e04c537f4c0a0 (patch)
tree5cca9ab49cb7335eb92ffe82025119b3441ac091 /server/sonar-alm-client/src
parent64ae11abcdc2117c247a5364f2543144789ab175 (diff)
downloadsonarqube-6c88709145ecf40500f5600d420e04c537f4c0a0.tar.gz
sonarqube-6c88709145ecf40500f5600d420e04c537f4c0a0.zip
[NOJIRA] Remove usage of deprecated Loggers. (#8527)
Diffstat (limited to 'server/sonar-alm-client/src')
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/TimeoutConfigurationImpl.java4
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/azure/AzureDevOpsHttpClient.java6
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java6
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucketserver/BitbucketServerRestClient.java6
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationClientImpl.java6
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java6
-rw-r--r--server/sonar-alm-client/src/main/java/org/sonar/alm/client/gitlab/GitlabHttpClient.java6
7 files changed, 20 insertions, 20 deletions
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/TimeoutConfigurationImpl.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/TimeoutConfigurationImpl.java
index 058a8db87a5..1b4f72cc4ab 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/TimeoutConfigurationImpl.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/TimeoutConfigurationImpl.java
@@ -22,7 +22,7 @@ package org.sonar.alm.client;
import com.google.common.annotations.VisibleForTesting;
import java.util.OptionalLong;
import org.sonar.api.config.Configuration;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.LoggerFactory;
/**
* Implementation of {@link TimeoutConfiguration} reading values from configuration properties.
@@ -52,7 +52,7 @@ public class TimeoutConfigurationImpl implements TimeoutConfiguration {
try {
return OptionalLong.of(Long.parseLong(value));
} catch (NumberFormatException e) {
- Loggers.get(TimeoutConfigurationImpl.class)
+ LoggerFactory.getLogger(TimeoutConfigurationImpl.class)
.warn("Value of property {} can not be parsed to a long: {}", property, value);
return OptionalLong.empty();
}
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/azure/AzureDevOpsHttpClient.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/azure/AzureDevOpsHttpClient.java
index 7df02e3aa58..cf4d3a2bdbd 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/azure/AzureDevOpsHttpClient.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/azure/AzureDevOpsHttpClient.java
@@ -38,8 +38,8 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.sonar.alm.client.TimeoutConfiguration;
import org.sonar.api.server.ServerSide;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonarqube.ws.client.OkHttpClientBuilder;
import static java.util.stream.Collectors.joining;
@@ -49,7 +49,7 @@ import static org.sonar.api.internal.apachecommons.lang.StringUtils.substringBef
@ServerSide
public class AzureDevOpsHttpClient {
- private static final Logger LOG = Loggers.get(AzureDevOpsHttpClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AzureDevOpsHttpClient.class);
public static final String API_VERSION_3 = "api-version=3.0";
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java
index e7c82d0a818..d550b30d280 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucket/bitbucketcloud/BitbucketCloudRestClient.java
@@ -38,15 +38,15 @@ import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
import org.sonar.api.server.ServerSide;
-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.server.exceptions.NotFoundException;
import static org.sonar.api.internal.apachecommons.lang.StringUtils.removeEnd;
@ServerSide
public class BitbucketCloudRestClient {
- private static final Logger LOG = Loggers.get(BitbucketCloudRestClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BitbucketCloudRestClient.class);
private static final String AUTHORIZATION = "Authorization";
private static final String GET = "GET";
private static final String ENDPOINT = "https://api.bitbucket.org";
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucketserver/BitbucketServerRestClient.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucketserver/BitbucketServerRestClient.java
index 461719f6ee0..36bf981eb22 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucketserver/BitbucketServerRestClient.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/bitbucketserver/BitbucketServerRestClient.java
@@ -38,8 +38,8 @@ import okhttp3.RequestBody;
import okhttp3.Response;
import org.sonar.alm.client.TimeoutConfiguration;
import org.sonar.api.server.ServerSide;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonarqube.ws.client.OkHttpClientBuilder;
import static com.google.common.base.Strings.isNullOrEmpty;
@@ -52,7 +52,7 @@ import static org.sonar.api.internal.apachecommons.lang.StringUtils.removeEnd;
@ServerSide
public class BitbucketServerRestClient {
- private static final Logger LOG = Loggers.get(BitbucketServerRestClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BitbucketServerRestClient.class);
private static final String GET = "GET";
protected static final String UNABLE_TO_CONTACT_BITBUCKET_SERVER = "Unable to contact Bitbucket server";
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationClientImpl.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationClientImpl.java
index 4b771efee8e..c1f9e28a8c8 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationClientImpl.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationClientImpl.java
@@ -44,8 +44,8 @@ import org.sonar.alm.client.github.security.GithubAppSecurity;
import org.sonar.alm.client.github.security.UserAccessToken;
import org.sonar.alm.client.gitlab.GsonApp;
import org.sonar.api.internal.apachecommons.lang.StringUtils;
-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.auth.github.GitHubSettings;
import org.sonar.server.exceptions.ServerException;
import org.sonarqube.ws.client.HttpException;
@@ -58,7 +58,7 @@ import static java.net.HttpURLConnection.HTTP_OK;
import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
public class GithubApplicationClientImpl implements GithubApplicationClient {
- private static final Logger LOG = Loggers.get(GithubApplicationClientImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GithubApplicationClientImpl.class);
protected static final Gson GSON = new Gson();
protected static final String WRITE_PERMISSION_NAME = "write";
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
index e908f7425aa..177f8995f6b 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/github/GithubApplicationHttpClientImpl.java
@@ -36,8 +36,8 @@ import okhttp3.ResponseBody;
import org.apache.commons.lang.StringUtils;
import org.sonar.alm.client.TimeoutConfiguration;
import org.sonar.alm.client.github.security.AccessToken;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonarqube.ws.client.OkHttpClientBuilder;
import static com.google.common.base.Preconditions.checkArgument;
@@ -51,7 +51,7 @@ import static java.util.Optional.ofNullable;
public class GithubApplicationHttpClientImpl implements GithubApplicationHttpClient {
- private static final Logger LOG = Loggers.get(GithubApplicationHttpClientImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GithubApplicationHttpClientImpl.class);
private static final Pattern NEXT_LINK_PATTERN = Pattern.compile("<([^<]+)>; rel=\"next\"");
private static final String GH_API_VERSION_HEADER = "X-GitHub-Api-Version";
private static final String GH_API_VERSION = "2022-11-28";
diff --git a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/gitlab/GitlabHttpClient.java b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/gitlab/GitlabHttpClient.java
index ac8bff1b5b0..ab1f4b5fb69 100644
--- a/server/sonar-alm-client/src/main/java/org/sonar/alm/client/gitlab/GitlabHttpClient.java
+++ b/server/sonar-alm-client/src/main/java/org/sonar/alm/client/gitlab/GitlabHttpClient.java
@@ -37,8 +37,8 @@ import okhttp3.Response;
import org.apache.logging.log4j.util.Strings;
import org.sonar.alm.client.TimeoutConfiguration;
import org.sonar.api.server.ServerSide;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.sonarqube.ws.MediaTypes;
import org.sonarqube.ws.client.OkHttpClientBuilder;
@@ -49,7 +49,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
@ServerSide
public class GitlabHttpClient {
- private static final Logger LOG = Loggers.get(GitlabHttpClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GitlabHttpClient.class);
protected static final String PRIVATE_TOKEN = "Private-Token";
protected final OkHttpClient client;