Mark a bunch of subjects final.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=127901946

core/src/main/java/com/google/common/truth/ClassSubject.java

@@ -16,7 +16,6 @@
 package com.google.common.truth;
 
 import com.google.common.annotations.GwtIncompatible;
-
 import javax.annotation.Nullable;
 
 /**
@@ -25,7 +24,7 @@
  * @author Kurt Alfred Kluever
  */
 @GwtIncompatible("reflection")
-public class ClassSubject extends Subject<ClassSubject, Class<?>> {
+public final class ClassSubject extends Subject<ClassSubject, Class<?>> {
  ClassSubject(FailureStrategy failureStrategy, @Nullable Class<?> o) {
  super(failureStrategy, o);
  }

core/src/main/java/com/google/common/truth/DefaultSubject.java

@@ -17,7 +17,9 @@
 
 import javax.annotation.Nullable;
 
+// TODO(kak): Make this final?
 public class DefaultSubject extends Subject<DefaultSubject, Object> {
+ // TODO(kak): Make this package-protected?
  public DefaultSubject(FailureStrategy failureStrategy, @Nullable Object o) {
  super(failureStrategy, o);
  }

core/src/main/java/com/google/common/truth/GuavaOptionalSubject.java

@@ -16,15 +16,14 @@
 package com.google.common.truth;
 
 import com.google.common.base.Optional;
-
 import javax.annotation.Nullable;
 
 /**
  * Propositions for Guava {@link Optional} subjects.
  *
  * @author Christian Gruber
  */
-public class GuavaOptionalSubject extends Subject<GuavaOptionalSubject, Optional<?>> {
+public final class GuavaOptionalSubject extends Subject<GuavaOptionalSubject, Optional<?>> {
  GuavaOptionalSubject(FailureStrategy failureStrategy, @Nullable Optional<?> subject) {
  super(failureStrategy, subject);
  }

core/src/main/java/com/google/common/truth/IntegerSubject.java

@@ -26,11 +26,13 @@
  */
 // Can't be final because we use codegen to generate a subclass
 public class IntegerSubject extends ComparableSubject<IntegerSubject, Integer> {
+ // TODO(kak): Make this package-protected?
  public IntegerSubject(FailureStrategy failureStrategy, @Nullable Integer integer) {
  super(failureStrategy, integer);
  }
 
  /** @deprecated Use {@link #isEqualTo} instead. Integer comparison is consistent with equality. */
+ @Override
  @Deprecated
  public final void isEquivalentAccordingToCompareTo(Integer other) {
  super.isEquivalentAccordingToCompareTo(other);

core/src/main/java/com/google/common/truth/IterableSubject.java

@@ -31,22 +31,22 @@
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * Propositions for {@link Iterable} subjects.
  *
  * @author Kurt Alfred Kluever
  */
+// Can't be final since MultisetSubject extends it
 public class IterableSubject extends Subject<IterableSubject, Iterable<?>> {
 
+ // TODO(kak): Make this package-protected?
  protected IterableSubject(FailureStrategy failureStrategy, @Nullable Iterable<?> list) {
  super(failureStrategy, list);
  }

core/src/main/java/com/google/common/truth/ListMultimapSubject.java

@@ -17,9 +17,7 @@
 
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.SetMultimap;
-
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
@@ -28,7 +26,7 @@
  *
  * @author Daniel Ploch
  */
-public class ListMultimapSubject extends MultimapSubject {
+public final class ListMultimapSubject extends MultimapSubject {
  ListMultimapSubject(FailureStrategy failureStrategy, @Nullable ListMultimap<?, ?> multimap) {
  super(failureStrategy, multimap);
  }

core/src/main/java/com/google/common/truth/LongSubject.java

@@ -26,11 +26,13 @@
  */
 // Can't be final because we use codegen to generate a subclass
 public class LongSubject extends ComparableSubject<LongSubject, Long> {
+ // TODO(kak): Make this package-protected?
  public LongSubject(FailureStrategy failureStrategy, @Nullable Long subject) {
  super(failureStrategy, subject);
  }
 
  /** @deprecated Use {@link #isEqualTo} instead. Long comparison is consistent with equality. */
+ @Override
  @Deprecated
  public final void isEquivalentAccordingToCompareTo(Long other) {
  super.isEquivalentAccordingToCompareTo(other);

core/src/main/java/com/google/common/truth/MapSubject.java

@@ -23,12 +23,10 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multiset;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.annotation.Nullable;
 
 /**
@@ -37,7 +35,7 @@
  * @author Christian Gruber
  * @author Kurt Alfred Kluever
  */
-public class MapSubject extends Subject<MapSubject, Map<?, ?>> {
+public final class MapSubject extends Subject<MapSubject, Map<?, ?>> {
  MapSubject(FailureStrategy failureStrategy, @Nullable Map<?, ?> map) {
  super(failureStrategy, map);
  }

core/src/main/java/com/google/common/truth/MultimapSubject.java

@@ -44,6 +44,7 @@
  * @author Daniel Ploch
  * @author Kurt Alfred Kluever
  */
+// Not final since SetMultimapSubject and ListMultimapSubject extends this
 public class MultimapSubject extends Subject<MultimapSubject, Multimap<?, ?>> {
  MultimapSubject(FailureStrategy failureStrategy, @Nullable Multimap<?, ?> multimap) {
  super(failureStrategy, multimap);

core/src/main/java/com/google/common/truth/ObjectArraySubject.java

@@ -28,18 +28,16 @@
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code Object[]} and more generically {@code T[]}.
  *
  * @author Christian Gruber
  */
-public class ObjectArraySubject<T> extends AbstractArraySubject<ObjectArraySubject<T>, T[]> {
+public final class ObjectArraySubject<T> extends AbstractArraySubject<ObjectArraySubject<T>, T[]> {
  private final String typeName;
  private final int numberOfDimensions;
 

core/src/main/java/com/google/common/truth/PrimitiveBooleanArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Booleans;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code boolean[]}.
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveBooleanArraySubject
+public final class PrimitiveBooleanArraySubject
  extends AbstractArraySubject<PrimitiveBooleanArraySubject, boolean[]> {
  PrimitiveBooleanArraySubject(FailureStrategy failureStrategy, @Nullable boolean[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveByteArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Bytes;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code byte[]}.
  *
  * @author Kurt Alfred Kluever
  */
-public class PrimitiveByteArraySubject
+public final class PrimitiveByteArraySubject
  extends AbstractArraySubject<PrimitiveByteArraySubject, byte[]> {
  PrimitiveByteArraySubject(FailureStrategy failureStrategy, @Nullable byte[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveCharArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Chars;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code char[]}.
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveCharArraySubject
+public final class PrimitiveCharArraySubject
  extends AbstractArraySubject<PrimitiveCharArraySubject, char[]> {
  PrimitiveCharArraySubject(FailureStrategy failureStrategy, @Nullable char[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveDoubleArraySubject.java

@@ -23,10 +23,8 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Doubles;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
@@ -38,7 +36,7 @@
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveDoubleArraySubject
+public final class PrimitiveDoubleArraySubject
  extends AbstractArraySubject<PrimitiveDoubleArraySubject, double[]> {
  PrimitiveDoubleArraySubject(FailureStrategy failureStrategy, @Nullable double[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveFloatArraySubject.java

@@ -23,10 +23,8 @@
 
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Floats;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
@@ -38,7 +36,7 @@
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveFloatArraySubject
+public final class PrimitiveFloatArraySubject
  extends AbstractArraySubject<PrimitiveFloatArraySubject, float[]> {
  PrimitiveFloatArraySubject(FailureStrategy failureStrategy, @Nullable float[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveIntArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Ints;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code int[]}.
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveIntArraySubject
+public final class PrimitiveIntArraySubject
  extends AbstractArraySubject<PrimitiveIntArraySubject, int[]> {
  PrimitiveIntArraySubject(FailureStrategy failureStrategy, @Nullable int[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveLongArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Longs;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code long[]}.
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveLongArraySubject
+public final class PrimitiveLongArraySubject
  extends AbstractArraySubject<PrimitiveLongArraySubject, long[]> {
  PrimitiveLongArraySubject(FailureStrategy failureStrategy, @Nullable long[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/PrimitiveShortArraySubject.java

@@ -16,18 +16,16 @@
 package com.google.common.truth;
 
 import com.google.common.primitives.Shorts;
-
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.Nullable;
 
 /**
  * A Subject to handle testing propositions for {@code short[]}.
  *
  * @author Christian Gruber ([email protected])
  */
-public class PrimitiveShortArraySubject
+public final class PrimitiveShortArraySubject
  extends AbstractArraySubject<PrimitiveShortArraySubject, short[]> {
  PrimitiveShortArraySubject(FailureStrategy failureStrategy, @Nullable short[] o) {
  super(failureStrategy, o);

core/src/main/java/com/google/common/truth/ReflectionUtil.java

@@ -16,7 +16,6 @@
 package com.google.common.truth;
 
 import com.google.common.annotations.GwtIncompatible;
-
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
@@ -26,7 +25,7 @@
  * @author Christian Gruber ([email protected])
  */
 @GwtIncompatible("java.lang.reflect.*")
-public final class ReflectionUtil {
+final class ReflectionUtil {
  private ReflectionUtil() {}
 
  /** Returns the captured type. */

core/src/main/java/com/google/common/truth/SetMultimapSubject.java

@@ -17,7 +17,6 @@
 
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.SetMultimap;
-
 import javax.annotation.Nullable;
 
 /**
@@ -26,7 +25,7 @@
  *
  * @author Daniel Ploch
  */
-public class SetMultimapSubject extends MultimapSubject {
+public final class SetMultimapSubject extends MultimapSubject {
  SetMultimapSubject(FailureStrategy failureStrategy, @Nullable SetMultimap<?, ?> multimap) {
  super(failureStrategy, multimap);
  }

core/src/main/java/com/google/common/truth/StringSubject.java

@@ -19,9 +19,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.GwtIncompatible;
-
 import java.util.regex.Pattern;
-
 import javax.annotation.Nullable;
 
 /**
@@ -30,7 +28,9 @@
  * @author David Saff
  * @author Christian Gruber ([email protected])
  */
+// TODO(kak): Make this final
 public class StringSubject extends ComparableSubject<StringSubject, String> {
+ // TODO(kak): Make this package-private
  public StringSubject(FailureStrategy failureStrategy, @Nullable String string) {
  super(failureStrategy, string);
  }

core/src/main/java/com/google/common/truth/ThrowableSubject.java

@@ -16,7 +16,6 @@
 package com.google.common.truth;
 
 import com.google.common.base.Objects;
-
 import javax.annotation.Nullable;
 
 /**
@@ -25,6 +24,7 @@
  * @author Kurt Alfred Kluever
  */
 public final class ThrowableSubject extends Subject<ThrowableSubject, Throwable> {
+ // TODO(kak): Make this package-private?
  public ThrowableSubject(FailureStrategy failureStrategy, @Nullable Throwable throwable) {
  super(causeInsertingStrategy(failureStrategy, throwable), throwable);
  }