make codacy less angry

pongad · pongad · commit 8cf7a2bbca62 · 2017-02-08T09:52:13.000+11:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java
@@ -104,16 +104,6 @@
  * </code></pre>
  */
 public class Publisher {
-  /** The maximum number of messages in one request. Defined by the API. */
-  public static long getApiMaxRequestElementCount() {
-    return 1000L;
-  }
-
-  /** The maximum size of one request. Defined by the API. */
-  public static long getApiMaxRequestBytes() {
-    return 10L * 1000L * 1000L; // 10 megabytes (https://en.wikipedia.org/wiki/Megabyte)
-  }
-
   private static final Logger logger = Logger.getLogger(Publisher.class.getName());
 
   private final TopicName topicName;
@@ -142,6 +132,16 @@ public static long getApiMaxRequestBytes() {
   private final MessageWaiter messagesWaiter;
   private ScheduledFuture<?> currentAlarmFuture;
 
+  /** The maximum number of messages in one request. Defined by the API. */
+  public static long getApiMaxRequestElementCount() {
+    return 1000L;
+  }
+
+  /** The maximum size of one request. Defined by the API. */
+  public static long getApiMaxRequestBytes() {
+    return 10L * 1000L * 1000L; // 10 megabytes (https://en.wikipedia.org/wiki/Megabyte)
+  }
+
   private Publisher(Builder builder) throws IOException {
     topicName = builder.topicName;
     cachedTopicNameString = topicName.toString();
@@ -574,7 +574,7 @@ public long nextLong(long least, long bound) {
 
     // Client-side flow control options
     FlowControlSettings flowControlSettings = FlowControlSettings.getDefaultInstance();
-    boolean failOnFlowControlLimits = false;
+    boolean failOnFlowControlLimits;
 
     RetrySettings retrySettings = DEFAULT_RETRY_SETTINGS;
     LongRandom longRandom = DEFAULT_LONG_RANDOM;
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java
@@ -222,7 +222,7 @@ public void sendAckOperations(
         modifyAckDeadlineChunks.iterator();
 
     while (ackChunksIt.hasNext() || modifyAckDeadlineChunksIt.hasNext()) {
-      com.google.pubsub.v1.StreamingPullRequest.Builder requestBuilder =
+      StreamingPullRequest.Builder requestBuilder =
           StreamingPullRequest.newBuilder();
       if (modifyAckDeadlineChunksIt.hasNext()) {
         List<PendingModifyAckDeadline> modAckChunk = modifyAckDeadlineChunksIt.next();
