commit 4fc7c5ceb86a3be735f771e322bdec4f637fee5b
author Changcheng Xiao <xchangcheng@google.com> Tue Mar 05 13:19:17 2019 +0100
committer Dave Borowitz <dborowitz@google.com> Tue Mar 05 06:59:21 2019 -0800
tree b3cd1bd0e216d8810d227592da5d575686f98ebc
parent ec796b3eb4bfee788c65006b58fe24a880985fab

ConflictsPredicate: don't split log statements

Change-Id: I66a7352ed8af48ea1e8a794e81e76ebe4eb82c8c

java/com/google/gerrit/server/query/change/ConflictsPredicate.java

diff --git a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
index 3fc512a..dd2852b 100644
--- a/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
+++ b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
@@ -19,7 +19,6 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 
 import com.google.common.flogger.FluentLogger;
-import com.google.common.flogger.LoggingApi;
 import com.google.gerrit.common.data.SubmitTypeRecord;
 import com.google.gerrit.index.query.PostFilterPredicate;
 import com.google.gerrit.index.query.Predicate;
@@ -42,8 +41,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
@@ -65,8 +62,7 @@
       cd = args.changeDataFactory.create(c);
       files = cd.currentFilePaths();
     } catch (IOException | OrmException e) {
-      logWithOccasionalStackTrace(
-          logger::atWarning,
+      warnWithOccasionalStackTrace(
           e,
           "Error constructing conflicts predicates for change %s in %s",
           c.getId(),
@@ -164,8 +160,7 @@
         }
       } catch (IntegrationException | NoSuchProjectException | OrmException | IOException e) {
         ObjectId finalOther = other;
-        logWithOccasionalStackTrace(
-            logger::atWarning,
+        warnWithOccasionalStackTrace(
             e,
             "Merge failure checking conflicts of change %s in %s (%s): %s",
             id,
@@ -235,12 +230,12 @@
     }
   }
 
-  private static <API extends LoggingApi<API>> void logWithOccasionalStackTrace(
-      Supplier<LoggingApi<API>> logSupplier, Throwable cause, String format, Object... args) {
-    BiConsumer<LoggingApi<API>, String> logConsumer = (api, f) -> api.logVarargs(f, args);
-    logConsumer.accept(logSupplier.get(), format);
-    logConsumer.accept(
-        logSupplier.get().withCause(cause).atMostEvery(1, MINUTES),
-        "(Re-logging with stack trace) " + format);
+  private static void warnWithOccasionalStackTrace(Throwable cause, String format, Object... args) {
+    logger.atWarning().logVarargs(format, args);
+    logger
+        .atWarning()
+        .withCause(cause)
+        .atMostEvery(1, MINUTES)
+        .logVarargs("(Re-logging with stack trace) " + format, args);
   }
 }