Use addSuppressed in AbstractExecutionThreadService, and otherwise update/clarify code pinned to "Java 7" / old versions of Android.

RELNOTES=n/a
PiperOrigin-RevId: 686882751

Author: cpovirk

android/guava-testlib/src/com/google/common/testing/ForwardingWrapperTester.java

@@ -84,9 +84,9 @@ public <T> void testForwarding(
     Method[] methods = getMostConcreteMethods(interfaceType);
     AccessibleObject.setAccessible(methods, true);
     for (Method method : methods) {
-      // Under java 8, interfaces can have default methods that aren't abstract.
+      // Interfaces can have default methods that aren't abstract.
       // No need to verify them.
-      // Can't check isDefault() for JDK 7 compatibility.
+      // Can't check isDefault() for Android compatibility.
       if (!Modifier.isAbstract(method.getModifiers())) {
         continue;
       }

android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6MapTests.java

@@ -40,10 +40,7 @@
  *
  * @author Kevin Bourrillion
  */
-/*
- * TODO(cpovirk): consider renaming this class in light of our now running it
- * under JDK7
- */
+// TODO(cpovirk): consider renaming this class in light of our now running it under newer JDKs.
 public class OpenJdk6MapTests extends TestsForMapsInJavaUtil {
   public static Test suite() {
     return new OpenJdk6MapTests().allTests();

android/guava-tests/test/com/google/common/base/Utf8Test.java

@@ -60,6 +60,8 @@ public class Utf8Test extends TestCase {
     ILL_FORMED_STRINGS = builder.build();
   }
 
+  // We can't use Character.isSurrogate(c) because of GWT.
+
   public void testEncodedLength_validStrings() {
     assertEquals(0, Utf8.encodedLength(""));
     assertEquals(11, Utf8.encodedLength("Hello world"));

android/guava-tests/test/com/google/common/collect/ForwardingMapTest.java

@@ -29,9 +29,7 @@
 import com.google.common.collect.testing.features.CollectionFeature;
 import com.google.common.collect.testing.features.CollectionSize;
 import com.google.common.collect.testing.features.MapFeature;
-import com.google.common.reflect.AbstractInvocationHandler;
 import com.google.common.reflect.Parameter;
-import com.google.common.reflect.Reflection;
 import com.google.common.reflect.TypeToken;
 import com.google.common.testing.ArbitraryInstances;
 import com.google.common.testing.EqualsTester;
@@ -44,6 +42,9 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.IntFunction;
+import java.util.function.Predicate;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -330,38 +331,25 @@ protected Map<K, V> delegate() {
     };
   }
 
-  private static final ImmutableMap<String, String> JUF_METHODS =
-      ImmutableMap.of(
-          "java.util.function.Predicate", "test",
-          "java.util.function.Consumer", "accept",
-          "java.util.function.IntFunction", "apply");
-
   private static @Nullable Object getDefaultValue(final TypeToken<?> type) {
     Class<?> rawType = type.getRawType();
     Object defaultValue = ArbitraryInstances.get(rawType);
     if (defaultValue != null) {
       return defaultValue;
     }
 
-    final String typeName = rawType.getCanonicalName();
-    if (JUF_METHODS.containsKey(typeName)) {
-      // Generally, methods that accept java.util.function.* instances
-      // don't like to get null values.  We generate them dynamically
-      // using Proxy so that we can have Java 7 compliant code.
-      return Reflection.newProxy(
-          rawType,
-          new AbstractInvocationHandler() {
-            @Override
-            public Object handleInvocation(Object proxy, Method method, Object[] args) {
-              // Crude, but acceptable until we can use Java 8.  Other
-              // methods have default implementations, and it is hard to
-              // distinguish.
-              if (method.getName().equals(JUF_METHODS.get(typeName))) {
-                return getDefaultValue(type.method(method).getReturnType());
-              }
-              throw new IllegalStateException("Unexpected " + method + " invoked on " + proxy);
-            }
-          });
+    // TODO(cpovirk): Support these types in ArbitraryInstances itself?
+    if (rawType.equals(Predicate.class)) {
+      return (Predicate<Object>) v -> (boolean) getDefaultValue(TypeToken.of(boolean.class));
+    } else if (rawType.equals(IntFunction.class)) {
+      try {
+        Method method = IntFunction.class.getMethod("apply", int.class);
+        return (IntFunction<Object>) v -> getDefaultValue(type.method(method).getReturnType());
+      } catch (NoSuchMethodException e) {
+        throw newLinkageError(e);
+      }
+    } else if (rawType.equals(Consumer.class)) {
+      return (Consumer<Object>) v -> {};
     } else {
       return null;
     }
@@ -393,4 +381,8 @@ private static <T> void callAllPublicMethods(TypeToken<T> type, T object)
       }
     }
   }
+
+  private static LinkageError newLinkageError(Throwable cause) {
+    return new LinkageError(cause.toString(), cause);
+  }
 }

android/guava-tests/test/com/google/common/reflect/InvokableTest.java

@@ -28,6 +28,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.GenericDeclaration;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
@@ -53,15 +54,9 @@ public void testApiCompatibleWithAccessibleObject() {
     ImmutableSet<String> accessibleObjectMethods =
         publicMethodSignatures(AccessibleObject.class, ImmutableSet.of("canAccess"));
     assertThat(invokableMethods).containsAtLeastElementsIn(accessibleObjectMethods);
-    Class<?> genericDeclaration;
-    try {
-      genericDeclaration = Class.forName("java.lang.reflect.GenericDeclaration");
-      ImmutableSet<String> genericDeclarationMethods =
-          publicMethodSignatures(genericDeclaration, ImmutableSet.<String>of());
-      assertThat(invokableMethods).containsAtLeastElementsIn(genericDeclarationMethods);
-    } catch (ClassNotFoundException e) {
-      // OK: we're on Java 7, which doesn't have this class
-    }
+    ImmutableSet<String> genericDeclarationMethods =
+        publicMethodSignatures(GenericDeclaration.class, ImmutableSet.<String>of());
+    assertThat(invokableMethods).containsAtLeastElementsIn(genericDeclarationMethods);
   }
 
   private static ImmutableSet<String> publicMethodSignatures(

android/guava-tests/test/com/google/common/util/concurrent/AbstractExecutionThreadServiceTest.java

@@ -231,6 +231,7 @@ public void testServiceThrowOnRunAndThenAgainOnShutDown() throws Exception {
     assertThat(expected).hasCauseThat().hasMessageThat().isEqualTo("kaboom!");
     assertTrue(service.shutDownCalled);
     assertEquals(Service.State.FAILED, service.state());
+    assertThat(expected.getCause().getSuppressed()[0]).hasMessageThat().isEqualTo("double kaboom!");
   }
 
   private class ThrowOnRunService extends AbstractExecutionThreadService {

android/guava-tests/test/com/google/common/util/concurrent/ServiceManagerTest.java

@@ -26,6 +26,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.common.testing.NullPointerTester;
@@ -417,6 +418,36 @@ public String format(LogRecord record) {
     }
   }
 
+  public void testStartupFailureOutput() {
+    Logger logger = Logger.getLogger(ServiceManager.class.getName());
+    logger.setLevel(Level.SEVERE);
+    TestLogHandler logHandler = new TestLogHandler();
+    logger.addHandler(logHandler);
+    ServiceManager manager =
+        new ServiceManager(Arrays.<Service>asList(new FailRunService(), new FailStartService()));
+    // Due to the implementation of the two services we know that both are now failed.  So the
+    // following awaitHealthy call is just to get the exception.
+    manager.startAsync();
+    assertThat(manager.servicesByState().get(State.FAILED)).hasSize(2);
+    IllegalStateException e =
+        assertThrows(IllegalStateException.class, () -> manager.awaitHealthy());
+    assertThat(e.getMessage())
+        .contains(
+            "Expected to be healthy after starting. The following services are not " + "running:");
+
+    Throwable[] suppressed = e.getSuppressed();
+    assertThat(suppressed).hasLength(2);
+    assertThat(suppressed[0]).hasCauseThat().isInstanceOf(IllegalStateException.class);
+    assertThat(suppressed[0]).hasCauseThat().hasMessageThat().isEqualTo("run failure");
+
+    assertThat(suppressed[1]).hasCauseThat().isInstanceOf(IllegalStateException.class);
+    assertThat(suppressed[1]).hasCauseThat().hasMessageThat().isEqualTo("start failure");
+    LogRecord record = Iterables.getOnlyElement(logHandler.getStoredLogRecords());
+    // We log failures that occur after startup
+    assertThat(record.getMessage())
+        .contains("Service FailRunService [FAILED] has failed in the RUNNING state");
+  }
+
   /**
    * Tests that a ServiceManager can be fully shut down if one of its failure listeners is slow or
    * even permanently blocked.

android/guava/src/com/google/common/base/CharMatcher.java

@@ -368,7 +368,8 @@ protected CharMatcher() {}
   // Non-static factories
 
   /** Returns a matcher that matches any character not matched by this matcher. */
-  // @Override under Java 8 but not under Java 7
+  // This is not an override in java7, where Guava's Predicate does not extend the JDK's Predicate.
+  @SuppressWarnings("MissingOverride")
   public CharMatcher negate() {
     return new Negated(this);
   }

android/guava/src/com/google/common/base/Utf8.java

@@ -85,7 +85,7 @@ private static int encodedLengthGeneral(CharSequence sequence, int start) {
         utf8Length += (0x7f - c) >>> 31; // branch free!
       } else {
         utf8Length += 2;
-        // jdk7+: if (Character.isSurrogate(c)) {
+        // We can't use Character.isSurrogate(c) here and below because of GWT.
         if (MIN_SURROGATE <= c && c <= MAX_SURROGATE) {
           // Check that we have a well-formed surrogate pair.
           if (Character.codePointAt(sequence, i) == c) {

android/guava/src/com/google/common/collect/ImmutableMap.java

@@ -893,7 +893,7 @@ public boolean containsValue(@CheckForNull Object value) {
    *     Note, however, that Java 8+ users can call this method with any version and flavor of
    *     Guava.
    */
-  // @Override under Java 8 / API Level 24
+  @Override
   @CheckForNull
   public final V getOrDefault(@CheckForNull Object key, @CheckForNull V defaultValue) {
     /*