More Pubsub cleanup (#4948)

sduskis · web-flow · commit 79b64df4705b · 2019-04-16T11:00:15.000-04:00
* More Pubsub cleanup
- Removing PublisherStats, since it's package private and not used anywhere.
- StatusUtil and SubscriberStats are package private.  Remove the `public` modifier on methods in those classes

* Reverting MessageDispatcher change.
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java
@@ -25,7 +25,7 @@ private StatusUtil() {
     // Static class, not instantiable.
   }
 
-  public static boolean isRetryable(Throwable error) {
+  static boolean isRetryable(Throwable error) {
     if (!(error instanceof ApiException)) {
       return true;
     }
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java
@@ -27,52 +27,52 @@ abstract class SubscriberStats {
 
   @AutoValue
   // TODO: Finish implementation.
-  public abstract static class Stats {}
+  abstract static class Stats {}
 
   /** Number of successfully published messages. */
-  public abstract long getReceivedMessages();
+  abstract long getReceivedMessages();
 
   /** Number of successfully published messages. */
-  public abstract long getAckedMessages();
+  abstract long getAckedMessages();
 
   /** Number of received messages. */
-  public abstract long getTotalReceivedMessages();
+  abstract long getTotalReceivedMessages();
 
   /** Number messages acked. */
-  public abstract long getTotalAckedMessages();
+  abstract long getTotalAckedMessages();
 
   /** End to end latency. */
-  public abstract Stats getEndToEndLatency();
+  abstract Stats getEndToEndLatency();
 
   /**
    * Acknowledgement latency; time in between the message has been received and then acknowledged or
    * rejected.
    */
-  public abstract Stats getAckLatency();
+  abstract Stats getAckLatency();
 
   /** Number of messages for which we have auto extended its acknowledgement deadline. */
-  public abstract long getNumberOfAutoExtendedAckDeadlines();
+  abstract long getNumberOfAutoExtendedAckDeadlines();
 
-  public static Builder newBuilder() {
+  static Builder newBuilder() {
     return new AutoValue_SubscriberStats.Builder();
   }
 
   @AutoValue.Builder
-  public abstract static class Builder {
-    public abstract Builder setReceivedMessages(long value);
+  abstract static class Builder {
+    abstract Builder setReceivedMessages(long value);
 
-    public abstract Builder setAckedMessages(long value);
+    abstract Builder setAckedMessages(long value);
 
-    public abstract Builder setTotalReceivedMessages(long value);
+    abstract Builder setTotalReceivedMessages(long value);
 
-    public abstract Builder setTotalAckedMessages(long value);
+    abstract Builder setTotalAckedMessages(long value);
 
-    public abstract Builder setEndToEndLatency(Stats value);
+    abstract Builder setEndToEndLatency(Stats value);
 
-    public abstract Builder setAckLatency(Stats value);
+    abstract Builder setAckLatency(Stats value);
 
-    public abstract Builder setNumberOfAutoExtendedAckDeadlines(long value);
+    abstract Builder setNumberOfAutoExtendedAckDeadlines(long value);
 
-    public abstract SubscriberStats build();
+    abstract SubscriberStats build();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ private StatusUtil() {`
`25`	`25`	`// Static class, not instantiable.`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static boolean isRetryable(Throwable error) {`
	`28`	`+ static boolean isRetryable(Throwable error) {`
`29`	`29`	`if (!(error instanceof ApiException)) {`
`30`	`30`	`return true;`
`31`	`31`	`}`