Break out into a multi-module project

service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisClientFactory.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2013 Open WhisperSystems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecuregcm.providers;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.dispatch.io.RedisPubSubConnectionFactory;
+import org.whispersystems.dispatch.redis.PubSubConnection;
+import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration;
+import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool;
+import org.whispersystems.textsecuregcm.util.Util;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.LinkedList;
+import java.util.List;
+
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.Protocol;
+
+public class RedisClientFactory implements RedisPubSubConnectionFactory {
+
+  private final Logger logger = LoggerFactory.getLogger(RedisClientFactory.class);
+
+  private final String    host;
+  private final int       port;
+  private final ReplicatedJedisPool jedisPool;
+
+  public RedisClientFactory(String name, String url, List<String> replicaUrls, CircuitBreakerConfiguration circuitBreakerConfiguration)
+      throws URISyntaxException
+  {
+    JedisPoolConfig poolConfig = new JedisPoolConfig();
+    poolConfig.setTestOnBorrow(true);
+
+    URI redisURI = new URI(url);
+
+    this.host      = redisURI.getHost();
+    this.port      = redisURI.getPort();
+
+    JedisPool       masterPool   = new JedisPool(poolConfig, host, port, Protocol.DEFAULT_TIMEOUT, null);
+    List<JedisPool> replicaPools = new LinkedList<>();
+
+    for (String replicaUrl : replicaUrls) {
+      URI replicaURI = new URI(replicaUrl);
+
+      replicaPools.add(new JedisPool(poolConfig, replicaURI.getHost(), replicaURI.getPort(),
+                                     500, Protocol.DEFAULT_TIMEOUT, null,
+                                     Protocol.DEFAULT_DATABASE, null, false, null ,
+                                     null, null));
+    }
+
+    this.jedisPool = new ReplicatedJedisPool(name, masterPool, replicaPools, circuitBreakerConfiguration);
+  }
+
+  public ReplicatedJedisPool getRedisClientPool() {
+    return jedisPool;
+  }
+
+  @Override
+  public PubSubConnection connect() {
+    while (true) {
+      try {
+        Socket socket = new Socket(host, port);
+        return new PubSubConnection(socket);
+      } catch (IOException e) {
+        logger.warn("Error connecting", e);
+        Util.sleep(200);
+      }
+    }
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisHealthCheck.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright (C) 2013 Open WhisperSystems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.whispersystems.textsecuregcm.providers;
+
+import com.codahale.metrics.health.HealthCheck;
+import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool;
+
+import redis.clients.jedis.Jedis;
+
+public class RedisHealthCheck extends HealthCheck {
+
+  private final ReplicatedJedisPool clientPool;
+
+  public RedisHealthCheck(ReplicatedJedisPool clientPool) {
+    this.clientPool = clientPool;
+  }
+
+  @Override
+  protected Result check() throws Exception {
+    try (Jedis client = clientPool.getWriteResource()) {
+      client.set("HEALTH", "test");
+
+      if (!"test".equals(client.get("HEALTH"))) {
+        return Result.unhealthy("fetch failed");
+      }
+
+      return Result.healthy();
+    }
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/providers/TimeProvider.java

@@ -0,0 +1,7 @@
+package org.whispersystems.textsecuregcm.providers;
+
+public class TimeProvider {
+  public long getCurrentTimeMillis() {
+    return System.currentTimeMillis();
+  }
+}