From 514144d472135dbf5ece2677be2d28f4fa58ca31 Mon Sep 17 00:00:00 2001 From: Jungtaek Lim Date: Fri, 8 Aug 2014 10:56:39 +0900 Subject: [PATCH] Fix indentation (code formatting...) --- .../java/redis/clients/jedis/BinaryJedis.java | 39 +++++++-------- .../java/redis/clients/jedis/Connection.java | 50 +++++++++---------- .../java/redis/clients/jedis/Pipeline.java | 10 ++-- .../redis/clients/jedis/PipelineBlock.java | 8 +-- .../java/redis/clients/jedis/Queable.java | 6 +-- .../java/redis/clients/jedis/Transaction.java | 12 ++--- .../redis/clients/jedis/TransactionBlock.java | 10 ++-- 7 files changed, 67 insertions(+), 68 deletions(-) diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java index f76a391..f2ca337 100644 --- a/src/main/java/redis/clients/jedis/BinaryJedis.java +++ b/src/main/java/redis/clients/jedis/BinaryJedis.java @@ -22,11 +22,10 @@ import redis.clients.util.SafeEncoder; public class BinaryJedis implements BasicCommands, BinaryJedisCommands, MultiKeyBinaryCommands, AdvancedBinaryJedisCommands, BinaryScriptingCommands, Closeable { - protected Client client = null; protected Transaction transaction = null; protected Pipeline pipeline = null; - + public BinaryJedis(final String host) { URI uri = URI.create(host); if (uri.getScheme() != null && uri.getScheme().equals("redis")) { @@ -1771,10 +1770,10 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, public List multi(final TransactionBlock jedisTransaction) { List results = null; jedisTransaction.setClient(client); - client.multi(); - client.getOne(); // expected OK - jedisTransaction.execute(); - results = jedisTransaction.exec(); + client.multi(); + client.getOne(); // expected OK + jedisTransaction.execute(); + results = jedisTransaction.exec(); return results; } @@ -1794,24 +1793,24 @@ public class BinaryJedis implements BasicCommands, BinaryJedisCommands, } public void resetState() { - if (client.isConnected()) { - if (transaction != null) { - transaction.clear(); - } + if (client.isConnected()) { + if (transaction != null) { + transaction.clear(); + } - if (pipeline != null) { - pipeline.clear(); - } + if (pipeline != null) { + pipeline.clear(); + } - if (client.isInWatch()) { - unwatch(); - } + if (client.isInWatch()) { + unwatch(); + } - client.resetState(); - } + client.resetState(); + } - transaction = null; - pipeline = null; + transaction = null; + pipeline = null; } public String watch(final byte[]... keys) { diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java index cee0e3a..c57b170 100644 --- a/src/main/java/redis/clients/jedis/Connection.java +++ b/src/main/java/redis/clients/jedis/Connection.java @@ -231,42 +231,42 @@ public class Connection implements Closeable { } public Object getOne() { - flush(); - return readProtocolWithCheckingBroken(); + flush(); + return readProtocolWithCheckingBroken(); } public boolean isBroken() { - return broken; + return broken; } protected void flush() { - try { - outputStream.flush(); - } catch (IOException ex) { - broken = true; - throw new JedisConnectionException(ex); - } + try { + outputStream.flush(); + } catch (IOException ex) { + broken = true; + throw new JedisConnectionException(ex); + } } protected Object readProtocolWithCheckingBroken() { - try { - return Protocol.read(inputStream); - } catch (JedisConnectionException exc) { - broken = true; - throw exc; - } + try { + return Protocol.read(inputStream); + } catch (JedisConnectionException exc) { + broken = true; + throw exc; + } } public List getMany(int count) { - flush(); - List responses = new ArrayList(); - for (int i = 0 ; i < count ; i++) { - try { - responses.add(readProtocolWithCheckingBroken()); - } catch (JedisDataException e) { - responses.add(e); - } - } - return responses; + flush(); + List responses = new ArrayList(); + for (int i = 0; i < count; i++) { + try { + responses.add(readProtocolWithCheckingBroken()); + } catch (JedisDataException e) { + responses.add(e); + } + } + return responses; } } diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java index f837894..ba17387 100755 --- a/src/main/java/redis/clients/jedis/Pipeline.java +++ b/src/main/java/redis/clients/jedis/Pipeline.java @@ -70,15 +70,15 @@ public class Pipeline extends MultiKeyPipelineBase { } public void clear() { - if (isInMulti()) { - discard(); - } + if (isInMulti()) { + discard(); + } - sync(); + sync(); } public boolean isInMulti() { - return currentMulti != null; + return currentMulti != null; } /** diff --git a/src/main/java/redis/clients/jedis/PipelineBlock.java b/src/main/java/redis/clients/jedis/PipelineBlock.java index 76d84eb..24bae84 100644 --- a/src/main/java/redis/clients/jedis/PipelineBlock.java +++ b/src/main/java/redis/clients/jedis/PipelineBlock.java @@ -7,9 +7,9 @@ package redis.clients.jedis; * @see https://github.com/xetorthio/jedis/pull/498 */ public abstract class PipelineBlock extends Pipeline { - // For shadowing - @SuppressWarnings("unused") - private Client client; - + // For shadowing + @SuppressWarnings("unused") + private Client client; + public abstract void execute(); } diff --git a/src/main/java/redis/clients/jedis/Queable.java b/src/main/java/redis/clients/jedis/Queable.java index 643abf9..2cd5265 100644 --- a/src/main/java/redis/clients/jedis/Queable.java +++ b/src/main/java/redis/clients/jedis/Queable.java @@ -25,10 +25,10 @@ public class Queable { } protected boolean hasPipelinedResponse() { - return pipelinedResponses.size() > 0; + return pipelinedResponses.size() > 0; } - + protected int getPipelinedResponseLength() { - return pipelinedResponses.size(); + return pipelinedResponses.size(); } } diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java index 57238d6..e6088ff 100644 --- a/src/main/java/redis/clients/jedis/Transaction.java +++ b/src/main/java/redis/clients/jedis/Transaction.java @@ -32,9 +32,9 @@ public class Transaction extends MultiKeyPipelineBase { } public void clear() { - if (inTransaction) { - discard(); - } + if (inTransaction) { + discard(); + } } public List exec() { @@ -60,7 +60,7 @@ public class Transaction extends MultiKeyPipelineBase { public List> execGetResponse() { // Discard QUEUED or ERROR client.getMany(getPipelinedResponseLength()); - client.exec(); + client.exec(); List unformatted = client.getObjectMultiBulkReply(); if (unformatted == null) { @@ -81,8 +81,8 @@ public class Transaction extends MultiKeyPipelineBase { return client.getStatusCodeReply(); } - public void setClient(Client client) { + public void setClient(Client client) { this.client = client; - } + } } \ No newline at end of file diff --git a/src/main/java/redis/clients/jedis/TransactionBlock.java b/src/main/java/redis/clients/jedis/TransactionBlock.java index 3dfc8ab..c038ac2 100644 --- a/src/main/java/redis/clients/jedis/TransactionBlock.java +++ b/src/main/java/redis/clients/jedis/TransactionBlock.java @@ -9,10 +9,10 @@ import redis.clients.jedis.exceptions.JedisException; * @see https://github.com/xetorthio/jedis/pull/498 */ public abstract class TransactionBlock extends Transaction { - // For shadowing - @SuppressWarnings("unused") - private Client client; - + // For shadowing + @SuppressWarnings("unused") + private Client client; + public TransactionBlock(Client client) { super(client); } @@ -23,6 +23,6 @@ public abstract class TransactionBlock extends Transaction { public abstract void execute() throws JedisException; public void setClient(Client client) { - super.setClient(client); + super.setClient(client); } }