more optimizations on write side

src/main/java/redis/clients/jedis/Protocol.java

@@ -1,5 +1,6 @@
 package redis.clients.jedis;
 
+import redis.clients.util.RedisInputStream;
 import redis.clients.util.RedisOutputStream;
 
 import java.io.*;
@@ -8,7 +9,7 @@ import java.util.List;
 
 import static redis.clients.util.RedisOutputStream.CHARSET;
 
-public class Protocol {
+public final class Protocol {
 
     public static final int DEFAULT_PORT = 6379;
 
@@ -30,112 +31,88 @@ public class Protocol {
                 os.write(DOLLAR_BYTE);
                 final int size = RedisOutputStream.utf8Length(str);
                 os.writeIntCrLf(size);
-                if(size == str.length())
+                if (size == str.length())
                     os.writeAsciiCrLf(str);
                 else {
                     os.writeUtf8CrLf(str);
                 }
             }
-            os.flush ();
+            os.flush();
         } catch (IOException e) {
             throw new JedisException(e);
         }
     }
 
-    public void processError(DataInputStream is) {
-	String message = readLine(is);
-	throw new JedisException(message);
+    private void processError(RedisInputStream is) {
+        String message = is.readLine();
+        throw new JedisException(message);
     }
 
-    private String readLine(DataInputStream is) {
-	byte b;
-	byte c;
-	StringBuilder sb = new StringBuilder();
-
-	try {
-	    while ((b = is.readByte()) != -1) {
-		if (b == '\r') {
-		    c = is.readByte();
-		    if (c == '\n') {
-			break;
-		    }
-		    sb.append((char) b);
-		    sb.append((char) c);
-		} else {
-		    sb.append((char) b);
-		}
-	    }
-	} catch (IOException e) {
-	    throw new JedisException(e);
-	}
-	return sb.toString();
+    private Object process(RedisInputStream is) {
+        try {
+            byte b = is.readByte();
+            if (b == MINUS_BYTE) {
+                processError(is);
+            } else if (b == ASTERISK_BYTE) {
+                return processMultiBulkReply(is);
+            } else if (b == COLON_BYTE) {
+                return processInteger(is);
+            } else if (b == DOLLAR_BYTE) {
+                return processBulkReply(is);
+            } else if (b == PLUS_BYTE) {
+                return processStatusCodeReply(is);
+            } else {
+                throw new JedisException("Unknown reply: " + (char) b);
+            }
+        } catch (IOException e) {
+            throw new JedisException(e);
+        }
+        return null;
     }
 
-    private Object process(DataInputStream is) {
-	try {
-	    byte b = is.readByte();
-	    if (b == MINUS_BYTE) {
-		processError(is);
-	    } else if (b == ASTERISK_BYTE) {
-		return processMultiBulkReply(is);
-	    } else if (b == COLON_BYTE) {
-		return processInteger(is);
-	    } else if (b == DOLLAR_BYTE) {
-		return processBulkReply(is);
-	    } else if (b == PLUS_BYTE) {
-		return processStatusCodeReply(is);
-	    } else {
-		throw new JedisException("Unknown reply: " + (char) b);
-	    }
-	} catch (IOException e) {
-	    throw new JedisException(e);
-	}
-	return null;
+    private String processStatusCodeReply(RedisInputStream is) {
+        return is.readLine();
     }
 
-    private String processStatusCodeReply(DataInputStream is) {
-	return readLine(is);
+    private String processBulkReply(RedisInputStream is) {
+        int len = Integer.parseInt(is.readLine());
+        if (len == -1) {
+            return null;
+        }
+        byte[] read = new byte[len];
+        int offset = 0;
+        try {
+            while (offset < len) {
+                offset += is.read(read, offset, (len - offset));
+            }
+            // read 2 more bytes for the command delimiter
+            is.readByte();
+            is.readByte();
+        } catch (IOException e) {
+            throw new JedisException(e);
+        }
+
+        return new String(read, CHARSET);
     }
 
-    private String processBulkReply(DataInputStream is) {
-	int len = Integer.parseInt(readLine(is));
-	if (len == -1) {
-	    return null;
-	}
-	byte[] read = new byte[len];
-	int offset = 0;
-	try {
-		while(offset < len) {
-		    offset += is.read(read, offset, (len - offset));
-		}
-	    // read 2 more bytes for the command delimiter
-	    is.read();
-	    is.read();
-	} catch (IOException e) {
-	    throw new JedisException(e);
-	}
-
-	return new String(read, CHARSET);
+    private Integer processInteger(RedisInputStream is) {
+        String num = is.readLine();
+        return Integer.valueOf(num);
     }
 
-    private Integer processInteger(DataInputStream is) {
-	String num = readLine(is);
-	return Integer.valueOf(num);
+    private List<Object> processMultiBulkReply(RedisInputStream is) {
+        int num = Integer.parseInt(is.readLine());
+        if (num == -1) {
+            return null;
+        }
+        List<Object> ret = new ArrayList<Object>(num);
+        for (int i = 0; i < num; i++) {
+            ret.add(process(is));
+        }
+        return ret;
     }
 
-    private List<Object> processMultiBulkReply(DataInputStream is) {
-	int num = Integer.parseInt(readLine(is));
-	if (num == -1) {
-	    return null;
-	}
-	List<Object> ret = new ArrayList<Object>();
-	for (int i = 0; i < num; i++) {
-	    ret.add(process(is));
-	}
-	return ret;
-    }
-
-    public Object read(DataInputStream is) {
-	return process(is);
+    public Object read(RedisInputStream is) {
+        return process(is);
     }
 }