diff --git a/android/guava/src/com/google/common/primitives/Booleans.java b/android/guava/src/com/google/common/primitives/Booleans.java index f6bea3d8329d..28a21bd9117f 100644 --- a/android/guava/src/com/google/common/primitives/Booleans.java +++ b/android/guava/src/com/google/common/primitives/Booleans.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.AbstractList; @@ -80,7 +79,6 @@ public String toString() { * * @since 21.0 */ - @Beta public static Comparator trueFirst() { return BooleanComparator.TRUE_FIRST; } @@ -93,7 +91,6 @@ public static Comparator trueFirst() { * * @since 21.0 */ - @Beta public static Comparator falseFirst() { return BooleanComparator.FALSE_FIRST; } @@ -511,7 +508,6 @@ boolean[] toBooleanArray() { * * @since 16.0 */ - @Beta public static int countTrue(boolean... values) { int count = 0; for (boolean value : values) { diff --git a/android/guava/src/com/google/common/primitives/Chars.java b/android/guava/src/com/google/common/primitives/Chars.java index 67fb77ed9d83..e63248e90670 100644 --- a/android/guava/src/com/google/common/primitives/Chars.java +++ b/android/guava/src/com/google/common/primitives/Chars.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import java.io.Serializable; @@ -258,7 +257,6 @@ public static char max(char... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static char constrainToRange(char value, char min, char max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return value < min ? min : value < max ? value : max; diff --git a/android/guava/src/com/google/common/primitives/Doubles.java b/android/guava/src/com/google/common/primitives/Doubles.java index 836a9895a63c..99827e7e9078 100644 --- a/android/guava/src/com/google/common/primitives/Doubles.java +++ b/android/guava/src/com/google/common/primitives/Doubles.java @@ -22,7 +22,6 @@ import static java.lang.Double.NEGATIVE_INFINITY; import static java.lang.Double.POSITIVE_INFINITY; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -254,7 +253,6 @@ public static double max(double... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static double constrainToRange(double value, double min, double max) { // avoid auto-boxing by not using Preconditions.checkArgument(); see Guava issue 3984 // Reject NaN by testing for the good case (min <= max) instead of the bad (min > max). @@ -319,7 +317,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return DoubleConverter.INSTANCE; } diff --git a/android/guava/src/com/google/common/primitives/Floats.java b/android/guava/src/com/google/common/primitives/Floats.java index b938138ae1e6..9372e516197a 100644 --- a/android/guava/src/com/google/common/primitives/Floats.java +++ b/android/guava/src/com/google/common/primitives/Floats.java @@ -22,7 +22,6 @@ import static java.lang.Float.NEGATIVE_INFINITY; import static java.lang.Float.POSITIVE_INFINITY; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -251,7 +250,6 @@ public static float max(float... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static float constrainToRange(float value, float min, float max) { // avoid auto-boxing by not using Preconditions.checkArgument(); see Guava issue 3984 // Reject NaN by testing for the good case (min <= max) instead of the bad (min > max). @@ -316,7 +314,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return FloatConverter.INSTANCE; } diff --git a/android/guava/src/com/google/common/primitives/Ints.java b/android/guava/src/com/google/common/primitives/Ints.java index 25b673ad29a5..61314be8eb2e 100644 --- a/android/guava/src/com/google/common/primitives/Ints.java +++ b/android/guava/src/com/google/common/primitives/Ints.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Converter; @@ -267,7 +266,6 @@ public static int max(int... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static int constrainToRange(int value, int min, int max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return Math.min(Math.max(value, min), max); @@ -372,7 +370,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return IntConverter.INSTANCE; } diff --git a/android/guava/src/com/google/common/primitives/Longs.java b/android/guava/src/com/google/common/primitives/Longs.java index 85b01fba4287..b51109cc7d32 100644 --- a/android/guava/src/com/google/common/primitives/Longs.java +++ b/android/guava/src/com/google/common/primitives/Longs.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Converter; import java.io.Serializable; @@ -234,7 +233,6 @@ public static long max(long... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static long constrainToRange(long value, long min, long max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return Math.min(Math.max(value, min), max); @@ -465,7 +463,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return LongConverter.INSTANCE; } diff --git a/android/guava/src/com/google/common/primitives/Shorts.java b/android/guava/src/com/google/common/primitives/Shorts.java index 5713adcf4325..0faed9f85ee4 100644 --- a/android/guava/src/com/google/common/primitives/Shorts.java +++ b/android/guava/src/com/google/common/primitives/Shorts.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Converter; @@ -266,7 +265,6 @@ public static short max(short... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static short constrainToRange(short value, short min, short max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return value < min ? min : value < max ? value : max; @@ -372,7 +370,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return ShortConverter.INSTANCE; } diff --git a/android/guava/src/com/google/common/primitives/UnsignedBytes.java b/android/guava/src/com/google/common/primitives/UnsignedBytes.java index becd6b8e9491..0490c6714d47 100644 --- a/android/guava/src/com/google/common/primitives/UnsignedBytes.java +++ b/android/guava/src/com/google/common/primitives/UnsignedBytes.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkPositionIndexes; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -169,7 +168,6 @@ public static byte max(byte... array) { * * @since 13.0 */ - @Beta public static String toString(byte x) { return toString(x, 10); } @@ -184,7 +182,6 @@ public static String toString(byte x) { * and {@link Character#MAX_RADIX}. * @since 13.0 */ - @Beta public static String toString(byte x, int radix) { checkArgument( radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX, @@ -203,7 +200,6 @@ public static String toString(byte x, int radix) { * Byte#parseByte(String)}) * @since 13.0 */ - @Beta @CanIgnoreReturnValue public static byte parseUnsignedByte(String string) { return parseUnsignedByte(string, 10); @@ -221,7 +217,6 @@ public static byte parseUnsignedByte(String string) { * Byte#parseByte(String)}) * @since 13.0 */ - @Beta @CanIgnoreReturnValue public static byte parseUnsignedByte(String string, int radix) { int parse = Integer.parseInt(checkNotNull(string), radix); diff --git a/android/guava/src/com/google/common/primitives/UnsignedInts.java b/android/guava/src/com/google/common/primitives/UnsignedInts.java index ec6474e20f8a..0d556bab4706 100644 --- a/android/guava/src/com/google/common/primitives/UnsignedInts.java +++ b/android/guava/src/com/google/common/primitives/UnsignedInts.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Arrays; @@ -45,7 +44,6 @@ * @author Louis Wasserman * @since 11.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class UnsignedInts { diff --git a/guava/src/com/google/common/primitives/Booleans.java b/guava/src/com/google/common/primitives/Booleans.java index f6bea3d8329d..28a21bd9117f 100644 --- a/guava/src/com/google/common/primitives/Booleans.java +++ b/guava/src/com/google/common/primitives/Booleans.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.io.Serializable; import java.util.AbstractList; @@ -80,7 +79,6 @@ public String toString() { * * @since 21.0 */ - @Beta public static Comparator trueFirst() { return BooleanComparator.TRUE_FIRST; } @@ -93,7 +91,6 @@ public static Comparator trueFirst() { * * @since 21.0 */ - @Beta public static Comparator falseFirst() { return BooleanComparator.FALSE_FIRST; } @@ -511,7 +508,6 @@ boolean[] toBooleanArray() { * * @since 16.0 */ - @Beta public static int countTrue(boolean... values) { int count = 0; for (boolean value : values) { diff --git a/guava/src/com/google/common/primitives/Chars.java b/guava/src/com/google/common/primitives/Chars.java index 67fb77ed9d83..e63248e90670 100644 --- a/guava/src/com/google/common/primitives/Chars.java +++ b/guava/src/com/google/common/primitives/Chars.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import java.io.Serializable; @@ -258,7 +257,6 @@ public static char max(char... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static char constrainToRange(char value, char min, char max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return value < min ? min : value < max ? value : max; diff --git a/guava/src/com/google/common/primitives/Doubles.java b/guava/src/com/google/common/primitives/Doubles.java index e66da6685c92..3a532eac9796 100644 --- a/guava/src/com/google/common/primitives/Doubles.java +++ b/guava/src/com/google/common/primitives/Doubles.java @@ -22,7 +22,6 @@ import static java.lang.Double.NEGATIVE_INFINITY; import static java.lang.Double.POSITIVE_INFINITY; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -256,7 +255,6 @@ public static double max(double... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static double constrainToRange(double value, double min, double max) { // avoid auto-boxing by not using Preconditions.checkArgument(); see Guava issue 3984 // Reject NaN by testing for the good case (min <= max) instead of the bad (min > max). @@ -321,7 +319,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return DoubleConverter.INSTANCE; } diff --git a/guava/src/com/google/common/primitives/Floats.java b/guava/src/com/google/common/primitives/Floats.java index b938138ae1e6..9372e516197a 100644 --- a/guava/src/com/google/common/primitives/Floats.java +++ b/guava/src/com/google/common/primitives/Floats.java @@ -22,7 +22,6 @@ import static java.lang.Float.NEGATIVE_INFINITY; import static java.lang.Float.POSITIVE_INFINITY; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -251,7 +250,6 @@ public static float max(float... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static float constrainToRange(float value, float min, float max) { // avoid auto-boxing by not using Preconditions.checkArgument(); see Guava issue 3984 // Reject NaN by testing for the good case (min <= max) instead of the bad (min > max). @@ -316,7 +314,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return FloatConverter.INSTANCE; } diff --git a/guava/src/com/google/common/primitives/Ints.java b/guava/src/com/google/common/primitives/Ints.java index 732c64639c64..aa20da3fdc33 100644 --- a/guava/src/com/google/common/primitives/Ints.java +++ b/guava/src/com/google/common/primitives/Ints.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Converter; @@ -269,7 +268,6 @@ public static int max(int... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static int constrainToRange(int value, int min, int max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return Math.min(Math.max(value, min), max); @@ -374,7 +372,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return IntConverter.INSTANCE; } diff --git a/guava/src/com/google/common/primitives/Longs.java b/guava/src/com/google/common/primitives/Longs.java index c60596213a11..06aad7a0a245 100644 --- a/guava/src/com/google/common/primitives/Longs.java +++ b/guava/src/com/google/common/primitives/Longs.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Converter; import java.io.Serializable; @@ -236,7 +235,6 @@ public static long max(long... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static long constrainToRange(long value, long min, long max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return Math.min(Math.max(value, min), max); @@ -467,7 +465,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return LongConverter.INSTANCE; } diff --git a/guava/src/com/google/common/primitives/Shorts.java b/guava/src/com/google/common/primitives/Shorts.java index 5713adcf4325..0faed9f85ee4 100644 --- a/guava/src/com/google/common/primitives/Shorts.java +++ b/guava/src/com/google/common/primitives/Shorts.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Converter; @@ -266,7 +265,6 @@ public static short max(short... array) { * @throws IllegalArgumentException if {@code min > max} * @since 21.0 */ - @Beta public static short constrainToRange(short value, short min, short max) { checkArgument(min <= max, "min (%s) must be less than or equal to max (%s)", min, max); return value < min ? min : value < max ? value : max; @@ -372,7 +370,6 @@ private Object readResolve() { * * @since 16.0 */ - @Beta public static Converter stringConverter() { return ShortConverter.INSTANCE; } diff --git a/guava/src/com/google/common/primitives/UnsignedBytes.java b/guava/src/com/google/common/primitives/UnsignedBytes.java index becd6b8e9491..0490c6714d47 100644 --- a/guava/src/com/google/common/primitives/UnsignedBytes.java +++ b/guava/src/com/google/common/primitives/UnsignedBytes.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkPositionIndexes; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -169,7 +168,6 @@ public static byte max(byte... array) { * * @since 13.0 */ - @Beta public static String toString(byte x) { return toString(x, 10); } @@ -184,7 +182,6 @@ public static String toString(byte x) { * and {@link Character#MAX_RADIX}. * @since 13.0 */ - @Beta public static String toString(byte x, int radix) { checkArgument( radix >= Character.MIN_RADIX && radix <= Character.MAX_RADIX, @@ -203,7 +200,6 @@ public static String toString(byte x, int radix) { * Byte#parseByte(String)}) * @since 13.0 */ - @Beta @CanIgnoreReturnValue public static byte parseUnsignedByte(String string) { return parseUnsignedByte(string, 10); @@ -221,7 +217,6 @@ public static byte parseUnsignedByte(String string) { * Byte#parseByte(String)}) * @since 13.0 */ - @Beta @CanIgnoreReturnValue public static byte parseUnsignedByte(String string, int radix) { int parse = Integer.parseInt(checkNotNull(string), radix); diff --git a/guava/src/com/google/common/primitives/UnsignedInts.java b/guava/src/com/google/common/primitives/UnsignedInts.java index ec6474e20f8a..0d556bab4706 100644 --- a/guava/src/com/google/common/primitives/UnsignedInts.java +++ b/guava/src/com/google/common/primitives/UnsignedInts.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkPositionIndexes; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Arrays; @@ -45,7 +44,6 @@ * @author Louis Wasserman * @since 11.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class UnsignedInts {