From a8ef70e78f2332f16716969bca0c48d8dcca7ca5 Mon Sep 17 00:00:00 2001
From: jhorvitz <jhorvitz@google.com>
Date: Tue, 23 Mar 2021 17:21:26 -0700
Subject: [PATCH] Delegate the default implementation of
 `BugReporter#sendBugReport(Throwable)` to
 `BugReporter#sendBugReport(Throwable, List, String...)`.

PiperOrigin-RevId: 364682636
---
 .../com/google/devtools/build/lib/bugreport/BugReport.java | 5 -----
 .../google/devtools/build/lib/bugreport/BugReporter.java   | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/bugreport/BugReport.java b/src/main/java/com/google/devtools/build/lib/bugreport/BugReport.java
index e6593c405f3e3c..b32b3a5bee55e4 100644
--- a/src/main/java/com/google/devtools/build/lib/bugreport/BugReport.java
+++ b/src/main/java/com/google/devtools/build/lib/bugreport/BugReport.java
@@ -276,11 +276,6 @@ private static void logException(Throwable exception, List<String> args, String.
 
   private static final class DefaultBugReporter implements BugReporter {
 
-    @Override
-    public void sendBugReport(Throwable exception) {
-      BugReport.sendBugReport(exception);
-    }
-
     @Override
     public void sendBugReport(Throwable exception, List<String> args, String... values) {
       BugReport.sendBugReport(exception, args, values);
diff --git a/src/main/java/com/google/devtools/build/lib/bugreport/BugReporter.java b/src/main/java/com/google/devtools/build/lib/bugreport/BugReporter.java
index 03066a134d78b8..54659c88a887fb 100644
--- a/src/main/java/com/google/devtools/build/lib/bugreport/BugReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/bugreport/BugReporter.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.bugreport;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 
 /**
@@ -29,9 +30,11 @@ static BugReporter defaultInstance() {
   }
 
   /** Reports an exception, see {@link BugReport#sendBugReport(Throwable)}. */
-  void sendBugReport(Throwable exception);
+  default void sendBugReport(Throwable exception) {
+    sendBugReport(exception, /*args=*/ ImmutableList.of());
+  }
 
-  /** Reports an exception, see {@link BugReport#sendBugReport(Throwable, List, String[])}. */
+  /** Reports an exception, see {@link BugReport#sendBugReport(Throwable, List, String...)}. */
   void sendBugReport(Throwable exception, List<String> args, String... values);
 
   /** See {@link BugReport#handleCrash}. */