Apply a few automated suggestions.

RELNOTES=n/a
PiperOrigin-RevId: 377297134

10 files changed, 58 insertions, 70 deletions

diff --git a/common/src/main/java/com/google/auto/common/AnnotationMirrors.java b/common/src/main/java/com/google/auto/common/AnnotationMirrors.java
index f0771bcd..640d5571 100644
--- a/common/src/main/java/com/google/auto/common/AnnotationMirrors.java
+++ b/common/src/main/java/com/google/auto/common/AnnotationMirrors.java
@@ -94,6 +94,7 @@ public final class AnnotationMirrors {
   public static ImmutableMap<ExecutableElement, AnnotationValue> getAnnotationValuesWithDefaults(
       AnnotationMirror annotation) {
     ImmutableMap.Builder<ExecutableElement, AnnotationValue> values = ImmutableMap.builder();
+    @SuppressWarnings("GetElementValues")
     Map<? extends ExecutableElement, ? extends AnnotationValue> declaredValues =
         annotation.getElementValues();
     for (ExecutableElement method :
diff --git a/common/src/main/java/com/google/auto/common/Visibility.java b/common/src/main/java/com/google/auto/common/Visibility.java
index c90f8829..a1e170d0 100644
--- a/common/src/main/java/com/google/auto/common/Visibility.java
+++ b/common/src/main/java/com/google/auto/common/Visibility.java
@@ -16,10 +16,10 @@
 package com.google.auto.common;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Comparators.min;
 import static javax.lang.model.element.ElementKind.PACKAGE;
 
 import com.google.common.base.Enums;
-import com.google.common.collect.Ordering;
 import java.util.Set;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -76,7 +76,7 @@ public enum Visibility {
     Visibility effectiveVisibility = PUBLIC;
     Element currentElement = element;
     while (currentElement != null) {
-      effectiveVisibility = Ordering.natural().min(effectiveVisibility, ofElement(currentElement));
+      effectiveVisibility = min(effectiveVisibility, ofElement(currentElement));
       currentElement = currentElement.getEnclosingElement();
     }
     return effectiveVisibility;
diff --git a/common/src/test/java/com/google/auto/common/AnnotationMirrorsTest.java b/common/src/test/java/com/google/auto/common/AnnotationMirrorsTest.java
index 363fd24b..b1dfe3b3 100644
--- a/common/src/test/java/com/google/auto/common/AnnotationMirrorsTest.java
+++ b/common/src/test/java/com/google/auto/common/AnnotationMirrorsTest.java
@@ -59,10 +59,10 @@ public class AnnotationMirrorsTest {
   @interface SimpleAnnotation {}
 
   @SimpleAnnotation
-  class SimplyAnnotated {}
+  static class SimplyAnnotated {}
 
   @SimpleAnnotation
-  class AlsoSimplyAnnotated {}
+  static class AlsoSimplyAnnotated {}
 
   enum SimpleEnum {
     BLAH,
@@ -87,45 +87,45 @@ public class AnnotationMirrorsTest {
   }
 
   @DefaultingOuter
-  class TestWithDefaultingOuterDefault {}
+  static class TestWithDefaultingOuterDefault {}
 
   @DefaultingOuter(BLAH)
-  class TestWithDefaultingOuterBlah {}
+  static class TestWithDefaultingOuterBlah {}
 
   @DefaultingOuter(FOO)
-  class TestWithDefaultingOuterFoo {}
+  static class TestWithDefaultingOuterFoo {}
 
   @interface AnnotatedOuter {
     DefaultingOuter value();
   }
 
   @AnnotatedOuter(@DefaultingOuter)
-  class TestDefaultNestedAnnotated {}
+  static class TestDefaultNestedAnnotated {}
 
   @AnnotatedOuter(@DefaultingOuter(BLAH))
-  class TestBlahNestedAnnotated {}
+  static class TestBlahNestedAnnotated {}
 
   @AnnotatedOuter(@DefaultingOuter(FOO))
-  class TestFooNestedAnnotated {}
+  static class TestFooNestedAnnotated {}
 
   @interface OuterWithValueArray {
     DefaultingOuter[] value() default {};
   }
 
   @OuterWithValueArray
-  class TestValueArrayWithDefault {}
+  static class TestValueArrayWithDefault {}
 
   @OuterWithValueArray({})
-  class TestValueArrayWithEmpty {}
+  static class TestValueArrayWithEmpty {}
 
   @OuterWithValueArray({@DefaultingOuter})
-  class TestValueArrayWithOneDefault {}
+  static class TestValueArrayWithOneDefault {}
 
   @OuterWithValueArray(@DefaultingOuter(BLAH))
-  class TestValueArrayWithOneBlah {}
+  static class TestValueArrayWithOneBlah {}
 
   @OuterWithValueArray(@DefaultingOuter(FOO))
-  class TestValueArrayWithOneFoo {}
+  static class TestValueArrayWithOneFoo {}
 
   @OuterWithValueArray({@DefaultingOuter(FOO), @DefaultingOuter})
   class TestValueArrayWithFooAndDefaultBlah {}
@@ -188,10 +188,10 @@ public class AnnotationMirrorsTest {
   }
 
   @Stringy
-  class StringyUnset {}
+  static class StringyUnset {}
 
   @Stringy("foo")
-  class StringySet {}
+  static class StringySet {}
 
   @Test
   public void testGetDefaultValuesUnset() {
diff --git a/common/src/test/java/com/google/auto/common/MoreElementsTest.java b/common/src/test/java/com/google/auto/common/MoreElementsTest.java
index 0677a7a0..03fa69cf 100644
--- a/common/src/test/java/com/google/auto/common/MoreElementsTest.java
+++ b/common/src/test/java/com/google/auto/common/MoreElementsTest.java
@@ -286,6 +286,7 @@ public class MoreElementsTest {
 
     abstract String foo();
 
+    @SuppressWarnings("unused")
     private void privateMethod() {}
   }
 
diff --git a/common/src/test/java/com/google/auto/common/MoreTypesIsTypeOfTest.java b/common/src/test/java/com/google/auto/common/MoreTypesIsTypeOfTest.java
index a829e18d..7cd7865d 100644
--- a/common/src/test/java/com/google/auto/common/MoreTypesIsTypeOfTest.java
+++ b/common/src/test/java/com/google/auto/common/MoreTypesIsTypeOfTest.java
@@ -51,7 +51,7 @@ public class MoreTypesIsTypeOfTest {
   private interface TestType {}
 
   @Test
-  public void isTypeOf_DeclaredType() {
+  public void isTypeOf_declaredType() {
     assertTrue(MoreTypes.isType(typeElementFor(TestType.class).asType()));
     assertWithMessage("mirror represents the TestType")
         .that(MoreTypes.isTypeOf(TestType.class, typeElementFor(TestType.class).asType()))
@@ -66,7 +66,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_ArrayType() {
+  public void isTypeOf_arrayType() {
     assertTrue(MoreTypes.isType(typeElementFor(ArrayType.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(ArrayType.class));
     assertWithMessage("array mirror represents an array Class object")
@@ -79,7 +79,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveBoolean() {
+  public void isTypeOf_primitiveBoolean() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveBoolean.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveBoolean.class));
     assertWithMessage("mirror of a boolean").that(MoreTypes.isTypeOf(Boolean.TYPE, type)).isTrue();
@@ -90,7 +90,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveByte() {
+  public void isTypeOf_primitiveByte() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveByte.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveByte.class));
     assertWithMessage("mirror of a byte").that(MoreTypes.isTypeOf(Byte.TYPE, type)).isTrue();
@@ -101,7 +101,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveChar() {
+  public void isTypeOf_primitiveChar() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveChar.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveChar.class));
     assertWithMessage("mirror of a char").that(MoreTypes.isTypeOf(Character.TYPE, type)).isTrue();
@@ -112,7 +112,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveDouble() {
+  public void isTypeOf_primitiveDouble() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveDouble.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveDouble.class));
     assertWithMessage("mirror of a double").that(MoreTypes.isTypeOf(Double.TYPE, type)).isTrue();
@@ -123,7 +123,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveFloat() {
+  public void isTypeOf_primitiveFloat() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveFloat.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveFloat.class));
     assertWithMessage("mirror of a float").that(MoreTypes.isTypeOf(Float.TYPE, type)).isTrue();
@@ -134,7 +134,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveInt() {
+  public void isTypeOf_primitiveInt() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveInt.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveInt.class));
     assertWithMessage("mirror of a int").that(MoreTypes.isTypeOf(Integer.TYPE, type)).isTrue();
@@ -145,7 +145,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveLong() {
+  public void isTypeOf_primitiveLong() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveLong.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveLong.class));
     assertWithMessage("mirror of a long").that(MoreTypes.isTypeOf(Long.TYPE, type)).isTrue();
@@ -156,7 +156,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_PrimitiveShort() {
+  public void isTypeOf_primitiveShort() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveShort.class).asType()));
     TypeMirror type = extractReturnTypeFromHolder(typeElementFor(PrimitiveShort.class));
     assertWithMessage("mirror of a short").that(MoreTypes.isTypeOf(Short.TYPE, type)).isTrue();
@@ -167,7 +167,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_void() {
+  public void isTypeOf_primitiveVoid() {
     assertTrue(MoreTypes.isType(typeElementFor(PrimitiveVoid.class).asType()));
     TypeMirror primitive = extractReturnTypeFromHolder(typeElementFor(PrimitiveVoid.class));
     assertWithMessage("mirror of a void").that(MoreTypes.isTypeOf(Void.TYPE, primitive)).isTrue();
@@ -178,7 +178,7 @@ public class MoreTypesIsTypeOfTest {
   }
 
   @Test
-  public void isTypeOf_Void() {
+  public void isTypeOf_declaredVoid() {
     assertTrue(MoreTypes.isType(typeElementFor(DeclaredVoid.class).asType()));
     TypeMirror declared = extractReturnTypeFromHolder(typeElementFor(DeclaredVoid.class));
     assertWithMessage("mirror of a void").that(MoreTypes.isTypeOf(Void.class, declared)).isTrue();
diff --git a/common/src/test/java/com/google/auto/common/MoreTypesTest.java b/common/src/test/java/com/google/auto/common/MoreTypesTest.java
index bc55d63f..5ecf779f 100644
--- a/common/src/test/java/com/google/auto/common/MoreTypesTest.java
+++ b/common/src/test/java/com/google/auto/common/MoreTypesTest.java
@@ -21,7 +21,6 @@ import static javax.lang.model.type.TypeKind.VOID;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
@@ -159,13 +158,7 @@ public class MoreTypesTest {
       ImmutableList<TypeMirror> equivalenceGroup =
           FluentIterable.from(
                   elements.getTypeElement(testClass.getCanonicalName()).getEnclosedElements())
-              .transform(
-                  new Function<Element, TypeMirror>() {
-                    @Override
-                    public TypeMirror apply(Element input) {
-                      return input.asType();
-                    }
-                  })
+              .transform(Element::asType)
               .toList();
       tester.addEquivalenceGroup(equivalenceGroup);
     }
@@ -239,13 +232,7 @@ public class MoreTypesTest {
         elements.getTypeElement(ReferencedTypesTestData.class.getCanonicalName());
     ImmutableMap<String, VariableElement> fieldIndex =
         FluentIterable.from(ElementFilter.fieldsIn(testDataElement.getEnclosedElements()))
-            .uniqueIndex(
-                new Function<VariableElement, String>() {
-                  @Override
-                  public String apply(VariableElement input) {
-                    return input.getSimpleName().toString();
-                  }
-                });
+            .uniqueIndex(input -> input.getSimpleName().toString());
 
     TypeElement objectElement = elements.getTypeElement(Object.class.getCanonicalName());
     TypeElement stringElement = elements.getTypeElement(String.class.getCanonicalName());
@@ -465,18 +452,20 @@ public class MoreTypesTest {
           return null;
         }
 
-        // JDK8 Compatibility:
-
+        @Override
         public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
           return null;
         }
 
+        @Override
         public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
           return null;
         }
 
+        @Override
+        @SuppressWarnings("MutableMethodReturnType")
         public List<? extends AnnotationMirror> getAnnotationMirrors() {
-          return null;
+          return ImmutableList.of();
         }
       };
 
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
index e31f92b6..f32e9f8d 100644
--- a/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/DaggerModule.java
@@ -16,45 +16,44 @@
 package com.google.auto.factory;
 
 import com.google.auto.factory.otherpackage.OtherPackage;
+import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 
 @Module
-final class DaggerModule {
-  @Provides
-  Dependency provideDependency(DependencyImpl impl) {
-    return impl;
-  }
+abstract class DaggerModule {
+  private DaggerModule() {} // no instances
 
-  @Provides
+  @Binds
+  abstract Dependency provideDependency(DependencyImpl impl);
+
+  @Binds
   @Qualifier
-  Dependency provideQualifiedDependency(QualifiedDependencyImpl impl) {
-    return impl;
-  }
+  abstract Dependency provideQualifiedDependency(QualifiedDependencyImpl impl);
 
   @Provides
-  int providePrimitive() {
+  static int providePrimitive() {
     return 1;
   }
 
   @Provides
   @Qualifier
-  int provideQualifiedPrimitive() {
+  static int provideQualifiedPrimitive() {
     return 2;
   }
 
   @Provides
-  Number provideNumber() {
+  static Number provideNumber() {
     return 3;
   }
 
   @Provides
-  ReferencePackage provideReferencePackage(ReferencePackageFactory factory) {
+  static ReferencePackage provideReferencePackage(ReferencePackageFactory factory) {
     return factory.create(17);
   }
 
   @Provides
-  OtherPackage provideOtherPackage() {
+  static OtherPackage provideOtherPackage() {
     return new OtherPackage(null, 23);
   }
 }
diff --git a/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java b/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
index 338d4501..4f67c3b3 100755
--- a/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
+++ b/factory/src/it/functional/src/main/java/com/google/auto/factory/ReferencePackage.java
@@ -25,7 +25,7 @@ public class ReferencePackage {
   private final int random;
 
   @Inject
-  public ReferencePackage(@Provided OtherPackageFactory otherPackageFactory, int random) {
+  ReferencePackage(@Provided OtherPackageFactory otherPackageFactory, int random) {
     this.otherPackageFactory = otherPackageFactory;
     this.random = random;
   }
diff --git a/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedTest.java b/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedTest.java
index 1b2b0e3a..5beb686b 100644
--- a/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedTest.java
+++ b/value/src/test/java/com/google/auto/value/extension/memoized/MemoizedTest.java
@@ -456,8 +456,8 @@ public class MemoizedTest {
     assertThat(memoizedHashCodeAndFinalEqualsMethod.equals(second)).isTrue();
     assertThat(memoizedHashCodeAndFinalEqualsMethod.hashCodeCount).isEqualTo(0);
 
-    memoizedHashCodeAndFinalEqualsMethod.hashCode();
-    memoizedHashCodeAndFinalEqualsMethod.hashCode();
+    int unused1 = memoizedHashCodeAndFinalEqualsMethod.hashCode();
+    int unused2 = memoizedHashCodeAndFinalEqualsMethod.hashCode();
     assertThat(memoizedHashCodeAndFinalEqualsMethod.hashCodeCount).isEqualTo(1);
   }
 
diff --git a/value/src/test/java/com/google/auto/value/processor/PropertyNamesTest.java b/value/src/test/java/com/google/auto/value/processor/PropertyNamesTest.java
index 62e8b808..d488e599 100644
--- a/value/src/test/java/com/google/auto/value/processor/PropertyNamesTest.java
+++ b/value/src/test/java/com/google/auto/value/processor/PropertyNamesTest.java
@@ -38,9 +38,8 @@ public class PropertyNamesTest {
   @Test
   public void decapitalizeLikeJavaBeans() {
     NORMAL_CASES.forEach(
-        (input, output) -> {
-          expect.that(PropertyNames.decapitalizeLikeJavaBeans(input)).isEqualTo(output);
-        });
+        (input, output) ->
+            expect.that(PropertyNames.decapitalizeLikeJavaBeans(input)).isEqualTo(output));
     expect.that(PropertyNames.decapitalizeLikeJavaBeans(null)).isNull();
     expect.that(PropertyNames.decapitalizeLikeJavaBeans("HTMLPage")).isEqualTo("HTMLPage");
     expect.that(PropertyNames.decapitalizeLikeJavaBeans("OAuth")).isEqualTo("OAuth");
@@ -49,9 +48,8 @@ public class PropertyNamesTest {
   @Test
   public void decapitalizeNormally() {
     NORMAL_CASES.forEach(
-        (input, output) -> {
-          expect.that(PropertyNames.decapitalizeNormally(input)).isEqualTo(output);
-        });
+        (input, output) ->
+            expect.that(PropertyNames.decapitalizeNormally(input)).isEqualTo(output));
     expect.that(PropertyNames.decapitalizeNormally(null)).isNull();
     expect.that(PropertyNames.decapitalizeNormally("HTMLPage")).isEqualTo("hTMLPage");
     expect.that(PropertyNames.decapitalizeNormally("OAuth")).isEqualTo("oAuth");