Skip to content

Commit 3aa228a

Browse files
Generate Javadoc and JDiff for Guava HEAD-jre-SNAPSHOT
1 parent 3447c2d commit 3aa228a

File tree

16 files changed

+4382
-4320
lines changed

16 files changed

+4382
-4320
lines changed

releases/snapshot-android/api/diffs/snapshot-android.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54205,7 +54205,9 @@
5420554205
@param ipString {@code String} containing an IPv4 or IPv6 string literal, e.g. {@code
5420654206
"192.168.0.1"} or {@code "2001:db8::1"} or with a scope ID, e.g. {@code "2001:db8::1%eth0"}
5420754207
@return {@link InetAddress} representing the argument
54208-
@throws IllegalArgumentException if the argument is not a valid IP string literal]]>
54208+
@throws IllegalArgumentException if the argument is not a valid IP string literal or if the
54209+
address has a scope ID that fails validation against the interfaces on the machine (as
54210+
required by Java's {@link InetAddress})]]>
5420954211
</doc>
5421054212
</method>
5421154213
<method name="isInetAddress" return="boolean"
@@ -54222,6 +54224,10 @@
5422254224
want to accept ASCII digits only, you can use something like {@code
5422354225
CharMatcher.ascii().matchesAllOf(ipString)}.
5422454226

54227+
<p>Note that if this method returns {@code true}, a call to {@link #forString(String)} can
54228+
still throw if the address has a scope ID that fails validation against the interfaces on the
54229+
machine.
54230+
5422554231
@param ipString {@code String} to evaluated as an IP string literal
5422654232
@return {@code true} if the argument is a valid IP string literal]]>
5422754233
</doc>
@@ -54297,8 +54303,9 @@
5429754303
@param hostAddr an RFC 3986 section 3.2.2 encoded IPv4 or IPv6 address
5429854304
@return an InetAddress representing the address in {@code hostAddr}
5429954305
@throws IllegalArgumentException if {@code hostAddr} is not a valid IPv4 address, or IPv6
54300-
address surrounded by square brackets, or if the address has a scope id that fails
54301-
validation against interfaces on the machine]]>
54306+
address surrounded by square brackets, or if the address has a scope ID that fails
54307+
validation against the interfaces on the machine (as required by Java's {@link
54308+
InetAddress})]]>
5430254309
</doc>
5430354310
</method>
5430454311
<method name="isUriInetAddress" return="boolean"
@@ -54316,7 +54323,8 @@
5431654323
CharMatcher.ascii().matchesAllOf(ipString)}.
5431754324

5431854325
<p>Note that if this method returns {@code true}, a call to {@link #forUriString(String)} can
54319-
throw if the address has a scope id fails validation against interfaces on the machine.
54326+
still throw if the address has a scope ID that fails validation against the interfaces on the
54327+
machine.
5432054328

5432154329
@param ipString {@code String} to evaluated as an IP URI host string literal
5432254330
@return {@code true} if the argument is a valid IP URI host]]>

releases/snapshot-android/api/docs/com/google/common/net/InetAddresses.TeredoInfo.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ <h2 title="Class InetAddresses.TeredoInfo" class="title">Class InetAddresses.Ter
136136
<dd><a href="InetAddresses.html" title="class in com.google.common.net">InetAddresses</a></dd>
137137
</dl>
138138
<hr>
139-
<pre>public static final class <a href="../../../../src-html/com/google/common/net/InetAddresses.html#line.751">InetAddresses.TeredoInfo</a>
139+
<pre>public static final class <a href="../../../../src-html/com/google/common/net/InetAddresses.html#line.759">InetAddresses.TeredoInfo</a>
140140
extends java.lang.Object</pre>
141141
<div class="block">A simple immutable data class to encapsulate the information to be found in a Teredo address.
142142

@@ -246,7 +246,7 @@ <h3>Constructor Detail</h3>
246246
<ul class="blockListLast">
247247
<li class="blockList">
248248
<h4>TeredoInfo</h4>
249-
<pre>public&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.767">TeredoInfo</a>&#8203;(<a href="https://checkerframework.org/api/javax/annotation/CheckForNull.html?is-external=true" title="class or interface in javax.annotation" class="externalLink">@CheckForNull</a>
249+
<pre>public&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.775">TeredoInfo</a>&#8203;(<a href="https://checkerframework.org/api/javax/annotation/CheckForNull.html?is-external=true" title="class or interface in javax.annotation" class="externalLink">@CheckForNull</a>
250250
java.net.Inet4Address&nbsp;server,
251251
<a href="https://checkerframework.org/api/javax/annotation/CheckForNull.html?is-external=true" title="class or interface in javax.annotation" class="externalLink">@CheckForNull</a>
252252
java.net.Inet4Address&nbsp;client,
@@ -279,7 +279,7 @@ <h3>Method Detail</h3>
279279
<ul class="blockList">
280280
<li class="blockList">
281281
<h4>getServer</h4>
282-
<pre class="methodSignature">public&nbsp;java.net.Inet4Address&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.782">getServer</a>()</pre>
282+
<pre class="methodSignature">public&nbsp;java.net.Inet4Address&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.790">getServer</a>()</pre>
283283
</li>
284284
</ul>
285285
<a id="getClient()">
@@ -288,7 +288,7 @@ <h4>getServer</h4>
288288
<ul class="blockList">
289289
<li class="blockList">
290290
<h4>getClient</h4>
291-
<pre class="methodSignature">public&nbsp;java.net.Inet4Address&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.786">getClient</a>()</pre>
291+
<pre class="methodSignature">public&nbsp;java.net.Inet4Address&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.794">getClient</a>()</pre>
292292
</li>
293293
</ul>
294294
<a id="getPort()">
@@ -297,7 +297,7 @@ <h4>getClient</h4>
297297
<ul class="blockList">
298298
<li class="blockList">
299299
<h4>getPort</h4>
300-
<pre class="methodSignature">public&nbsp;int&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.790">getPort</a>()</pre>
300+
<pre class="methodSignature">public&nbsp;int&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.798">getPort</a>()</pre>
301301
</li>
302302
</ul>
303303
<a id="getFlags()">
@@ -306,7 +306,7 @@ <h4>getPort</h4>
306306
<ul class="blockListLast">
307307
<li class="blockList">
308308
<h4>getFlags</h4>
309-
<pre class="methodSignature">public&nbsp;int&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.794">getFlags</a>()</pre>
309+
<pre class="methodSignature">public&nbsp;int&nbsp;<a href="../../../../src-html/com/google/common/net/InetAddresses.TeredoInfo.html#line.802">getFlags</a>()</pre>
310310
</li>
311311
</ul>
312312
</li>

0 commit comments

Comments
 (0)