You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/09/17 14:37:28 UTC
svn commit: r576402 - in
/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver:
codec/HttpRequestDecoder.java codec/HttpRequestMessage.java
codec/HttpResponseEncoder.java codec/HttpResponseMessage.java
stream/HttpProtocolHandler.java
Author: trustin
Date: Mon Sep 17 05:37:27 2007
New Revision: 576402
URL: http://svn.apache.org/viewvc?rev=576402&view=rev
Log:
Removed compiler warnings
Modified:
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestMessage.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java?rev=576402&r1=576401&r2=576402&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestDecoder.java Mon Sep 17 05:37:27 2007
@@ -153,7 +153,7 @@
return null;
}
- private Map parseRequest(Reader is) {
+ private Map<String, String[]> parseRequest(Reader is) {
Map<String, String[]> map = new HashMap<String, String[]>();
BufferedReader rdr = new BufferedReader(is);
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestMessage.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestMessage.java?rev=576402&r1=576401&r2=576402&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestMessage.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpRequestMessage.java Mon Sep 17 05:37:27 2007
@@ -19,7 +19,6 @@
*/
package org.apache.mina.example.httpserver.codec;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
@@ -30,45 +29,43 @@
* @version $Rev$, $Date$
*/
public class HttpRequestMessage {
- /** Map<String, String[]> */
- private Map headers = null;
+
+ private Map<String, String[]> headers = null;
- public void setHeaders(Map headers) {
+ public void setHeaders(Map<String, String[]> headers) {
this.headers = headers;
}
- public Map getHeaders() {
+ public Map<String, String[]> getHeaders() {
return headers;
}
public String getContext() {
- String[] context = (String[]) headers.get("Context");
+ String[] context = headers.get("Context");
return context == null ? "" : context[0];
}
public String getParameter(String name) {
- String[] param = (String[]) headers.get("@".concat(name));
+ String[] param = headers.get("@".concat(name));
return param == null ? "" : param[0];
}
public String[] getParameters(String name) {
- String[] param = (String[]) headers.get("@".concat(name));
+ String[] param = headers.get("@".concat(name));
return param == null ? new String[] {} : param;
}
public String[] getHeader(String name) {
- return (String[]) headers.get(name);
+ return headers.get(name);
}
@Override
public String toString() {
StringBuilder str = new StringBuilder();
- Iterator it = headers.entrySet().iterator();
- while (it.hasNext()) {
- Entry e = (Entry) it.next();
+ for (Entry<String, String[]> e: headers.entrySet()) {
str.append(e.getKey() + " : "
- + arrayToString((String[]) e.getValue(), ',') + "\n");
+ + arrayToString(e.getValue(), ',') + "\n");
}
return str.toString();
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java?rev=576402&r1=576401&r2=576402&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseEncoder.java Mon Sep 17 05:37:27 2007
@@ -24,7 +24,6 @@
import java.nio.charset.CharsetEncoder;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import java.util.Map.Entry;
@@ -74,12 +73,10 @@
break;
}
buf.put(CRLF);
- for (Iterator it = msg.getHeaders().entrySet().iterator(); it
- .hasNext();) {
- Entry entry = (Entry) it.next();
- buf.putString((String) entry.getKey(), encoder);
+ for (Entry<String, String> entry: msg.getHeaders().entrySet()) {
+ buf.putString(entry.getKey(), encoder);
buf.putString(": ", encoder);
- buf.putString((String) entry.getValue(), encoder);
+ buf.putString(entry.getValue(), encoder);
buf.put(CRLF);
}
// now the content length is the body length
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java?rev=576402&r1=576401&r2=576402&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/codec/HttpResponseMessage.java Mon Sep 17 05:37:27 2007
@@ -60,7 +60,7 @@
"EEE, dd MMM yyyy HH:mm:ss zzz").format(new Date()));
}
- public Map getHeaders() {
+ public Map<String, String> getHeaders() {
return headers;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java?rev=576402&r1=576401&r2=576402&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpserver/stream/HttpProtocolHandler.java Mon Sep 17 05:37:27 2007
@@ -27,7 +27,6 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
import java.util.Map.Entry;
@@ -93,9 +92,7 @@
out
.println("<table border=\"1\"><tr><th>Key</th><th>Value</th></tr>");
- Iterator it = headers.entrySet().iterator();
- while (it.hasNext()) {
- Entry e = (Entry) it.next();
+ for (Entry<String, String> e: headers.entrySet()) {
out.println("<tr><td>" + e.getKey() + "</td><td>"
+ e.getValue() + "</td></tr>");
}