Apply formatting

GeomaticM · Jan 19, 2015 · e281942 · e281942
1 parent 24380c7
commit e281942
Show file tree

Hide file tree

Showing 16 changed files with 607 additions and 621 deletions.
diff --git a/src/main/java/redis/clients/jedis/BinaryClient.java b/src/main/java/redis/clients/jedis/BinaryClient.java
@@ -72,7 +72,7 @@ private byte[][] joinParameters(byte[] first, byte[][] rest) {
   public void setPassword(final String password) {
     this.password = password;
   }
-  
+
   public void setDb(int db) {
     this.db = db;
   }

diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -49,8 +49,9 @@ public BinaryJedis(final String host, final int port, final int timeout) {
     client.setConnectionTimeout(timeout);
     client.setSoTimeout(timeout);
   }
-
-  public BinaryJedis(final String host, final int port, final int connectionTimeout, final int soTimeout) {
+
+  public BinaryJedis(final String host, final int port, final int connectionTimeout,
+      final int soTimeout) {
     client = new Client(host, port);
     client.setConnectionTimeout(connectionTimeout);
     client.setSoTimeout(soTimeout);
@@ -73,18 +74,19 @@ public BinaryJedis(final URI uri, final int timeout) {
     client.setConnectionTimeout(timeout);
     client.setSoTimeout(timeout);
   }
-  
+
   public BinaryJedis(final URI uri, final int connectionTimeout, final int soTimeout) {
     initializeClientFromURI(uri);
     client.setConnectionTimeout(connectionTimeout);
     client.setSoTimeout(soTimeout);
   }
 
   private void initializeClientFromURI(URI uri) {
-    if(!JedisURIHelper.isValid(uri)) {
-      throw new InvalidURIException(String.format("Cannot open Redis connection due invalid URI. %s", uri.toString()));
+    if (!JedisURIHelper.isValid(uri)) {
+      throw new InvalidURIException(String.format(
+        "Cannot open Redis connection due invalid URI. %s", uri.toString()));
     }
-    
+
     client = new Client(uri.getHost(), uri.getPort());
 
     String password = JedisURIHelper.getPassword(uri);
@@ -389,7 +391,7 @@ public String select(final int index) {
     client.select(index);
     String statusCodeReply = client.getStatusCodeReply();
     client.setDb(index);
-    
+
     return statusCodeReply;
   }
 
@@ -2963,7 +2965,7 @@ public Long scriptExists(byte[] sha1) {
     a[0] = sha1;
     return scriptExists(a).get(0);
   }
-  
+
   public List<Long> scriptExists(byte[]... sha1) {
     client.scriptExists(sha1);
     return client.getIntegerMultiBulkReply();

diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -112,7 +112,7 @@ public Map<String, String> build(Object data) {
       final Iterator<Object> iterator = flatHash.iterator();
       while (iterator.hasNext()) {
         hash.put(SafeEncoder.encode((byte[]) iterator.next()),
-            String.valueOf((Long) iterator.next()));
+          String.valueOf((Long) iterator.next()));
       }
 
       return hash;
@@ -285,8 +285,7 @@ public String toString() {
     }
 
     private Object evalResult(Object result) {
-      if (result instanceof byte[])
-        return SafeEncoder.encode((byte[]) result);
+      if (result instanceof byte[]) return SafeEncoder.encode((byte[]) result);
 
       if (result instanceof List<?>) {
         List<?> list = (List<?>) result;

diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
@@ -45,19 +45,19 @@ public Socket getSocket() {
   public int getConnectionTimeout() {
     return connectionTimeout;
   }
-  
+
   public int getSoTimeout() {
     return soTimeout;
   }
 
   public void setConnectionTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
   }
-  
+
   public void setSoTimeout(int soTimeout) {
     this.soTimeout = soTimeout;
   }
-  
+
   public void setTimeoutInfinite() {
     try {
       if (!isConnected()) {

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -37,7 +37,7 @@ public Jedis(final String host, final int port) {
   public Jedis(final String host, final int port, final int timeout) {
     super(host, port, timeout);
   }
-  
+
   public Jedis(final String host, final int port, final int connectionTimeout, final int soTimeout) {
     super(host, port, connectionTimeout, soTimeout);
   }
@@ -53,7 +53,7 @@ public Jedis(URI uri) {
   public Jedis(final URI uri, final int timeout) {
     super(uri, timeout);
   }
-  
+
   public Jedis(final URI uri, final int connectionTimeout, final int soTimeout) {
     super(uri, connectionTimeout, soTimeout);
   }

diff --git a/src/main/java/redis/clients/jedis/JedisFactory.java b/src/main/java/redis/clients/jedis/JedisFactory.java
@@ -33,12 +33,13 @@ public JedisFactory(final String host, final int port, final int timeout, final
     this.database = database;
     this.clientName = clientName;
   }
-  
+
   public JedisFactory(final URI uri, final int timeout, final String clientName) {
-    if(!JedisURIHelper.isValid(uri)) {
-      throw new InvalidURIException(String.format("Cannot open Redis connection due invalid URI. %s", uri.toString()));
+    if (!JedisURIHelper.isValid(uri)) {
+      throw new InvalidURIException(String.format(
+        "Cannot open Redis connection due invalid URI. %s", uri.toString()));
     }
-    
+
     this.hostAndPort.set(new HostAndPort(uri.getHost(), uri.getPort()));
     this.timeout = timeout;
     this.password = JedisURIHelper.getPassword(uri);

diff --git a/src/main/java/redis/clients/jedis/JedisShardInfo.java b/src/main/java/redis/clients/jedis/JedisShardInfo.java
@@ -19,7 +19,7 @@ public String toString() {
   private int port;
   private String password = null;
   private String name = null;
-  //Default Redis DB
+  // Default Redis DB
   private int db = 0;
 
   public String getHost() {
@@ -72,7 +72,7 @@ public JedisShardInfo(String host, int port, int connectionTimeout, int soTimeou
     this.connectionTimeout = connectionTimeout;
     this.soTimeout = soTimeout;
   }
-  
+
   public JedisShardInfo(String host, String name, int port, int timeout, int weight) {
     super(weight);
     this.host = host;
@@ -84,10 +84,11 @@ public JedisShardInfo(String host, String name, int port, int timeout, int weigh
 
   public JedisShardInfo(URI uri) {
     super(Sharded.DEFAULT_WEIGHT);
-    if(!JedisURIHelper.isValid(uri)) {
-      throw new InvalidURIException(String.format("Cannot open Redis connection due invalid URI. %s", uri.toString()));
+    if (!JedisURIHelper.isValid(uri)) {
+      throw new InvalidURIException(String.format(
+        "Cannot open Redis connection due invalid URI. %s", uri.toString()));
     }
-    
+
     this.host = uri.getHost();
     this.port = uri.getPort();
     this.password = JedisURIHelper.getPassword(uri);
@@ -105,23 +106,23 @@ public void setPassword(String auth) {
   public int getConnectionTimeout() {
     return connectionTimeout;
   }
-  
+
   public void setConnectionTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
   }
-  
+
   public int getSoTimeout() {
     return soTimeout;
   }
-  
+
   public void setSoTimeout(int soTimeout) {
     this.soTimeout = soTimeout;
   }
-  
+
   public String getName() {
     return name;
   }
-  
+
   public int getDb() {
     return db;
   }