Skip to content

Commit 261ac7a

Browse files
amalloyGoogle Java Core Libraries
amalloy
authored and
Google Java Core Libraries
committed
De-beta APIs in com.google.common.net
Fixes #3052 Fixes #3414 Fixes #3417 Fixes #3423 RELNOTES=`net`: Removed `@Beta` from APIs in net. PiperOrigin-RevId: 416312524
1 parent 8b4ad17 commit 261ac7a

File tree

14 files changed

+8
-38
lines changed

14 files changed

+8
-38
lines changed

‎android/guava/src/com/google/common/net/HostAndPort.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919
import static com.google.common.base.Preconditions.checkState;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtCompatible;
2322
import com.google.common.base.CharMatcher;
2423
import com.google.common.base.Objects;
@@ -60,7 +59,6 @@
6059
* @author Paul Marks
6160
* @since 10.0
6261
*/
63-
@Beta
6462
@Immutable
6563
@GwtCompatible
6664
@ElementTypesAreNonnullByDefault

‎android/guava/src/com/google/common/net/HostSpecifier.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.net;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.common.annotations.GwtIncompatible;
1918
import com.google.common.base.Preconditions;
2019
import java.net.InetAddress;
@@ -41,7 +40,6 @@
4140
* @author Craig Berry
4241
* @since 5.0
4342
*/
44-
@Beta
4543
@GwtIncompatible
4644
@ElementTypesAreNonnullByDefault
4745
public final class HostSpecifier {

‎android/guava/src/com/google/common/net/HttpHeaders.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.net;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.common.annotations.GwtCompatible;
1918

2019
/**
@@ -102,7 +101,6 @@ private HttpHeaders() {}
102101
*
103102
* @since 17.0
104103
*/
105-
@Beta
106104
public static final String FOLLOW_ONLY_WHEN_PRERENDER_SHOWN = "Follow-Only-When-Prerender-Shown";
107105
/** The HTTP {@code Host} header field name. */
108106
public static final String HOST = "Host";
@@ -357,7 +355,7 @@ private ReferrerPolicyValues() {}
357355
*
358356
* @since 27.1
359357
*/
360-
@Beta public static final String SOURCE_MAP = "SourceMap";
358+
public static final String SOURCE_MAP = "SourceMap";
361359

362360
/**
363361
* The HTTP <a href="http://tools.ietf.org/html/rfc6797#section-6.1">{@code
@@ -455,14 +453,14 @@ private ReferrerPolicyValues() {}
455453
*
456454
* @since 15.0
457455
*/
458-
@Beta public static final String PUBLIC_KEY_PINS = "Public-Key-Pins";
456+
public static final String PUBLIC_KEY_PINS = "Public-Key-Pins";
459457
/**
460458
* The HTTP <a href="http://tools.ietf.org/html/draft-evans-palmer-key-pinning">{@code
461459
* Public-Key-Pins-Report-Only}</a> header field name.
462460
*
463461
* @since 15.0
464462
*/
465-
@Beta public static final String PUBLIC_KEY_PINS_REPORT_ONLY = "Public-Key-Pins-Report-Only";
463+
public static final String PUBLIC_KEY_PINS_REPORT_ONLY = "Public-Key-Pins-Report-Only";
466464
/**
467465
* The HTTP {@code X-Request-ID} header field name.
468466
*
@@ -482,7 +480,7 @@ private ReferrerPolicyValues() {}
482480
*
483481
* @since 24.1
484482
*/
485-
@Beta public static final String X_DOWNLOAD_OPTIONS = "X-Download-Options";
483+
public static final String X_DOWNLOAD_OPTIONS = "X-Download-Options";
486484
/** The HTTP {@code X-XSS-Protection} header field name. */
487485
public static final String X_XSS_PROTECTION = "X-XSS-Protection";
488486
/**

‎android/guava/src/com/google/common/net/InetAddresses.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static com.google.common.base.Preconditions.checkArgument;
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919

20-
import com.google.common.annotations.Beta;
2120
import com.google.common.annotations.GwtIncompatible;
2221
import com.google.common.base.CharMatcher;
2322
import com.google.common.base.MoreObjects;
@@ -95,7 +94,6 @@
9594
* @author Erik Kline
9695
* @since 5.0
9796
*/
98-
@Beta
9997
@GwtIncompatible
10098
@ElementTypesAreNonnullByDefault
10199
public final class InetAddresses {
@@ -667,7 +665,6 @@ public static Inet4Address get6to4IPv4Address(Inet6Address ip) {
667665
*
668666
* @since 5.0
669667
*/
670-
@Beta
671668
public static final class TeredoInfo {
672669
private final Inet4Address server;
673670
private final Inet4Address client;

‎android/guava/src/com/google/common/net/InternetDomainName.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919
import static com.google.common.base.Preconditions.checkState;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtCompatible;
2322
import com.google.common.base.Ascii;
2423
import com.google.common.base.CharMatcher;
@@ -71,7 +70,6 @@
7170
* @author Catherine Berry
7271
* @since 5.0
7372
*/
74-
@Beta
7573
@GwtCompatible(emulated = true)
7674
@Immutable
7775
@ElementTypesAreNonnullByDefault

‎android/guava/src/com/google/common/net/MediaType.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static com.google.common.base.Preconditions.checkNotNull;
2222
import static com.google.common.base.Preconditions.checkState;
2323

24-
import com.google.common.annotations.Beta;
2524
import com.google.common.annotations.GwtCompatible;
2625
import com.google.common.base.Ascii;
2726
import com.google.common.base.CharMatcher;
@@ -70,7 +69,6 @@
7069
* @since 12.0
7170
* @author Gregory Kick
7271
*/
73-
@Beta
7472
@GwtCompatible
7573
@Immutable
7674
@ElementTypesAreNonnullByDefault

‎android/guava/src/com/google/common/net/PercentEscaper.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import static com.google.common.base.Preconditions.checkNotNull;
1818

19-
import com.google.common.annotations.Beta;
2019
import com.google.common.annotations.GwtCompatible;
2120
import com.google.common.escape.UnicodeEscaper;
2221
import javax.annotation.CheckForNull;
@@ -50,7 +49,6 @@
5049
* @author David Beaumont
5150
* @since 15.0
5251
*/
53-
@Beta
5452
@GwtCompatible
5553
@ElementTypesAreNonnullByDefault
5654
public final class PercentEscaper extends UnicodeEscaper {

‎guava/src/com/google/common/net/HostAndPort.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static com.google.common.base.Preconditions.checkNotNull;
1919
import static com.google.common.base.Preconditions.checkState;
2020

21-
import com.google.common.annotations.Beta;
2221
import com.google.common.annotations.GwtCompatible;
2322
import com.google.common.base.CharMatcher;
2423
import com.google.common.base.Objects;
@@ -60,7 +59,6 @@
6059
* @author Paul Marks
6160
* @since 10.0
6261
*/
63-
@Beta
6462
@Immutable
6563
@GwtCompatible
6664
@ElementTypesAreNonnullByDefault

‎guava/src/com/google/common/net/HostSpecifier.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.net;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.common.annotations.GwtIncompatible;
1918
import com.google.common.base.Preconditions;
2019
import java.net.InetAddress;
@@ -41,7 +40,6 @@
4140
* @author Craig Berry
4241
* @since 5.0
4342
*/
44-
@Beta
4543
@GwtIncompatible
4644
@ElementTypesAreNonnullByDefault
4745
public final class HostSpecifier {

‎guava/src/com/google/common/net/HttpHeaders.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package com.google.common.net;
1616

17-
import com.google.common.annotations.Beta;
1817
import com.google.common.annotations.GwtCompatible;
1918

2019
/**
@@ -102,7 +101,6 @@ private HttpHeaders() {}
102101
*
103102
* @since 17.0
104103
*/
105-
@Beta
106104
public static final String FOLLOW_ONLY_WHEN_PRERENDER_SHOWN = "Follow-Only-When-Prerender-Shown";
107105
/** The HTTP {@code Host} header field name. */
108106
public static final String HOST = "Host";
@@ -357,7 +355,7 @@ private ReferrerPolicyValues() {}
357355
*
358356
* @since 27.1
359357
*/
360-
@Beta public static final String SOURCE_MAP = "SourceMap";
358+
public static final String SOURCE_MAP = "SourceMap";
361359

362360
/**
363361
* The HTTP <a href="http://tools.ietf.org/html/rfc6797#section-6.1">{@code
@@ -455,14 +453,14 @@ private ReferrerPolicyValues() {}
455453
*
456454
* @since 15.0
457455
*/
458-
@Beta public static final String PUBLIC_KEY_PINS = "Public-Key-Pins";
456+
public static final String PUBLIC_KEY_PINS = "Public-Key-Pins";
459457
/**
460458
* The HTTP <a href="http://tools.ietf.org/html/draft-evans-palmer-key-pinning">{@code
461459
* Public-Key-Pins-Report-Only}</a> header field name.
462460
*
463461
* @since 15.0
464462
*/
465-
@Beta public static final String PUBLIC_KEY_PINS_REPORT_ONLY = "Public-Key-Pins-Report-Only";
463+
public static final String PUBLIC_KEY_PINS_REPORT_ONLY = "Public-Key-Pins-Report-Only";
466464
/**
467465
* The HTTP {@code X-Request-ID} header field name.
468466
*
@@ -482,7 +480,7 @@ private ReferrerPolicyValues() {}
482480
*
483481
* @since 24.1
484482
*/
485-
@Beta public static final String X_DOWNLOAD_OPTIONS = "X-Download-Options";
483+
public static final String X_DOWNLOAD_OPTIONS = "X-Download-Options";
486484
/** The HTTP {@code X-XSS-Protection} header field name. */
487485
public static final String X_XSS_PROTECTION = "X-XSS-Protection";
488486
/**

0 commit comments

Comments
 (0)