From 7d048af68ee8be0c42442fdba78d613aafe46a39 Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Tue, 2 May 2017 16:21:43 -0700 Subject: [PATCH] javadoc: fix broken links in javadoc --- .../io/grpc/internal/AbstractManagedChannelImplBuilder.java | 1 + .../java/io/grpc/internal/Http2ClientStreamTransportState.java | 2 +- core/src/main/java/io/grpc/internal/InternalSubchannel.java | 2 -- core/src/main/java/io/grpc/internal/MoreThrowables.java | 2 +- core/src/main/java/io/grpc/internal/ServerImpl.java | 2 +- core/src/main/java/io/grpc/internal/WithLogId.java | 3 +-- netty/src/main/java/io/grpc/netty/StreamIdHolder.java | 2 +- okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java index 35e1950361..fbe2dde965 100644 --- a/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java +++ b/core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java @@ -42,6 +42,7 @@ import com.google.instrumentation.stats.StatsContextFactory; import com.google.instrumentation.trace.Tracing; import io.grpc.Attributes; import io.grpc.ClientInterceptor; +import io.grpc.ClientStreamTracer; import io.grpc.CompressorRegistry; import io.grpc.DecompressorRegistry; import io.grpc.EquivalentAddressGroup; diff --git a/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java b/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java index 81478167da..29c8012254 100644 --- a/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java +++ b/core/src/main/java/io/grpc/internal/Http2ClientStreamTransportState.java @@ -57,7 +57,7 @@ public abstract class Http2ClientStreamTransportState extends AbstractClientStre /** * RFC 7231 says status codes are 3 digits long. * - * @see: RFC 7231 + * @see RFC 7231 */ @Override public Integer parseAsciiString(byte[] serialized) { diff --git a/core/src/main/java/io/grpc/internal/InternalSubchannel.java b/core/src/main/java/io/grpc/internal/InternalSubchannel.java index 369f63da5a..4e3f68965a 100644 --- a/core/src/main/java/io/grpc/internal/InternalSubchannel.java +++ b/core/src/main/java/io/grpc/internal/InternalSubchannel.java @@ -60,8 +60,6 @@ import javax.annotation.concurrent.ThreadSafe; /** * Transports for a single {@link SocketAddress}. - * - *

This is the next version of {@link TransportSet} in development. */ @ThreadSafe final class InternalSubchannel implements WithLogId { diff --git a/core/src/main/java/io/grpc/internal/MoreThrowables.java b/core/src/main/java/io/grpc/internal/MoreThrowables.java index 3d508ed6f6..ad22fb7284 100644 --- a/core/src/main/java/io/grpc/internal/MoreThrowables.java +++ b/core/src/main/java/io/grpc/internal/MoreThrowables.java @@ -33,7 +33,7 @@ package io.grpc.internal; import com.google.common.base.Preconditions; -/** Utility functions when interacting with {@link Throwables}. */ +/** Utility functions when interacting with {@link Throwable}s. */ // TODO(ejona): Delete this once we've upgraded to Guava 20 or later. final class MoreThrowables { /** diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java index d53cd6d43a..46731349be 100644 --- a/core/src/main/java/io/grpc/internal/ServerImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerImpl.java @@ -112,10 +112,10 @@ public final class ServerImpl extends io.grpc.Server implements WithLogId { /** * Construct a server. * + * @param executorPool provides an executor to call methods on behalf of remote clients * @param registry the primary method registry * @param fallbackRegistry the secondary method registry, used only if the primary registry * doesn't have the method - * @param executor to call methods on behalf of remote clients */ ServerImpl(ObjectPool executorPool, ObjectPool timeoutServicePool, diff --git a/core/src/main/java/io/grpc/internal/WithLogId.java b/core/src/main/java/io/grpc/internal/WithLogId.java index 98d579d132..131b0e4597 100644 --- a/core/src/main/java/io/grpc/internal/WithLogId.java +++ b/core/src/main/java/io/grpc/internal/WithLogId.java @@ -37,8 +37,7 @@ package io.grpc.internal; public interface WithLogId { /** * Returns an ID that is primarily used in debug logs. It usually contains the class name and a - * numeric ID that is unique among the instances. {@link GrpcUtil#getLogId} is a canonical - * implementation. + * numeric ID that is unique among the instances. * *

The subclasses of this interface usually want to include the log ID in their {@link * #toString} results. diff --git a/netty/src/main/java/io/grpc/netty/StreamIdHolder.java b/netty/src/main/java/io/grpc/netty/StreamIdHolder.java index 0ba526d9b6..e8b8849d25 100644 --- a/netty/src/main/java/io/grpc/netty/StreamIdHolder.java +++ b/netty/src/main/java/io/grpc/netty/StreamIdHolder.java @@ -34,7 +34,7 @@ package io.grpc.netty; /** Container for stream ids. */ interface StreamIdHolder { /** - * Returns the id or {@link io.grpc.internal.AbstractStream#ABSENT_ID}. + * Returns the id. */ int id(); } diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java index 282e0729f6..ef7cf31221 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java @@ -175,7 +175,7 @@ class OkHttpClientStream extends AbstractClientStream2 { @GuardedBy("lock") private List

requestHeaders; /** - * Null iff {@link #requestHeaders} is null. Non-null iff neither {@link #sendCancel} nor + * Null iff {@link #requestHeaders} is null. Non-null iff neither {@link #cancel} nor * {@link #start(int)} have been called. */ @GuardedBy("lock")