Migrate to Flogger Change-Id: I3117be761bf4a77a4dddd2bad5b6b5db325724a1 Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java index 4f6866b..8cae399 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -14,6 +14,7 @@ package com.googlesource.gerrit.plugins.reviewnotes; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; import com.google.gerrit.common.data.LabelType; import com.google.gerrit.common.data.LabelTypes; @@ -57,12 +58,9 @@ import org.eclipse.jgit.notes.NoteMap; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; class CreateReviewNotes { - - private static final Logger log = LoggerFactory.getLogger(CreateReviewNotes.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); interface Factory { CreateReviewNotes create(ReviewDb reviewDb, Project.NameKey project, Repository git); @@ -108,8 +106,8 @@ this.anonymousCowardName = anonymousCowardName; ProjectState projectState = projectCache.get(project); if (projectState == null) { - log.error( - "Could not obtain available labels for project {}." + logger.atSevere().log( + "Could not obtain available labels for project %s." + " Expect missing labels in its review notes.", project.get()); this.labelTypes = new LabelTypes(Collections.<LabelType>emptyList()); @@ -144,7 +142,7 @@ markUninteresting(git, branch, rw, oldObjectId); } } catch (Exception e) { - log.error(e.getMessage(), e); + logger.atSevere().withCause(e).log(e.getMessage()); return; } @@ -163,11 +161,8 @@ getMessage().append("* ").append(c.getShortMessage()).append("\n"); } } else { - if (log.isDebugEnabled()) { - log.debug( - "no note for this commit since it is a direct push {}", - c.getName().substring(0, 7)); - } + logger.atFine().log( + "no note for this commit since it is a direct push %s", c.getName().substring(0, 7)); } } }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java index 0b040b9..f85d0ca 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/RefUpdateListener.java
@@ -14,6 +14,7 @@ package com.googlesource.gerrit.plugins.reviewnotes; +import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.events.GitReferenceUpdatedListener; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.reviewdb.client.Project; @@ -30,12 +31,9 @@ import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; class RefUpdateListener implements GitReferenceUpdatedListener { - - private static final Logger log = LoggerFactory.getLogger(RefUpdateListener.class); + private static final FluentLogger logger = FluentLogger.forEnclosingClass(); private final CreateReviewNotes.Factory reviewNotesFactory; private final SchemaFactory<ReviewDb> schema; @@ -117,7 +115,7 @@ return null; }); } catch (RestApiException | UpdateException x) { - log.error(x.getMessage(), x); + logger.atSevere().withCause(x).log(x.getMessage()); } } }