No effective change - tidy and reformat

Author: rbygrave

src/main/java/io/ebean/redis/encode/EncodeBeanData.java

@@ -14,7 +14,7 @@ public class EncodeBeanData implements Encode {
   public byte[] encode(Object value) {
 
     try {
-      CachedBeanData data = (CachedBeanData)value;
+      CachedBeanData data = (CachedBeanData) value;
       ByteArrayOutputStream os = new ByteArrayOutputStream();
       ObjectOutputStream oos = new ObjectOutputStream(os);
 

src/main/java/io/ebean/redis/encode/EncodeManyIdsData.java

@@ -14,7 +14,7 @@ public class EncodeManyIdsData implements Encode {
   public byte[] encode(Object value) {
 
     try {
-      CachedManyIds data = (CachedManyIds)value;
+      CachedManyIds data = (CachedManyIds) value;
       ByteArrayOutputStream os = new ByteArrayOutputStream();
       ObjectOutputStream oos = new ObjectOutputStream(os);
 

src/main/java/io/ebean/redis/topic/DaemonTopic.java

@@ -9,13 +9,13 @@ public interface DaemonTopic {
 
   /**
    * Subscribe to the topic/channel (blocking).
-	 *
-	 * @param jedis The redis connection to subscribe (and block on).
-	 */
-	void subscribe(Jedis jedis);
+   *
+   * @param jedis The redis connection to subscribe (and block on).
+   */
+  void subscribe(Jedis jedis);
 
   /**
    * Notify that the topic subscription has been connected (or reconnected).
-	 */
-	void notifyConnected();
+   */
+  void notifyConnected();
 }

src/main/java/io/ebean/redis/topic/DaemonTopicRunner.java

@@ -18,78 +18,78 @@
  */
 public class DaemonTopicRunner {
 
-	private static final Logger log = LoggerFactory.getLogger(DaemonTopicRunner.class);
-
-	private static final long reconnectWaitMillis = 1000;
-
-	private final JedisPool jedisPool;
-
-	private final DaemonTopic daemonTopic;
-
-	public DaemonTopicRunner(JedisPool jedisPool, DaemonTopic daemonTopic) {
-		this.jedisPool = jedisPool;
-		this.daemonTopic = daemonTopic;
-	}
-
-	public void run() {
-		Thread t = new Thread(() -> attemptConnections(), "redis-sub");
-		t.start();
-	}
-
-	private void attemptConnections() {
-
-		Timer reloadTimer = new Timer("redis-sub-notify");
-		ReloadNotifyTask notifyTask = null;
-		int attempts = 1;
-
-		while (true) {
-			if (notifyTask != null) {
-				// we didn't successfully re-connect to redis
-				notifyTask.cancel();
-			}
-			notifyTask = new ReloadNotifyTask();
-			reloadTimer.schedule(notifyTask, reconnectWaitMillis + 500);
-			attempts++;
-			try {
-				subscribe();
-			} catch (JedisException e) {
-				log.debug("... redis subscribe connection attempt:{} failed:{}", attempts, e.getMessage());
-				try {
-					// wait a little before retrying
-					Thread.sleep(reconnectWaitMillis);
-				} catch (InterruptedException e1) {
-					log.warn("Interrupted redis re-connection wait", e1);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Subscribe and block when successful.
-	 */
-	private void subscribe() {
-		Jedis jedis = jedisPool.getResource();
-		jedis.echo("hi");
-		try {
-			daemonTopic.subscribe(jedis);
-
-		} catch (Exception e) {
-			log.error("Lost connection to topic, starting re-connection loop", e);
-			attemptConnections();
-
-		} finally {
-			try {
-				jedis.close();
-			} catch (Exception e) {
-				log.warn("Error closing probably broken Redis connection", e);
-			}
-		}
-	}
-
-	private class ReloadNotifyTask extends TimerTask {
-		@Override
-		public void run() {
-			daemonTopic.notifyConnected();
-		}
-	}
+  private static final Logger log = LoggerFactory.getLogger(DaemonTopicRunner.class);
+
+  private static final long reconnectWaitMillis = 1000;
+
+  private final JedisPool jedisPool;
+
+  private final DaemonTopic daemonTopic;
+
+  public DaemonTopicRunner(JedisPool jedisPool, DaemonTopic daemonTopic) {
+    this.jedisPool = jedisPool;
+    this.daemonTopic = daemonTopic;
+  }
+
+  public void run() {
+    Thread t = new Thread(() -> attemptConnections(), "redis-sub");
+    t.start();
+  }
+
+  private void attemptConnections() {
+
+    Timer reloadTimer = new Timer("redis-sub-notify");
+    ReloadNotifyTask notifyTask = null;
+    int attempts = 1;
+
+    while (true) {
+      if (notifyTask != null) {
+        // we didn't successfully re-connect to redis
+        notifyTask.cancel();
+      }
+      notifyTask = new ReloadNotifyTask();
+      reloadTimer.schedule(notifyTask, reconnectWaitMillis + 500);
+      attempts++;
+      try {
+        subscribe();
+      } catch (JedisException e) {
+        log.debug("... redis subscribe connection attempt:{} failed:{}", attempts, e.getMessage());
+        try {
+          // wait a little before retrying
+          Thread.sleep(reconnectWaitMillis);
+        } catch (InterruptedException e1) {
+          log.warn("Interrupted redis re-connection wait", e1);
+        }
+      }
+    }
+  }
+
+  /**
+   * Subscribe and block when successful.
+   */
+  private void subscribe() {
+    Jedis jedis = jedisPool.getResource();
+    jedis.echo("hi");
+    try {
+      daemonTopic.subscribe(jedis);
+
+    } catch (Exception e) {
+      log.error("Lost connection to topic, starting re-connection loop", e);
+      attemptConnections();
+
+    } finally {
+      try {
+        jedis.close();
+      } catch (Exception e) {
+        log.warn("Error closing probably broken Redis connection", e);
+      }
+    }
+  }
+
+  private class ReloadNotifyTask extends TimerTask {
+    @Override
+    public void run() {
+      daemonTopic.notifyConnected();
+    }
+  }
 }

src/test/java/io/ebean/redis/ClusterTest.java

@@ -1,7 +1,6 @@
 package io.ebean.redis;
 
 import domain.EFoo;
-import io.ebean.Ebean;
 import io.ebean.EbeanServer;
 import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
@@ -27,8 +26,6 @@ private EbeanServer createOther() {
   @Test
   public void test() throws InterruptedException {
 
-    EbeanServer server = Ebean.getDefaultServer();
-
     EbeanServer other = createOther();
 
     for (int i = 0; i < 10; i++) {
@@ -57,9 +54,6 @@ public void test() throws InterruptedException {
     assertCounts(dualCache, 3, 2, 0, 2);
 
 
-    //other.getServerCacheManager().clearAll();
-
-
     foo0.setName("name2");
     foo0.save();
     allowAsyncMessaging();

src/test/java/io/ebean/redis/IntegrationTest.java

@@ -11,8 +11,6 @@ public class IntegrationTest {
   @Test
   public void test() throws InterruptedException {
 
-//    EbeanServer server = Ebean.getDefaultServer();
-
     EFoo foo = new EFoo("Jack");
     foo.save();
 
@@ -27,22 +25,22 @@ public void test() throws InterruptedException {
       .setId(id)
       .findOne();
 
-    System.out.println("got "+one);
+    System.out.println("got " + one);
 
 
     EFoo one2 = Ebean.find(EFoo.class)
       .where().like("name", "fo%")
       .setUseQueryCache(true)
       .findOne();
 
-    System.out.println("one2 "+one2);
+    System.out.println("one2 " + one2);
 
     one2 = Ebean.find(EFoo.class)
       .where().like("name", "fo%")
       .setUseQueryCache(true)
       .findOne();
 
-    System.out.println("one2 "+one2);
+    System.out.println("one2 " + one2);
 
     foo.setName("fo2");
     foo.setLocalDate(LocalDate.now());
@@ -55,14 +53,14 @@ public void test() throws InterruptedException {
       .setUseQueryCache(true)
       .findOne();
 
-    System.out.println("one2 "+one2);
+    System.out.println("one2 " + one2);
 
     one2 = Ebean.find(EFoo.class)
       .where().like("name", "fo%")
       .setUseQueryCache(true)
       .findOne();
 
-    System.out.println("one2 "+one2);
+    System.out.println("one2 " + one2);
 
     System.out.println("done");
   }