You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2015/12/24 17:54:06 UTC

[2/7] mina git commit: Improved teh toString() methods

Improved teh toString() methods

Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/80dcbf70
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/80dcbf70
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/80dcbf70

Branch: refs/heads/2.0
Commit: 80dcbf703856ba4d7f2f2d516de33a52b6a0b09c
Parents: eb04661
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Dec 24 17:29:12 2015 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Dec 24 17:29:12 2015 +0100

----------------------------------------------------------------------
 .../org/apache/mina/http/HttpRequestImpl.java   | 34 ++++++++++++--------
 .../mina/http/api/DefaultHttpResponse.java      | 17 +++++-----
 2 files changed, 29 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina/blob/80dcbf70/mina-http/src/main/java/org/apache/mina/http/HttpRequestImpl.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpRequestImpl.java b/mina-http/src/main/java/org/apache/mina/http/HttpRequestImpl.java
index e2016cd..b30acae 100644
--- a/mina-http/src/main/java/org/apache/mina/http/HttpRequestImpl.java
+++ b/mina-http/src/main/java/org/apache/mina/http/HttpRequestImpl.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -124,24 +125,29 @@ public class HttpRequestImpl implements HttpRequest {
     }
 
     public String toString() {
-        String result = "HTTP REQUEST METHOD: " + method + "\n";
-        result += "VERSION: " + version + "\n";
-        result += "PATH: " + requestedPath + "\n";
-        result += "QUERY:" + queryString + "\n";
-
-        result += "--- HEADER --- \n";
-        for (String key : headers.keySet()) {
-            String value = headers.get(key);
-            result += key + ":" + value + "\n";
+        StringBuilder sb = new StringBuilder();
+        sb.append("HTTP REQUEST METHOD: ").append(method).append('\n');
+        sb.append("VERSION: ").append(version).append('\n');
+        sb.append("PATH: ").append(requestedPath).append('\n');
+        sb.append("QUERY:").append(queryString).append('\n');
+
+        sb.append("--- HEADER --- \n");
+        
+        for (Map.Entry<String, String> entry : headers.entrySet()) {
+            sb.append(entry.getKey()).append(':').append(entry.getValue()).append('\n');
         }
 
-        result += "--- PARAMETERS --- \n";
+        sb.append("--- PARAMETERS --- \n");
         Map<String, List<String>> parameters = getParameters();
-        for (String key : parameters.keySet()) {
-        	Collection<String> values = parameters.get(key);
-        	for (String value : values) { result += key + ":" + value + "\n"; }
+
+        for (Map.Entry<String, List<String>> entry : parameters.entrySet()) {
+            String key = entry.getKey();
+            
+            for (String value : entry.getValue()) { 
+                sb.append(key).append(':').append(value).append('\n'); 
+            }
         }
         
-        return result;
+        return sb.toString();
     }
 }

http://git-wip-us.apache.org/repos/asf/mina/blob/80dcbf70/mina-http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java b/mina-http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java
index 0bf61c3..9b546ef 100644
--- a/mina-http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java
+++ b/mina-http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java
@@ -66,15 +66,16 @@ public class DefaultHttpResponse implements HttpResponse {
 
     @Override
     public String toString() {
-        String result = "HTTP RESPONSE STATUS: " + status + "\n";
-        result += "VERSION: " + version + "\n";
-
-        result += "--- HEADER --- \n";
-        for (String key : headers.keySet()) {
-            String value = headers.get(key);
-            result += key + ":" + value + "\n";
+        StringBuilder sb = new StringBuilder();
+        sb.append("HTTP RESPONSE STATUS: " ).append(status).append('\n');
+        sb.append("VERSION: ").append(version).append('\n');
+        
+        sb.append("-- HEADER --- \n");
+        
+        for (Map.Entry<String, String> entry : headers.entrySet()) {
+            sb.append(entry.getKey()).append(':').append(entry.getValue()).append('\n');
         }
 
-        return result;
+        return sb.toString();
     }
 }