From a5892560de926b0ab01ba2614f5002ff547a32a2 Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Wed, 17 May 2023 07:32:30 -0700 Subject: [PATCH] Remove `@Beta` from various `io` APIs. RELNOTES=`io`: Remove `@Beta` from various `io` APIs. PiperOrigin-RevId: 532782558 --- android/guava/src/com/google/common/io/ByteProcessor.java | 2 -- android/guava/src/com/google/common/io/ByteSource.java | 3 --- android/guava/src/com/google/common/io/CharSource.java | 5 ----- android/guava/src/com/google/common/io/CharStreams.java | 7 ------- android/guava/src/com/google/common/io/Closeables.java | 2 -- android/guava/src/com/google/common/io/Closer.java | 2 -- .../src/com/google/common/io/CountingInputStream.java | 2 -- android/guava/src/com/google/common/io/Files.java | 1 - android/guava/src/com/google/common/io/Flushables.java | 2 +- android/guava/src/com/google/common/io/LineProcessor.java | 2 -- android/guava/src/com/google/common/io/LineReader.java | 2 -- .../com/google/common/io/LittleEndianDataInputStream.java | 2 -- .../com/google/common/io/LittleEndianDataOutputStream.java | 2 -- .../src/com/google/common/io/PatternFilenameFilter.java | 2 -- guava/src/com/google/common/io/ByteProcessor.java | 2 -- guava/src/com/google/common/io/ByteSource.java | 3 --- guava/src/com/google/common/io/CharSink.java | 3 --- guava/src/com/google/common/io/CharSource.java | 7 ------- guava/src/com/google/common/io/CharStreams.java | 7 ------- guava/src/com/google/common/io/Closeables.java | 2 -- guava/src/com/google/common/io/Closer.java | 2 -- guava/src/com/google/common/io/CountingInputStream.java | 2 -- guava/src/com/google/common/io/Files.java | 1 - guava/src/com/google/common/io/Flushables.java | 2 +- .../google/common/io/InsecureRecursiveDeleteException.java | 2 -- guava/src/com/google/common/io/LineProcessor.java | 2 -- guava/src/com/google/common/io/LineReader.java | 2 -- .../com/google/common/io/LittleEndianDataInputStream.java | 2 -- .../com/google/common/io/LittleEndianDataOutputStream.java | 2 -- guava/src/com/google/common/io/MoreFiles.java | 2 -- guava/src/com/google/common/io/PatternFilenameFilter.java | 2 -- guava/src/com/google/common/io/RecursiveDeleteOption.java | 2 -- 32 files changed, 2 insertions(+), 81 deletions(-) diff --git a/android/guava/src/com/google/common/io/ByteProcessor.java b/android/guava/src/com/google/common/io/ByteProcessor.java index 5271c409579a..cfb531c5a7f9 100644 --- a/android/guava/src/com/google/common/io/ByteProcessor.java +++ b/android/guava/src/com/google/common/io/ByteProcessor.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -31,7 +30,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @DoNotMock("Implement it normally") @J2ktIncompatible @GwtIncompatible diff --git a/android/guava/src/com/google/common/io/ByteSource.java b/android/guava/src/com/google/common/io/ByteSource.java index cda48af84cd0..31a5aa5d53e7 100644 --- a/android/guava/src/com/google/common/io/ByteSource.java +++ b/android/guava/src/com/google/common/io/ByteSource.java @@ -19,7 +19,6 @@ import static com.google.common.io.ByteStreams.createBuffer; import static com.google.common.io.ByteStreams.skipUpTo; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Ascii; @@ -180,7 +179,6 @@ public boolean isEmpty() throws IOException { * * @since 19.0 */ - @Beta public Optional sizeIfKnown() { return Optional.absent(); } @@ -316,7 +314,6 @@ public byte[] read() throws IOException { * processor} throws an {@code IOException} * @since 16.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public T read(ByteProcessor processor) throws IOException { diff --git a/android/guava/src/com/google/common/io/CharSource.java b/android/guava/src/com/google/common/io/CharSource.java index 1ced1100b602..f7a4abe878bd 100644 --- a/android/guava/src/com/google/common/io/CharSource.java +++ b/android/guava/src/com/google/common/io/CharSource.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Ascii; @@ -96,7 +95,6 @@ protected CharSource() {} * * @since 20.0 */ - @Beta public ByteSource asByteSource(Charset charset) { return new AsByteSource(charset); } @@ -140,7 +138,6 @@ public BufferedReader openBufferedStream() throws IOException { * * @since 19.0 */ - @Beta public Optional lengthIfKnown() { return Optional.absent(); } @@ -164,7 +161,6 @@ public Optional lengthIfKnown() { * @throws IOException if an I/O error occurs while reading the length of this source * @since 19.0 */ - @Beta public long length() throws IOException { Optional lengthIfKnown = lengthIfKnown(); if (lengthIfKnown.isPresent()) { @@ -319,7 +315,6 @@ public ImmutableList readLines() throws IOException { * processor} throws an {@code IOException} * @since 16.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public T readLines(LineProcessor processor) throws IOException { diff --git a/android/guava/src/com/google/common/io/CharStreams.java b/android/guava/src/com/google/common/io/CharStreams.java index 0f7dae83ecac..877de824de79 100644 --- a/android/guava/src/com/google/common/io/CharStreams.java +++ b/android/guava/src/com/google/common/io/CharStreams.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -195,7 +194,6 @@ private static StringBuilder toStringBuilder(Readable r) throws IOException { * @return a mutable {@link List} containing all the lines * @throws IOException if an I/O error occurs */ - @Beta public static List readLines(Readable r) throws IOException { List result = new ArrayList<>(); LineReader lineReader = new LineReader(r); @@ -215,7 +213,6 @@ public static List readLines(Readable r) throws IOException { * @throws IOException if an I/O error occurs * @since 14.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public static T readLines( @@ -239,7 +236,6 @@ public static List readLines(Readable r) throws IOException { * * @since 20.0 */ - @Beta @CanIgnoreReturnValue public static long exhaust(Readable readable) throws IOException { long total = 0; @@ -261,7 +257,6 @@ public static long exhaust(Readable readable) throws IOException { * @throws EOFException if this stream reaches the end before skipping all the characters * @throws IOException if an I/O error occurs */ - @Beta public static void skipFully(Reader reader, long n) throws IOException { checkNotNull(reader); while (n > 0) { @@ -278,7 +273,6 @@ public static void skipFully(Reader reader, long n) throws IOException { * * @since 15.0 */ - @Beta public static Writer nullWriter() { return NullWriter.INSTANCE; } @@ -346,7 +340,6 @@ public String toString() { * @param target the object to which output will be sent * @return a new Writer object, unless target is a Writer, in which case the target is returned */ - @Beta public static Writer asWriter(Appendable target) { if (target instanceof Writer) { return (Writer) target; diff --git a/android/guava/src/com/google/common/io/Closeables.java b/android/guava/src/com/google/common/io/Closeables.java index 1da5f279a452..aca51a996fb9 100644 --- a/android/guava/src/com/google/common/io/Closeables.java +++ b/android/guava/src/com/google/common/io/Closeables.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -32,7 +31,6 @@ * @author Michael Lancaster * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/Closer.java b/android/guava/src/com/google/common/io/Closer.java index a74e084ee79e..8e1db7a83096 100644 --- a/android/guava/src/com/google/common/io/Closer.java +++ b/android/guava/src/com/google/common/io/Closer.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -88,7 +87,6 @@ * @since 14.0 */ // Coffee's for {@link Closer closers} only. -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/CountingInputStream.java b/android/guava/src/com/google/common/io/CountingInputStream.java index 1624cf537b66..bc481dd7433b 100644 --- a/android/guava/src/com/google/common/io/CountingInputStream.java +++ b/android/guava/src/com/google/common/io/CountingInputStream.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.io.FilterInputStream; @@ -29,7 +28,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/Files.java b/android/guava/src/com/google/common/io/Files.java index 940dcbde2804..6612648bcb35 100644 --- a/android/guava/src/com/google/common/io/Files.java +++ b/android/guava/src/com/google/common/io/Files.java @@ -851,7 +851,6 @@ public static String getNameWithoutExtension(String file) { * * @since 23.5 */ - @Beta public static Traverser fileTraverser() { return Traverser.forTree(FILE_TREE); } diff --git a/android/guava/src/com/google/common/io/Flushables.java b/android/guava/src/com/google/common/io/Flushables.java index 7d4b06efc13e..4a42e4a407a8 100644 --- a/android/guava/src/com/google/common/io/Flushables.java +++ b/android/guava/src/com/google/common/io/Flushables.java @@ -28,7 +28,6 @@ * @author Michael Lancaster * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault @@ -68,6 +67,7 @@ public static void flush(Flushable flushable, boolean swallowIOException) throws * * @param flushable the {@code Flushable} object to be flushed. */ + @Beta public static void flushQuietly(Flushable flushable) { try { flush(flushable, true); diff --git a/android/guava/src/com/google/common/io/LineProcessor.java b/android/guava/src/com/google/common/io/LineProcessor.java index 5886c8d7737c..c0e08fa119f0 100644 --- a/android/guava/src/com/google/common/io/LineProcessor.java +++ b/android/guava/src/com/google/common/io/LineProcessor.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -30,7 +29,6 @@ * @author Miles Barr * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/LineReader.java b/android/guava/src/com/google/common/io/LineReader.java index a42a02296127..54bf04c7caad 100644 --- a/android/guava/src/com/google/common/io/LineReader.java +++ b/android/guava/src/com/google/common/io/LineReader.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.CharStreams.createBuffer; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/LittleEndianDataInputStream.java b/android/guava/src/com/google/common/io/LittleEndianDataInputStream.java index 76f674f84d83..54b1b14e87fa 100644 --- a/android/guava/src/com/google/common/io/LittleEndianDataInputStream.java +++ b/android/guava/src/com/google/common/io/LittleEndianDataInputStream.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -40,7 +39,6 @@ * @author Keith Bottner * @since 8.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/LittleEndianDataOutputStream.java b/android/guava/src/com/google/common/io/LittleEndianDataOutputStream.java index 2adf6f76e79f..5d534f61cf68 100644 --- a/android/guava/src/com/google/common/io/LittleEndianDataOutputStream.java +++ b/android/guava/src/com/google/common/io/LittleEndianDataOutputStream.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -36,7 +35,6 @@ * @author Keith Bottner * @since 8.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/io/PatternFilenameFilter.java b/android/guava/src/com/google/common/io/PatternFilenameFilter.java index 59e816842756..ee0a0bda20f4 100644 --- a/android/guava/src/com/google/common/io/PatternFilenameFilter.java +++ b/android/guava/src/com/google/common/io/PatternFilenameFilter.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -30,7 +29,6 @@ * @author Apple Chow * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/ByteProcessor.java b/guava/src/com/google/common/io/ByteProcessor.java index 5271c409579a..cfb531c5a7f9 100644 --- a/guava/src/com/google/common/io/ByteProcessor.java +++ b/guava/src/com/google/common/io/ByteProcessor.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -31,7 +30,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @DoNotMock("Implement it normally") @J2ktIncompatible @GwtIncompatible diff --git a/guava/src/com/google/common/io/ByteSource.java b/guava/src/com/google/common/io/ByteSource.java index cda48af84cd0..31a5aa5d53e7 100644 --- a/guava/src/com/google/common/io/ByteSource.java +++ b/guava/src/com/google/common/io/ByteSource.java @@ -19,7 +19,6 @@ import static com.google.common.io.ByteStreams.createBuffer; import static com.google.common.io.ByteStreams.skipUpTo; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Ascii; @@ -180,7 +179,6 @@ public boolean isEmpty() throws IOException { * * @since 19.0 */ - @Beta public Optional sizeIfKnown() { return Optional.absent(); } @@ -316,7 +314,6 @@ public byte[] read() throws IOException { * processor} throws an {@code IOException} * @since 16.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public T read(ByteProcessor processor) throws IOException { diff --git a/guava/src/com/google/common/io/CharSink.java b/guava/src/com/google/common/io/CharSink.java index f3f443369cbb..160522ed5130 100644 --- a/guava/src/com/google/common/io/CharSink.java +++ b/guava/src/com/google/common/io/CharSink.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -137,7 +136,6 @@ public void writeLines(Iterable lines, String lineSepara * @throws IOException if an I/O error occurs while writing to this sink * @since 22.0 */ - @Beta public void writeLines(Stream lines) throws IOException { writeLines(lines, System.getProperty("line.separator")); } @@ -149,7 +147,6 @@ public void writeLines(Stream lines) throws IOException * @throws IOException if an I/O error occurs while writing to this sink * @since 22.0 */ - @Beta public void writeLines(Stream lines, String lineSeparator) throws IOException { writeLines(lines.iterator(), lineSeparator); diff --git a/guava/src/com/google/common/io/CharSource.java b/guava/src/com/google/common/io/CharSource.java index 75492f5b90f0..3c82bac13409 100644 --- a/guava/src/com/google/common/io/CharSource.java +++ b/guava/src/com/google/common/io/CharSource.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Ascii; @@ -101,7 +100,6 @@ protected CharSource() {} * * @since 20.0 */ - @Beta public ByteSource asByteSource(Charset charset) { return new AsByteSource(charset); } @@ -157,7 +155,6 @@ public BufferedReader openBufferedStream() throws IOException { * @throws IOException if an I/O error occurs while opening the stream * @since 22.0 */ - @Beta @MustBeClosed public Stream lines() throws IOException { BufferedReader reader = openBufferedStream(); @@ -187,7 +184,6 @@ public Stream lines() throws IOException { * * @since 19.0 */ - @Beta public Optional lengthIfKnown() { return Optional.absent(); } @@ -211,7 +207,6 @@ public Optional lengthIfKnown() { * @throws IOException if an I/O error occurs while reading the length of this source * @since 19.0 */ - @Beta public long length() throws IOException { Optional lengthIfKnown = lengthIfKnown(); if (lengthIfKnown.isPresent()) { @@ -366,7 +361,6 @@ public ImmutableList readLines() throws IOException { * processor} throws an {@code IOException} * @since 16.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public T readLines(LineProcessor processor) throws IOException { @@ -396,7 +390,6 @@ public ImmutableList readLines() throws IOException { * throws an {@code UncheckedIOException} * @since 22.0 */ - @Beta public void forEachLine(Consumer action) throws IOException { try (Stream lines = lines()) { // The lines should be ordered regardless in most cases, but use forEachOrdered to be sure diff --git a/guava/src/com/google/common/io/CharStreams.java b/guava/src/com/google/common/io/CharStreams.java index 0f7dae83ecac..877de824de79 100644 --- a/guava/src/com/google/common/io/CharStreams.java +++ b/guava/src/com/google/common/io/CharStreams.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -195,7 +194,6 @@ private static StringBuilder toStringBuilder(Readable r) throws IOException { * @return a mutable {@link List} containing all the lines * @throws IOException if an I/O error occurs */ - @Beta public static List readLines(Readable r) throws IOException { List result = new ArrayList<>(); LineReader lineReader = new LineReader(r); @@ -215,7 +213,6 @@ public static List readLines(Readable r) throws IOException { * @throws IOException if an I/O error occurs * @since 14.0 */ - @Beta @CanIgnoreReturnValue // some processors won't return a useful result @ParametricNullness public static T readLines( @@ -239,7 +236,6 @@ public static List readLines(Readable r) throws IOException { * * @since 20.0 */ - @Beta @CanIgnoreReturnValue public static long exhaust(Readable readable) throws IOException { long total = 0; @@ -261,7 +257,6 @@ public static long exhaust(Readable readable) throws IOException { * @throws EOFException if this stream reaches the end before skipping all the characters * @throws IOException if an I/O error occurs */ - @Beta public static void skipFully(Reader reader, long n) throws IOException { checkNotNull(reader); while (n > 0) { @@ -278,7 +273,6 @@ public static void skipFully(Reader reader, long n) throws IOException { * * @since 15.0 */ - @Beta public static Writer nullWriter() { return NullWriter.INSTANCE; } @@ -346,7 +340,6 @@ public String toString() { * @param target the object to which output will be sent * @return a new Writer object, unless target is a Writer, in which case the target is returned */ - @Beta public static Writer asWriter(Appendable target) { if (target instanceof Writer) { return (Writer) target; diff --git a/guava/src/com/google/common/io/Closeables.java b/guava/src/com/google/common/io/Closeables.java index 1da5f279a452..aca51a996fb9 100644 --- a/guava/src/com/google/common/io/Closeables.java +++ b/guava/src/com/google/common/io/Closeables.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -32,7 +31,6 @@ * @author Michael Lancaster * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/Closer.java b/guava/src/com/google/common/io/Closer.java index a74e084ee79e..8e1db7a83096 100644 --- a/guava/src/com/google/common/io/Closer.java +++ b/guava/src/com/google/common/io/Closer.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -88,7 +87,6 @@ * @since 14.0 */ // Coffee's for {@link Closer closers} only. -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/CountingInputStream.java b/guava/src/com/google/common/io/CountingInputStream.java index 1624cf537b66..bc481dd7433b 100644 --- a/guava/src/com/google/common/io/CountingInputStream.java +++ b/guava/src/com/google/common/io/CountingInputStream.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.io.FilterInputStream; @@ -29,7 +28,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/Files.java b/guava/src/com/google/common/io/Files.java index 940dcbde2804..6612648bcb35 100644 --- a/guava/src/com/google/common/io/Files.java +++ b/guava/src/com/google/common/io/Files.java @@ -851,7 +851,6 @@ public static String getNameWithoutExtension(String file) { * * @since 23.5 */ - @Beta public static Traverser fileTraverser() { return Traverser.forTree(FILE_TREE); } diff --git a/guava/src/com/google/common/io/Flushables.java b/guava/src/com/google/common/io/Flushables.java index 7d4b06efc13e..4a42e4a407a8 100644 --- a/guava/src/com/google/common/io/Flushables.java +++ b/guava/src/com/google/common/io/Flushables.java @@ -28,7 +28,6 @@ * @author Michael Lancaster * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault @@ -68,6 +67,7 @@ public static void flush(Flushable flushable, boolean swallowIOException) throws * * @param flushable the {@code Flushable} object to be flushed. */ + @Beta public static void flushQuietly(Flushable flushable) { try { flush(flushable, true); diff --git a/guava/src/com/google/common/io/InsecureRecursiveDeleteException.java b/guava/src/com/google/common/io/InsecureRecursiveDeleteException.java index 080b0c39465d..c292879ba370 100644 --- a/guava/src/com/google/common/io/InsecureRecursiveDeleteException.java +++ b/guava/src/com/google/common/io/InsecureRecursiveDeleteException.java @@ -16,7 +16,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.j2objc.annotations.J2ObjCIncompatible; @@ -36,7 +35,6 @@ * @since 21.0 * @author Colin Decker */ -@Beta @J2ktIncompatible @GwtIncompatible @J2ObjCIncompatible // java.nio.file diff --git a/guava/src/com/google/common/io/LineProcessor.java b/guava/src/com/google/common/io/LineProcessor.java index 5886c8d7737c..c0e08fa119f0 100644 --- a/guava/src/com/google/common/io/LineProcessor.java +++ b/guava/src/com/google/common/io/LineProcessor.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -30,7 +29,6 @@ * @author Miles Barr * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/LineReader.java b/guava/src/com/google/common/io/LineReader.java index a42a02296127..54bf04c7caad 100644 --- a/guava/src/com/google/common/io/LineReader.java +++ b/guava/src/com/google/common/io/LineReader.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.io.CharStreams.createBuffer; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @author Chris Nokleberg * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/LittleEndianDataInputStream.java b/guava/src/com/google/common/io/LittleEndianDataInputStream.java index 76f674f84d83..54b1b14e87fa 100644 --- a/guava/src/com/google/common/io/LittleEndianDataInputStream.java +++ b/guava/src/com/google/common/io/LittleEndianDataInputStream.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -40,7 +39,6 @@ * @author Keith Bottner * @since 8.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/LittleEndianDataOutputStream.java b/guava/src/com/google/common/io/LittleEndianDataOutputStream.java index 2adf6f76e79f..5d534f61cf68 100644 --- a/guava/src/com/google/common/io/LittleEndianDataOutputStream.java +++ b/guava/src/com/google/common/io/LittleEndianDataOutputStream.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -36,7 +35,6 @@ * @author Keith Bottner * @since 8.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/MoreFiles.java b/guava/src/com/google/common/io/MoreFiles.java index c4dcf28313cf..b9a30c8fe352 100644 --- a/guava/src/com/google/common/io/MoreFiles.java +++ b/guava/src/com/google/common/io/MoreFiles.java @@ -21,7 +21,6 @@ import static java.nio.file.LinkOption.NOFOLLOW_LINKS; 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.base.Optional; @@ -67,7 +66,6 @@ * @since 21.0 * @author Colin Decker */ -@Beta @J2ktIncompatible @GwtIncompatible @J2ObjCIncompatible // java.nio.file diff --git a/guava/src/com/google/common/io/PatternFilenameFilter.java b/guava/src/com/google/common/io/PatternFilenameFilter.java index 59e816842756..ee0a0bda20f4 100644 --- a/guava/src/com/google/common/io/PatternFilenameFilter.java +++ b/guava/src/com/google/common/io/PatternFilenameFilter.java @@ -14,7 +14,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.base.Preconditions; @@ -30,7 +29,6 @@ * @author Apple Chow * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/io/RecursiveDeleteOption.java b/guava/src/com/google/common/io/RecursiveDeleteOption.java index 7d55199f5f8f..a25055e40788 100644 --- a/guava/src/com/google/common/io/RecursiveDeleteOption.java +++ b/guava/src/com/google/common/io/RecursiveDeleteOption.java @@ -16,7 +16,6 @@ package com.google.common.io; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.j2objc.annotations.J2ObjCIncompatible; @@ -29,7 +28,6 @@ * @since 21.0 * @author Colin Decker */ -@Beta @J2ktIncompatible @GwtIncompatible @J2ObjCIncompatible // java.nio.file