Replace slf4j with FluentLogger Change-Id: Ieb36e1d6bce08f1f315c8c3635baa95e3360e98d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/OnStartStop.java b/src/main/java/com/googlesource/gerrit/plugins/manager/OnStartStop.java index 9db6d87..e0ad123 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/OnStartStop.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/OnStartStop.java
@@ -14,17 +14,16 @@ package com.googlesource.gerrit.plugins.manager; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.inject.Inject; import com.googlesource.gerrit.plugins.manager.repository.PluginInfo; import java.util.Collection; import java.util.concurrent.ExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class OnStartStop implements LifecycleListener { - private static final Logger log = LoggerFactory.getLogger(OnStartStop.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private final PluginsCentralCache pluginsCache; @@ -49,12 +48,12 @@ @Override public void run() { - log.info("Start-up: pre-loading list of plugins from registry"); + logger.atInfo().log("Start-up: pre-loading list of plugins from registry"); try { Collection<PluginInfo> plugins = pluginsCache.availablePlugins(); - log.info("{} plugins successfully pre-loaded", plugins.size()); + logger.atInfo().log("%d plugins successfully pre-loaded", plugins.size()); } catch (ExecutionException e) { - log.error("Cannot access plugins list at this time", e); + logger.atSevere().withCause(e).log("Cannot access plugins list at this time"); } } });
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/XAuthFilter.java b/src/main/java/com/googlesource/gerrit/plugins/manager/XAuthFilter.java index cbdf6e1..fd12138 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/XAuthFilter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/XAuthFilter.java
@@ -16,6 +16,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.httpd.WebSession; import com.google.gerrit.server.AccessPath; @@ -32,12 +33,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @Singleton public class XAuthFilter implements Filter { - private static final Logger log = LoggerFactory.getLogger(XAuthFilter.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private DynamicItem<WebSession> webSession; @@ -60,7 +59,7 @@ if (gerritAuth != null) { session.setAccessPathOk(AccessPath.REST_API, true); - log.debug("Injecting X-Gerrit-Auth for {}", httpReq.getRequestURI()); + logger.atFine().log("Injecting X-Gerrit-Auth for %s", httpReq.getRequestURI()); httpResp = new HttpServletResponseWrapper(httpResp) { @@ -68,7 +67,7 @@ @Override public void setHeader(String name, String value) { - log.debug("{}: {}", name, value); + logger.atFine().log("%s: %s", name, value); if (name.equalsIgnoreCase("Content-Length")) { origContentLength = Integer.parseInt(value); } else {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java index 96947aa..3ad6100 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java
@@ -19,6 +19,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableList; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.Version; import com.google.gerrit.server.config.SitePaths; @@ -35,11 +36,9 @@ import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.jar.Manifest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CorePluginsRepository implements PluginsRepository { - private static final Logger log = LoggerFactory.getLogger(CorePluginsRepository.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private static final String GERRIT_VERSION = Version.getVersion(); private final SitePaths site; @@ -78,11 +77,11 @@ "", pluginUrl.toString())); } catch (IOException e) { - log.error("Unable to open plugin " + pluginUrl, e); + logger.atSevere().withCause(e).log("Unable to open plugin %s", pluginUrl); return null; } } catch (URISyntaxException e) { - log.error("Invalid plugin filename", e); + logger.atSevere().withCause(e).log("Invalid plugin filename"); return null; } } @@ -108,15 +107,15 @@ @Override public ImmutableList<PluginInfo> list(String gerritVersion) throws IOException { if (!gerritVersion.equals(GERRIT_VERSION)) { - log.warn( - "No core plugins available for version {} which is different than " + logger.atWarning().log( + "No core plugins available for version %s which is different than " + "the current running Gerrit", gerritVersion); return ImmutableList.of(); } if (site.gerrit_war == null) { - log.warn("Core plugins not available on non-war Gerrit distributions"); + logger.atWarning().log("Core plugins not available on non-war Gerrit distributions"); return ImmutableList.of(); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java index 66c4c8d..2ccc9d0 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java +++ b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java
@@ -16,6 +16,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; +import com.google.common.flogger.FluentLogger; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.inject.Inject; @@ -36,13 +37,11 @@ import java.util.Optional; import java.util.function.Function; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @Singleton public class JenkinsCiPluginsRepository implements PluginsRepository { - private static final Logger log = LoggerFactory.getLogger(JenkinsCiPluginsRepository.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private final PluginManagerConfig config; @@ -95,7 +94,8 @@ } } } catch (FileNotFoundException e) { - log.warn("No plugins available for Gerrit version " + gerritVersion, e); + logger.atWarning().withCause(e).log( + "No plugins available for Gerrit version %s", gerritVersion); } return plugins; @@ -180,7 +180,7 @@ artifactBody.append(line); } } catch (Exception e) { - log.error("Unable to fetch artifact from " + versionUrl); + logger.atSevere().log("Unable to fetch artifact from %s", versionUrl); return Optional.empty(); } } @@ -203,7 +203,7 @@ try { return Optional.of(gsonProvider.get().get(url)); } catch (IOException e) { - log.error("Cannot get JSON from " + url, e); + logger.atSevere().withCause(e).log("Cannot get JSON from %s", url); return Optional.empty(); } }