Skip to content

Commit 514f212

Browse files
cpovirkGoogle Java Core Libraries
authored and
Google Java Core Libraries
committed
Update links.
RELNOTES=n/a PiperOrigin-RevId: 654022683
1 parent 63734b9 commit 514f212

File tree

49 files changed

+323
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+323
-157
lines changed

Diff for: android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddAllTester.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,9 @@ public static Method getAddAllNullUnsupportedMethod() {
178178
/**
179179
* Returns the {@link Method} instance for {@link #testAddAll_unsupportedNonePresent()} so that
180180
* tests can suppress it with {@code FeatureSpecificTestSuiteBuilder.suppressing()} while we
181-
* figure out what to do with <a href="http://goo.gl/qJBruX">{@code ConcurrentHashMap} support for
182-
* {@code entrySet().add()}</a>.
181+
* figure out what to do with <a
182+
* href="https://github.com/openjdk/jdk/blob/c25c4896ad9ef031e3cddec493aef66ff87c48a7/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java#L4830">{@code
183+
* ConcurrentHashMap} support for {@code entrySet().add()}</a>.
183184
*/
184185
@J2ktIncompatible
185186
@GwtIncompatible // reflection
@@ -190,8 +191,9 @@ public static Method getAddAllUnsupportedNonePresentMethod() {
190191
/**
191192
* Returns the {@link Method} instance for {@link #testAddAll_unsupportedSomePresent()} so that
192193
* tests can suppress it with {@code FeatureSpecificTestSuiteBuilder.suppressing()} while we
193-
* figure out what to do with <a href="http://goo.gl/qJBruX">{@code ConcurrentHashMap} support for
194-
* {@code entrySet().add()}</a>.
194+
* figure out what to do with <a
195+
* href="https://github.com/openjdk/jdk/blob/c25c4896ad9ef031e3cddec493aef66ff87c48a7/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java#L4830">{@code
196+
* ConcurrentHashMap} support for {@code entrySet().add()}</a>.
195197
*/
196198
@J2ktIncompatible
197199
@GwtIncompatible // reflection

Diff for: android/guava-testlib/src/com/google/common/collect/testing/testers/CollectionAddTester.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ public static Method getAddNullUnsupportedMethod() {
133133
/**
134134
* Returns the {@link Method} instance for {@link #testAdd_unsupportedNotPresent()} so that tests
135135
* can suppress it with {@code FeatureSpecificTestSuiteBuilder.suppressing()} while we figure out
136-
* what to do with <a href="http://goo.gl/qJBruX">{@code ConcurrentHashMap} support for {@code
137-
* entrySet().add()}</a>.
136+
* what to do with <a
137+
* href="https://github.com/openjdk/jdk/blob/c25c4896ad9ef031e3cddec493aef66ff87c48a7/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java#L4830">{@code
138+
* ConcurrentHashMap} support for {@code entrySet().add()}</a>.
138139
*/
139140
@J2ktIncompatible
140141
@GwtIncompatible // reflection

Diff for: android/guava-testlib/src/com/google/common/testing/ArbitraryInstances.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public int compare(Field left, Field right) {
184184
/**
185185
* Returns a new {@code MatchResult} that corresponds to a successful match. Apache Harmony (used
186186
* in Android) requires a successful match in order to generate a {@code MatchResult}:
187-
* http://goo.gl/5VQFmC
187+
* https://cs.android.com/android/platform/superproject/+/android-2.3.7_r1:libcore/luni/src/main/java/java/util/regex/Matcher.java;l=550;drc=5850271b4ab93ebc27c1d49169a348c6be3c7f04
188188
*/
189189
private static MatchResult createMatchResult() {
190190
Matcher matcher = Pattern.compile(".").matcher("X");

Diff for: android/guava-testlib/test/com/google/common/collect/testing/OpenJdk6MapTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected Collection<Method> suppressForConcurrentHashMap() {
6666
* The entrySet() of ConcurrentHashMap, unlike that of other Map
6767
* implementations, supports add() under JDK8. This seems problematic, but I
6868
* didn't see that discussed in the review, which included many other
69-
* changes: http://goo.gl/okTTdr
69+
* changes: https://mail.openjdk.org/pipermail/core-libs-dev/2013-May/thread.html#17367
7070
*
7171
* TODO(cpovirk): decide what the best long-term action here is: force users
7272
* to suppress (as we do now), stop testing entrySet().add() at all, make

Diff for: android/guava/src/com/google/common/base/CharMatcher.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ public static CharMatcher none() {
133133
* illustrated <a
134134
* href="http://unicode.org/cldr/utility/list-unicodeset.jsp?a=%5Cp%7Bwhitespace%7D">here</a>.
135135
* This is not the same definition used by other Java APIs. (See a <a
136-
* href="https://goo.gl/Y6SLWx">comparison of several definitions of "whitespace"</a>.)
136+
* href="https://docs.google.com/spreadsheets/d/1kq4ECwPjHX9B8QUCTPclgsDCXYaj7T-FlT4tB5q3ahk/edit">comparison
137+
* of several definitions of "whitespace"</a>.)
137138
*
138139
* <p>All Unicode White_Space characters are on the BMP and thus supported by this API.
139140
*

Diff for: android/guava/src/com/google/common/base/Throwables.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ public static <X1 extends Throwable, X2 extends Throwable> void propagateIfPossi
223223
* directly, or use a combination of {@link #throwIfUnchecked} and {@code throw new
224224
* RuntimeException(e)}. But consider whether users would be better off if your API threw a
225225
* different type of exception. For background on the deprecation, read <a
226-
* href="https://goo.gl/Ivn2kc">Why we deprecated {@code Throwables.propagate}</a>.
226+
* href="https://github.com/google/guava/wiki/Why-we-deprecated-Throwables.propagate">Why we
227+
* deprecated {@code Throwables.propagate}</a>.
227228
*/
228229
@CanIgnoreReturnValue
229230
@J2ktIncompatible

Diff for: android/guava/src/com/google/common/collect/Lists.java

+16-7
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ private Lists() {}
7777
*
7878
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
7979
* use the {@code ArrayList} {@linkplain ArrayList#ArrayList() constructor} directly, taking
80-
* advantage of <a href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
80+
* advantage of <a
81+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
82+
* syntax</a>.
8183
*/
8284
@GwtCompatible(serializable = true)
8385
public static <E extends @Nullable Object> ArrayList<E> newArrayList() {
@@ -119,7 +121,9 @@ private Lists() {}
119121
*
120122
* <p><b>Note:</b> if {@code elements} is a {@link Collection}, you don't need this method. Use
121123
* the {@code ArrayList} {@linkplain ArrayList#ArrayList(Collection) constructor} directly, taking
122-
* advantage of <a href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
124+
* advantage of <a
125+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
126+
* syntax</a>.
123127
*/
124128
@GwtCompatible(serializable = true)
125129
public static <E extends @Nullable Object> ArrayList<E> newArrayList(
@@ -160,9 +164,10 @@ static int computeArrayListCapacity(int arraySize) {
160164
*
161165
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
162166
* use {@code new }{@link ArrayList#ArrayList(int) ArrayList}{@code <>(int)} directly, taking
163-
* advantage of <a href="http://goo.gl/iz2Wi">"diamond" syntax</a>. (Unlike here, there is no risk
164-
* of overload ambiguity, since the {@code ArrayList} constructors very wisely did not accept
165-
* varargs.)
167+
* advantage of <a
168+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
169+
* syntax</a>. (Unlike here, there is no risk of overload ambiguity, since the {@code ArrayList}
170+
* constructors very wisely did not accept varargs.)
166171
*
167172
* @param initialArraySize the exact size of the initial backing array for the returned array list
168173
* ({@code ArrayList} documentation calls this value the "capacity")
@@ -210,7 +215,9 @@ static int computeArrayListCapacity(int arraySize) {
210215
*
211216
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
212217
* use the {@code LinkedList} {@linkplain LinkedList#LinkedList() constructor} directly, taking
213-
* advantage of <a href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
218+
* advantage of <a
219+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
220+
* syntax</a>.
214221
*/
215222
@GwtCompatible(serializable = true)
216223
public static <E extends @Nullable Object> LinkedList<E> newLinkedList() {
@@ -231,7 +238,9 @@ static int computeArrayListCapacity(int arraySize) {
231238
*
232239
* <p><b>Note:</b> if {@code elements} is a {@link Collection}, you don't need this method. Use
233240
* the {@code LinkedList} {@linkplain LinkedList#LinkedList(Collection) constructor} directly,
234-
* taking advantage of <a href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
241+
* taking advantage of <a
242+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
243+
* syntax</a>.
235244
*/
236245
@GwtCompatible(serializable = true)
237246
public static <E extends @Nullable Object> LinkedList<E> newLinkedList(

Diff for: android/guava/src/com/google/common/collect/Maps.java

+18-9
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ public static <K extends Enum<K>, V> ImmutableMap<K, V> immutableEnumMap(
231231
*
232232
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
233233
* use the {@code HashMap} constructor directly, taking advantage of <a
234-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
234+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
235+
* syntax</a>.
235236
*
236237
* @return a new, empty {@code HashMap}
237238
*/
@@ -249,7 +250,8 @@ HashMap<K, V> newHashMap() {
249250
*
250251
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
251252
* use the {@code HashMap} constructor directly, taking advantage of <a
252-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
253+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
254+
* syntax</a>.
253255
*
254256
* @param map the mappings to be placed in the new map
255257
* @return a new {@code HashMap} initialized with the mappings from {@code map}
@@ -309,7 +311,8 @@ static int capacity(int expectedSize) {
309311
*
310312
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
311313
* use the {@code LinkedHashMap} constructor directly, taking advantage of <a
312-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
314+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
315+
* syntax</a>.
313316
*
314317
* @return a new, empty {@code LinkedHashMap}
315318
*/
@@ -326,7 +329,8 @@ LinkedHashMap<K, V> newLinkedHashMap() {
326329
*
327330
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
328331
* use the {@code LinkedHashMap} constructor directly, taking advantage of <a
329-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
332+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
333+
* syntax</a>.
330334
*
331335
* @param map the mappings to be placed in the new map
332336
* @return a new, {@code LinkedHashMap} initialized with the mappings from {@code map}
@@ -370,7 +374,8 @@ public static <K, V> ConcurrentMap<K, V> newConcurrentMap() {
370374
*
371375
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
372376
* use the {@code TreeMap} constructor directly, taking advantage of <a
373-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
377+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
378+
* syntax</a>.
374379
*
375380
* @return a new, empty {@code TreeMap}
376381
*/
@@ -388,7 +393,8 @@ public static <K, V> ConcurrentMap<K, V> newConcurrentMap() {
388393
*
389394
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
390395
* use the {@code TreeMap} constructor directly, taking advantage of <a
391-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
396+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
397+
* syntax</a>.
392398
*
393399
* @param map the sorted map whose mappings are to be placed in the new map and whose comparator
394400
* is to be used to sort the new map
@@ -408,7 +414,8 @@ public static <K, V> ConcurrentMap<K, V> newConcurrentMap() {
408414
*
409415
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
410416
* use the {@code TreeMap} constructor directly, taking advantage of <a
411-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
417+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
418+
* syntax</a>.
412419
*
413420
* @param comparator the comparator to sort the keys with
414421
* @return a new, empty {@code TreeMap}
@@ -439,7 +446,8 @@ TreeMap<K, V> newTreeMap(@CheckForNull Comparator<C> comparator) {
439446
*
440447
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
441448
* use the {@code EnumMap} constructor directly, taking advantage of <a
442-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
449+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
450+
* syntax</a>.
443451
*
444452
* @param map the map from which to initialize this {@code EnumMap}
445453
* @return a new {@code EnumMap} initialized with the mappings from {@code map}
@@ -456,7 +464,8 @@ TreeMap<K, V> newTreeMap(@CheckForNull Comparator<C> comparator) {
456464
*
457465
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
458466
* use the {@code IdentityHashMap} constructor directly, taking advantage of <a
459-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
467+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
468+
* syntax</a>.
460469
*
461470
* @return a new, empty {@code IdentityHashMap}
462471
*/

Diff for: android/guava/src/com/google/common/collect/Sets.java

+16-9
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ public static <E extends Enum<E>> EnumSet<E> newEnumSet(
177177
*
178178
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
179179
* use the {@code HashSet} constructor directly, taking advantage of <a
180-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
180+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
181+
* syntax</a>.
181182
*/
182183
public static <E extends @Nullable Object> HashSet<E> newHashSet() {
183184
return new HashSet<>();
@@ -216,7 +217,8 @@ public static <E extends Enum<E>> EnumSet<E> newEnumSet(
216217
*
217218
* <p><b>Note:</b> if {@code elements} is a {@link Collection}, you don't need this method.
218219
* Instead, use the {@code HashSet} constructor directly, taking advantage of <a
219-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
220+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
221+
* syntax</a>.
220222
*
221223
* <p>Overall, this method is not very useful and will likely be deprecated in the future.
222224
*/
@@ -303,7 +305,8 @@ public static <E> Set<E> newConcurrentHashSet(Iterable<? extends E> elements) {
303305
*
304306
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
305307
* use the {@code LinkedHashSet} constructor directly, taking advantage of <a
306-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
308+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
309+
* syntax</a>.
307310
*
308311
* @return a new, empty {@code LinkedHashSet}
309312
*/
@@ -319,7 +322,8 @@ public static <E> Set<E> newConcurrentHashSet(Iterable<? extends E> elements) {
319322
*
320323
* <p><b>Note:</b> if {@code elements} is a {@link Collection}, you don't need this method.
321324
* Instead, use the {@code LinkedHashSet} constructor directly, taking advantage of <a
322-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
325+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
326+
* syntax</a>.
323327
*
324328
* <p>Overall, this method is not very useful and will likely be deprecated in the future.
325329
*
@@ -363,7 +367,8 @@ public static <E> Set<E> newConcurrentHashSet(Iterable<? extends E> elements) {
363367
*
364368
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
365369
* use the {@code TreeSet} constructor directly, taking advantage of <a
366-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
370+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
371+
* syntax</a>.
367372
*
368373
* @return a new, empty {@code TreeSet}
369374
*/
@@ -385,7 +390,8 @@ public static <E extends Comparable> TreeSet<E> newTreeSet() {
385390
*
386391
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
387392
* use the {@code TreeSet} constructor directly, taking advantage of <a
388-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>.
393+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
394+
* syntax</a>.
389395
*
390396
* <p>This method is just a small convenience for creating an empty set and then calling {@link
391397
* Iterables#addAll}. This method is not very useful and will likely be deprecated in the future.
@@ -408,9 +414,10 @@ public static <E extends Comparable> TreeSet<E> newTreeSet(Iterable<? extends E>
408414
*
409415
* <p><b>Note:</b> this method is now unnecessary and should be treated as deprecated. Instead,
410416
* use the {@code TreeSet} constructor directly, taking advantage of <a
411-
* href="http://goo.gl/iz2Wi">"diamond" syntax</a>. One caveat to this is that the {@code TreeSet}
412-
* constructor uses a null {@code Comparator} to mean "natural ordering," whereas this factory
413-
* rejects null. Clean your code accordingly.
417+
* href="https://docs.oracle.com/javase/tutorial/java/generics/genTypeInference.html#type-inference-instantiation">"diamond"
418+
* syntax</a>. One caveat to this is that the {@code TreeSet} constructor uses a null {@code
419+
* Comparator} to mean "natural ordering," whereas this factory rejects null. Clean your code
420+
* accordingly.
414421
*
415422
* @param comparator the comparator to use to sort the set
416423
* @return a new, empty {@code TreeSet}

Diff for: android/guava/src/com/google/common/hash/Hashing.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* utilities.
3636
*
3737
* <p>A comparison of the various hash functions can be found <a
38-
* href="http://goo.gl/jS7HH">here</a>.
38+
* href="https://docs.google.com/spreadsheets/d/1_q2EVcxA2HjcrlVMbaqXwMj31h9M5-Bqj_m8vITOwwk/">here</a>.
3939
*
4040
* @author Kevin Bourrillion
4141
* @author Dimitris Andreou

Diff for: android/guava/src/com/google/common/html/HtmlEscapers.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
* One Google-authored templating system available for external use is <a
2626
* href="https://developers.google.com/closure/templates/">Closure Templates</a>.
2727
*
28-
* <p>HTML escaping is particularly tricky: For example, <a href="http://goo.gl/5TgZb">some
29-
* elements' text contents must not be HTML escaped</a>. As a result, it is impossible to escape an
30-
* HTML document correctly without domain-specific knowledge beyond what {@code HtmlEscapers}
31-
* provides. We strongly encourage the use of HTML templating systems.
28+
* <p>HTML escaping is particularly tricky: For example, <a
29+
* href="https://www.w3.org/TR/html4/types.html#h-6.2">some elements' text contents must not be HTML
30+
* escaped</a>. As a result, it is impossible to escape an HTML document correctly without
31+
* domain-specific knowledge beyond what {@code HtmlEscapers} provides. We strongly encourage the
32+
* use of HTML templating systems.
3233
*
3334
* @author Sven Mawson
3435
* @author David Beaumont

Diff for: android/guava/src/com/google/common/io/Files.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,9 @@ public static String simplifyPath(String pathname) {
791791
* behavior that the {@link File} API does not already account for. For example, on NTFS it will
792792
* report {@code "txt"} as the extension for the filename {@code "foo.exe:.txt"} even though NTFS
793793
* will drop the {@code ":.txt"} part of the name when the file is actually created on the
794-
* filesystem due to NTFS's <a href="https://goo.gl/vTpJi4">Alternate Data Streams</a>.
794+
* filesystem due to NTFS's <a
795+
* href="https://learn.microsoft.com/en-us/archive/blogs/askcore/alternate-data-streams-in-ntfs">Alternate
796+
* Data Streams</a>.
795797
*
796798
* @since 11.0
797799
*/

0 commit comments

Comments
 (0)