more doc fixes (#1529)

pongad · web-flow · commit 36bbe4c41e09 · 2017-01-13T10:23:25.000+11:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/Publisher.java
@@ -91,7 +91,7 @@ public interface Publisher {
    * be delayed based on the publisher bundling options.
    *
    * <p>Depending on chosen flow control {@link #failOnFlowControlLimits option}, the returned
-   * future might immediately fail with a {@link CloudPubsubFlowControlException} or block the
+   * future might immediately fail with a {@link FlowController.FlowControlException} or block the
    * current thread until there are more resources available to publish.
    *
    * @param message the message to publish.
@@ -122,12 +122,12 @@ public interface Publisher {
 
   /**
    * Whether to block publish calls when reaching flow control limits (see {@link
-   * #getMaxOutstandingRequestBytes()} & {@link #getMaxOutstandingElementCount()}).
+   * #getMaxOutstandingRequestBytes()} and {@link #getMaxOutstandingElementCount()}).
    *
    * <p>If set to false, a publish call will fail with either {@link
-   * RequestByteMaxOutstandingReachedException} or {@link
-   * ElementCountMaxOutstandingReachedException}, as appropriate, when flow control limits are
-   * reached.
+   * FlowController.MaxOutstandingRequestBytesReachedException} or {@link
+   * FlowController.MaxOutstandingElementCountReachedException}, as appropriate, when flow control
+   * limits are reached.
    */
   boolean failOnFlowControlLimits();
 
@@ -247,8 +247,8 @@ public Builder setFlowControlSettings(FlowController.Settings flowControlSetting
 
     /**
      * Whether to fail publish when reaching any of the flow control limits, with either a {@link
-     * RequestByteMaxOutstandingReachedException} or {@link
-     * ElementCountMaxOutstandingReachedException} as appropriate.
+     * FlowController.MaxOutstandingRequestBytesReachedException} or {@link
+     * FlowController.MaxOutstandingElementCountReachedException} as appropriate.
      *
      * <p>If set to false, then publish operations will block the current thread until the
      * outstanding requests go under the limits.
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubSubHelper.java
@@ -16,16 +16,12 @@
 
 package com.google.cloud.pubsub.testing;
 
-import com.google.cloud.NoCredentials;
-import com.google.cloud.RetryParams;
+import com.google.cloud.ServiceOptions;
 import com.google.cloud.testing.BaseEmulatorHelper;
 import com.google.common.collect.ImmutableList;
-import com.google.cloud.ServiceOptions;
-
 import io.grpc.ManagedChannel;
 import io.grpc.netty.NegotiationType;
 import io.grpc.netty.NettyChannelBuilder;
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -35,7 +31,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
-
 import org.joda.time.Duration;
 
 /**
@@ -104,10 +99,7 @@ public ManagedChannel createChannel() {
         .build();
   }
 
-  /**
-   * Returns a {@link PubSubOptions} instance that sets the host to use the PubSub emulator on
-   * localhost.
-   */
+  /** Returns a {@link ServiceOptions} describing the emulator. */
   @Override
   public ServiceOptions getOptions() {
     throw new UnsupportedOperationException("not implemented as PubSubOptions no longer exists");
