don't use AutoValue

pongad · pongad · commit 16630e4278d4 · 2016-12-16T11:20:35.000+11:00
This commit reverts most of the changes to (Publisher|Subscriber)Stats.
For some reason, AutoValue doesn't work in this repository.
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PublisherStats.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/PublisherStats.java
@@ -16,24 +16,44 @@
 
 package com.google.cloud.pubsub;
 
-import com.google.auto.value.AutoValue;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A snapshot of the publisher statistics at the time they were requested from the {@link
  * Publisher}.
  */
 //TODO: Finish implementation.
-@AutoValue
-public abstract class PublisherStats {
+@Immutable
+public class PublisherStats {
+  private final long sentMessages;
+  private final long ackedMessages;
+  private final long failedMessages;
+  private final long pendingMessages;
+
+  PublisherStats(long sentMessages, long ackedMessages, long failedMessages, long pendingMessages) {
+    this.sentMessages = sentMessages;
+    this.ackedMessages = ackedMessages;
+    this.failedMessages = failedMessages;
+    this.pendingMessages = pendingMessages;
+  }
+
   /** Number of successfully published messages. */
-  public abstract long getAckedMessages();
+  public long getAckedMessages() {
+    return ackedMessages;
+  }
 
   /** Number of messages that failed to publish. */
-  public abstract long getFailedMessages();
+  public long getFailedMessages() {
+    return failedMessages;
+  }
 
   /** Number of messages pending to publish, includes message in-flight. */
-  public abstract long getPendingMessages();
+  public long getPendingMessages() {
+    return pendingMessages;
+  }
 
   /** Total messages sent, equal to pending + acked + failed messages. */
-  public abstract long getSentMessages();
+  public long getSentMessages() {
+    return sentMessages;
+  }
 }
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/SubscriberStats.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/SubscriberStats.java
@@ -16,33 +16,67 @@
 
 package com.google.cloud.pubsub;
 
-import com.google.auto.value.AutoValue;
+import javax.annotation.concurrent.Immutable;
 
 /**
  * A snapshot of the subscriber statistics at the time they were requested from the {@link
  * Subscriber}.
  */
 //TODO: Finish implementation.
-@AutoValue
-public abstract class SubscriberStats {
-  @AutoValue
-  public static abstract class Stats {}
+@Immutable
+public class SubscriberStats {
+  @Immutable
+  public static class Stats {}
 
-  /** Number of received messages. */
-  public abstract long totalReceivedMessages();
+  private final long totalReceivedMessages;
+  private final long totalAckedMessages;
+  private final Stats endToEndLatency;
+  private final Stats ackLatency;
+  private final long numberOfAutoExtendedAckDeadlines;
+
+  SubscriberStats() {
+    this.totalReceivedMessages = 0;
+    this.totalAckedMessages = 0;
+    this.numberOfAutoExtendedAckDeadlines = 0;
+    this.endToEndLatency = null;
+    this.ackLatency = null;
+  }
+
+  /** Number of successfully published messages. */
+  public long getReceivedMessages() {
+    return totalReceivedMessages;
+  }
 
   /** Number of successfully published messages. */
-  public abstract long totalAckedMessages();
+  public long getAckedMessages() {
+    return totalAckedMessages;
+  }
+
+  /** Number of received messages. */
+  public long getTotalReceivedMessages() {
+    return totalReceivedMessages;
+  }
+
+  /** Number messages acked. */
+  public long getTotalAckedMessages() {
+    return totalAckedMessages;
+  }
 
   /** End to end latency. */
-  public abstract Stats endToEndLatency();
+  public Stats getEndToEndLatency() {
+    return endToEndLatency;
+  }
 
   /**
-   * Acknowledgement latency. The duration between the message being received and
-   * being acknowledged or rejected.
+   * Acknowledgement latency; time in between the message has been received and then acknowledged or
+   * rejected.
    */
-  public abstract Stats ackLatency();
+  public Stats getAckLatency() {
+    return ackLatency;
+  }
 
   /** Number of messages for which we have auto extended its acknowledgement deadline. */
-  public abstract long numberOfAutoExtendedAckDeadlines();
+  public long getNumberOfAutoExtendedAckDeadlines() {
+    return numberOfAutoExtendedAckDeadlines;
+  }
 }
