From a0d21cd2fd2902be5ae9265b07a780d86af0e1a1 Mon Sep 17 00:00:00 2001
From: Andy Janata <ajanata@gmail.com>
Date: Thu, 23 Feb 2017 22:36:58 -0800
Subject: [PATCH] make metrics methods agree in tense

---
 src/main/java/net/socialgamer/cah/StartupUtils.java         | 2 +-
 src/main/java/net/socialgamer/cah/data/Game.java            | 2 +-
 src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java | 4 ++--
 src/main/java/net/socialgamer/cah/metrics/Metrics.java      | 4 ++--
 src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/socialgamer/cah/StartupUtils.java b/src/main/java/net/socialgamer/cah/StartupUtils.java
index 49493db8..a95dea42 100644
--- a/src/main/java/net/socialgamer/cah/StartupUtils.java
+++ b/src/main/java/net/socialgamer/cah/StartupUtils.java
@@ -135,7 +135,7 @@ public void contextInitialized(final ServletContextEvent contextEvent) {
     CardcastService.hackSslVerifier();
 
     // log that the server (re-)started to metrics logging (to flush all old games and users)
-    injector.getInstance(Metrics.class).serverStarted(
+    injector.getInstance(Metrics.class).serverStart(
         injector.getInstance(Key.get(String.class, UniqueId.class)));
   }
 
diff --git a/src/main/java/net/socialgamer/cah/data/Game.java b/src/main/java/net/socialgamer/cah/data/Game.java
index 04215a29..05b8a312 100644
--- a/src/main/java/net/socialgamer/cah/data/Game.java
+++ b/src/main/java/net/socialgamer/cah/data/Game.java
@@ -1512,7 +1512,7 @@ public void process() {
       rescheduleTimer(task, ROUND_INTERMISSION);
     }
 
-    metrics.roundJudged(currentUniqueId, user.getSessionId(), cardPlayer.getUser().getSessionId(),
+    metrics.roundComplete(currentUniqueId, user.getSessionId(), cardPlayer.getUser().getSessionId(),
         playedCards.cardsByUser());
 
     return null;
diff --git a/src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java b/src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java
index 896397bc..466ebd0e 100644
--- a/src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java
+++ b/src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java
@@ -48,7 +48,7 @@ public class KafkaMetrics implements Metrics {
   private static final Logger LOG = Logger.getLogger(KafkaMetrics.class);
 
   @Override
-  public void serverStarted(final String startupId) {
+  public void serverStart(final String startupId) {
     LOG.trace(String.format("serverStarted(%s)", startupId));
   }
 
@@ -73,7 +73,7 @@ public void gameStart(final String gameId, final Collection<CardSet> decks, fina
   }
 
   @Override
-  public void roundJudged(final String gameId, final String judgeSessionId,
+  public void roundComplete(final String gameId, final String judgeSessionId,
       final String winnerSessionId,
       final Map<User, List<WhiteCard>> cards) {
     LOG.trace(String.format("roundJudged(%s, %s, %s, %s)", gameId, judgeSessionId, winnerSessionId,
diff --git a/src/main/java/net/socialgamer/cah/metrics/Metrics.java b/src/main/java/net/socialgamer/cah/metrics/Metrics.java
index 03db01e8..27282e44 100644
--- a/src/main/java/net/socialgamer/cah/metrics/Metrics.java
+++ b/src/main/java/net/socialgamer/cah/metrics/Metrics.java
@@ -42,7 +42,7 @@
  * @author Andy Janata (ajanata@socialgamer.net)
  */
 public interface Metrics {
-  void serverStarted(String startupId);
+  void serverStart(String startupId);
 
   void newUser(String persistentId, String sessionId, @Nullable CityResponse geoIp,
       String agentName, String agentType, String agentOs, String agentLanguage);
@@ -51,7 +51,7 @@ void newUser(String persistentId, String sessionId, @Nullable CityResponse geoIp
 
   // The card data is way too complicated to dictate the format it should be in, so let
   // implementations deal with the structured data.
-  void roundJudged(String gameId, String judgeSessionId, String winnerSessionId,
+  void roundComplete(String gameId, String judgeSessionId, String winnerSessionId,
       Map<User, List<WhiteCard>> cards);
 
   void gameStart(String gameId, Collection<CardSet> decks, int blanks, int maxPlayers,
diff --git a/src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java b/src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java
index 347005f0..9d01891e 100644
--- a/src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java
+++ b/src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java
@@ -48,7 +48,7 @@ public class NoOpMetrics implements Metrics {
   private static final Logger LOG = Logger.getLogger(NoOpMetrics.class);
 
   @Override
-  public void serverStarted(final String startupId) {
+  public void serverStart(final String startupId) {
     LOG.trace(String.format("serverStarted(%s)", startupId));
   }
 
@@ -73,7 +73,7 @@ public void gameStart(final String gameId, final Collection<CardSet> decks, fina
   }
 
   @Override
-  public void roundJudged(final String gameId, final String judgeSessionId,
+  public void roundComplete(final String gameId, final String judgeSessionId,
       final String winnerSessionId,
       final Map<User, List<WhiteCard>> cards) {
     LOG.trace(String.format("roundJudged(%s, %s, %s, %s)", gameId, judgeSessionId, winnerSessionId,