Migrate to flogger
Change-Id: Id11c1b56ae64aaba5cad93cc022f1a8983c2710d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/AddReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/AddReviewers.java
index be04ea4..54d1552 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/AddReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/AddReviewers.java
@@ -14,6 +14,7 @@
package com.googlesource.gerrit.plugins.reviewers.server;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.api.changes.AddReviewerInput;
import com.google.gerrit.extensions.api.changes.ReviewInput;
@@ -31,11 +32,9 @@
import com.google.inject.ProvisionException;
import java.util.ArrayList;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
abstract class AddReviewers implements Runnable {
- private static final Logger log = LoggerFactory.getLogger(AddReviewers.class);
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final ThreadLocalRequestContext tl;
protected final GerritApi gApi;
@@ -112,7 +111,7 @@
}
gApi.changes().id(changeInfo._number).current().review(in);
} catch (RestApiException e) {
- log.error("Couldn't add reviewers to the change", e);
+ logger.atSevere().withCause(e).log("Couldn't add reviewers to the change");
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/PutReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/PutReviewers.java
index 0c4274a..cc985df 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/PutReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/PutReviewers.java
@@ -16,6 +16,7 @@
import static com.googlesource.gerrit.plugins.reviewers.server.ModifyReviewersConfigCapability.MODIFY_REVIEWERS_CONFIG;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.extensions.api.access.PluginPermission;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -44,12 +45,10 @@
import java.util.List;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
class PutReviewers implements RestModifyView<ProjectResource, Input> {
- private static final Logger log = LoggerFactory.getLogger(PutReviewers.class);
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
public static class Input {
public Action action;
@@ -158,7 +157,7 @@
}
}
} catch (OrmException | IOException | ConfigInvalidException e) {
- log.error("Failed to resolve account " + reviewer);
+ logger.atSevere().log("Failed to resolve account %s", reviewer);
}
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
index 430a588..33eb1da 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/Reviewers.java
@@ -20,6 +20,7 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.common.ChangeInfo;
@@ -41,12 +42,10 @@
import com.google.inject.Singleton;
import java.util.List;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
class Reviewers implements RevisionCreatedListener, ReviewerSuggestion {
- private static final Logger log = LoggerFactory.getLogger(Reviewers.class);
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final ReviewersResolver resolver;
private final AddReviewersByConfiguration.Factory byConfigFactory;
@@ -101,7 +100,7 @@
.collect(toSet());
}
} catch (OrmException | QueryParseException x) {
- log.error(x.getMessage(), x);
+ logger.atSevere().withCause(x).log(x.getMessage());
}
return ImmutableSet.of();
}
@@ -141,13 +140,11 @@
workQueue.getDefaultQueue().submit(task);
} catch (QueryParseException e) {
- log.warn(
- "Could not add default reviewers for change {} of project {}, filter is invalid: {}",
- changeNumber,
- projectName.get(),
- e.getMessage());
+ logger.atWarning().log(
+ "Could not add default reviewers for change %d of project %s, filter is invalid: %s",
+ changeNumber, projectName.get(), e.getMessage());
} catch (OrmException x) {
- log.error(x.getMessage(), x);
+ logger.atSevere().withCause(x).log(x.getMessage());
}
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersConfig.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersConfig.java
index fc35424..d2d7328 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersConfig.java
@@ -17,6 +17,7 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
@@ -32,12 +33,10 @@
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.Config;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@Singleton
public class ReviewersConfig {
- private static final Logger log = LoggerFactory.getLogger(ReviewersConfig.class);
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
static final String FILENAME = "reviewers.config";
static final String SECTION_FILTER = "filter";
@@ -65,7 +64,7 @@
try {
cfg = cfgFactory.getProjectPluginConfigWithMergedInheritance(projectName, pluginName);
} catch (NoSuchProjectException e) {
- log.error("Unable to get config for project {}", projectName.get());
+ logger.atSevere().log("Unable to get config for project %s", projectName.get());
cfg = new Config();
}
return new ForProject(cfg);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
index 28bbdbb..10785f2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/server/ReviewersResolver.java
@@ -18,6 +18,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
+import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
@@ -34,13 +35,11 @@
import java.io.IOException;
import java.util.Set;
import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/* Resolve account and group names to account ids */
@Singleton
class ReviewersResolver {
- private static final Logger log = LoggerFactory.getLogger(ReviewersResolver.class);
+ private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final AccountResolver accountResolver;
private final Provider<GroupResolver> groupResolver;
@@ -98,21 +97,16 @@
}
return true;
}
- log.warn(
- "For the change {} of project {}: account {} is inactive.",
- changeNumber,
- project,
- accountName);
+ logger.atWarning().log(
+ "For the change %d of project %s: account %s is inactive.",
+ changeNumber, project, accountName);
}
} catch (OrmException | IOException | ConfigInvalidException e) {
// If the account doesn't exist, find() will return null. We only
// get here if something went wrong accessing the database
- log.error(
- "For the change {} of project {}: failed to resolve account {}.",
- changeNumber,
- project,
- accountName,
- e);
+ logger.atSevere().withCause(e).log(
+ "For the change %d of project %s: failed to resolve account %s.",
+ changeNumber, project, accountName);
return true;
}
return false;
@@ -133,18 +127,13 @@
.collect(toSet());
reviewers.addAll(accounts);
} catch (UnprocessableEntityException e) {
- log.warn(
- "For the change {} of project {}: reviewer {} is neither an account nor a group.",
- changeNumber,
- project,
- group);
+ logger.atWarning().log(
+ "For the change %d of project %s: reviewer %s is neither an account nor a group.",
+ changeNumber, project, group);
} catch (NoSuchProjectException | IOException e) {
- log.error(
- "For the change {} of project {}: failed to list accounts for group {}.",
- changeNumber,
- project,
- group,
- e);
+ logger.atSevere().withCause(e).log(
+ "For the change %d of project %s: failed to list accounts for group %s.",
+ changeNumber, project, group);
}
}
}
