From 796238d929c0388e385e483929715c48d4c417b8 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Wed, 26 Nov 2008 08:49:33 +0000
Subject: [PATCH] * Renamed HttpVersion.getProtocol() to decode() * A little
 bit of code clean up

---
 .../netty/handler/codec/http/DefaultHttpMessage.java   |  4 +---
 .../netty/handler/codec/http/HttpRequestDecoder.java   |  2 +-
 .../netty/handler/codec/http/HttpResponseDecoder.java  |  2 +-
 .../jboss/netty/handler/codec/http/HttpVersion.java    | 10 ++++------
 .../netty/handler/codec/http/QueryStringDecoder.java   |  2 --
 .../netty/handler/codec/http/QueryStringEncoder.java   |  5 ++---
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
index d3a4a0c072..31cfee8e86 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
@@ -41,10 +41,8 @@ import org.jboss.netty.buffer.ChannelBuffer;
 public class DefaultHttpMessage implements HttpMessage {
     private final static Comparator<String> caseIgnoringComparator = new CaseIgnoringComparator();
 
-    Map<String, List<String>> headers = new TreeMap<String, List<String>>(caseIgnoringComparator);
-
     private final HttpVersion version;
-
+    private final Map<String, List<String>> headers = new TreeMap<String, List<String>>(caseIgnoringComparator);
     private ChannelBuffer content;
 
     protected DefaultHttpMessage(final HttpVersion version) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
index c81dd48751..0ea145abb4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
@@ -39,7 +39,7 @@ public class HttpRequestDecoder extends HttpMessageDecoder {
         String line = readIntoCurrentLine(buffer);
         checkpoint(ResponseState.READ_HEADER);
         String[] split = splitInitial(line);
-        message = new DefaultHttpRequest(HttpVersion.getProtocol(split[2]), HttpMethod.valueOf(split[0]), new URI(split[1]));
+        message = new DefaultHttpRequest(HttpVersion.decode(split[2]), HttpMethod.valueOf(split[0]), new URI(split[1]));
 
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
index b693cc0f54..7e055ed292 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
@@ -36,6 +36,6 @@ public class HttpResponseDecoder extends HttpMessageDecoder {
         String line = readIntoCurrentLine(buffer);
         checkpoint(ResponseState.READ_HEADER);
         String[] split = splitInitial(line);
-        message = new DefaultHttpResponse(HttpVersion.getProtocol(split[0]), new HttpResponseStatus(Integer.valueOf(split[1]), split[2]));
+        message = new DefaultHttpResponse(HttpVersion.decode(split[0]), new HttpResponseStatus(Integer.valueOf(split[1]), split[2]));
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
index a1b7b2e59f..bf2fa0f12c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
@@ -30,22 +30,20 @@ package org.jboss.netty.handler.codec.http;
  */
 public enum HttpVersion {
     HTTP_1_0("HTTP/1.0"),
-
     HTTP_1_1("HTTP/1.1"),
-
     UNKNOWN("UNKNOWN"),;
 
-    private String version;
+    private final String version;
 
-    private HttpVersion(String value) {
-        version = value;
+    private HttpVersion(String version) {
+        this.version = version;
     }
 
     public String value() {
         return version;
     }
 
-    public static HttpVersion getProtocol(String value) {
+    public static HttpVersion decode(String value) {
         if (value == null) {
             return UNKNOWN;
         }
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
index 668b705c39..d1161bf632 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
@@ -34,9 +34,7 @@ import java.util.Map;
 public class QueryStringDecoder {
 
     private final String uri;
-
     private String path;
-
     private final Map<String, List<String>> params = new HashMap<String, List<String>>();
 
     public QueryStringDecoder(String uri) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
index 8d6780d7d1..7237ef7193 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
@@ -32,9 +32,8 @@ import java.util.List;
  */
 public class QueryStringEncoder {
 
-    final String url;
-
-    final List<Param> params = new ArrayList<Param>();
+    private final String url;
+    private final List<Param> params = new ArrayList<Param>();
 
     public QueryStringEncoder(String url) {
         this.url = url;