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 2017/10/26 18:54:53 UTC
mina git commit: Updated the Javadoc, fixed some code
Repository: mina
Updated Branches:
refs/heads/2.0 8d4d9ef70 -> e7b76cc7d
Updated the Javadoc, fixed some code
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/e7b76cc7
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/e7b76cc7
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/e7b76cc7
Branch: refs/heads/2.0
Commit: e7b76cc7d000e843155b1e4813a201c382c9479e
Parents: 8d4d9ef
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 26 20:54:48 2017 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 26 20:54:48 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/mina/http/ArrayUtil.java | 2 +-
.../src/main/java/org/apache/mina/http/DateUtil.java | 8 ++------
.../java/org/apache/mina/http/HttpClientDecoder.java | 9 ++++-----
.../java/org/apache/mina/http/HttpException.java | 2 +-
.../java/org/apache/mina/http/HttpRequestImpl.java | 15 ++++++++++++---
.../java/org/apache/mina/http/HttpServerCodec.java | 3 +++
.../java/org/apache/mina/http/api/HttpMessage.java | 2 ++
.../java/org/apache/mina/http/api/HttpRequest.java | 3 ++-
8 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/ArrayUtil.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/ArrayUtil.java b/mina-http/src/main/java/org/apache/mina/http/ArrayUtil.java
index 1b262c5..15d9e8c 100644
--- a/mina-http/src/main/java/org/apache/mina/http/ArrayUtil.java
+++ b/mina-http/src/main/java/org/apache/mina/http/ArrayUtil.java
@@ -37,7 +37,7 @@ public class ArrayUtil {
*/
public static String[] dropFromEndWhile(String[] array, String regex) {
for (int i = array.length - 1; i >= 0; i--) {
- if (!"".equals(array[i].trim())) {
+ if (array[i].trim().length() != 0) {
String[] trimmedArray = new String[i + 1];
System.arraycopy(array, 0, trimmedArray, 0, i + 1);
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/DateUtil.java b/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
index 87c6f22..be65722 100644
--- a/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
+++ b/mina-http/src/main/java/org/apache/mina/http/DateUtil.java
@@ -65,12 +65,10 @@ public class DateUtil {
* format to a <code>long</code> representing the number of milliseconds
* since epoch.
*
- * @param dateString a date <code>String</code> in the <em>RFC 1123</em>
- * format.
+ * @param dateString a date <code>String</code> in the <em>RFC 1123</em> format.
* @return the parsed <code>Date</code> in milliseconds.
*/
private static long parseDateStringToMilliseconds(String dateString) {
-
try {
synchronized (DateUtil.RFC_1123_FORMAT) {
return DateUtil.RFC_1123_FORMAT.parse(dateString).getTime(); //NOPMD
@@ -87,8 +85,7 @@ public class DateUtil {
* parse the <code>String</code> as a <em>RFC 1123</em> date.
*
* @param dateValue the value to parse.
- * @return the <code>long</code> value following parse, or zero where not
- * successful.
+ * @return the <code>long</code> value following parse, or zero where not successful.
*/
public static long parseToMilliseconds(String dateValue) {
if (DateUtil.DIGIT_PATTERN.matcher(dateValue).matches()) {
@@ -127,5 +124,4 @@ public class DateUtil {
return RFC_1123_FORMAT.format(date); //NOPMD
}
}
-
}
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java
index 069d6e2..36db292 100644
--- a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java
+++ b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java
@@ -216,8 +216,8 @@ public class HttpClientDecoder implements ProtocolDecoder {
String requestLine = headerFields[0];
Map<String, String> generalHeaders = new HashMap<>();
- for (int i = 1; i < headerFields.length; i++) {
- String[] header = HEADER_VALUE_PATTERN.split(headerFields[i]);
+ for (String headerField:headerFields) {
+ String[] header = HEADER_VALUE_PATTERN.split(headerField);
generalHeaders.put(header[0].toLowerCase(), header[1]);
}
@@ -225,9 +225,8 @@ public class HttpClientDecoder implements ProtocolDecoder {
HttpStatus status = null;
int statusCode = Integer.parseInt(elements[1]);
- for (int i = 0; i < HttpStatus.values().length; i++) {
- status = HttpStatus.values()[i];
- if (statusCode == status.code()) {
+ for (HttpStatus httpStatus:HttpStatus.values()) {
+ if (statusCode == httpStatus.code()) {
break;
}
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/HttpException.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpException.java b/mina-http/src/main/java/org/apache/mina/http/HttpException.java
index b89c11f..5a3ac52 100644
--- a/mina-http/src/main/java/org/apache/mina/http/HttpException.java
+++ b/mina-http/src/main/java/org/apache/mina/http/HttpException.java
@@ -44,7 +44,7 @@ public class HttpException extends RuntimeException {
* @param statusCode The associated status code
*/
public HttpException(HttpStatus statusCode) {
- this(statusCode, "");
+ this(statusCode, "");
}
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/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 2585a36..4a1dc9b 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
@@ -36,15 +36,19 @@ import org.apache.mina.http.api.HttpVersion;
* @author <a href="http://mina.apache.org">Apache MINA Project</a>
*/
public class HttpRequestImpl implements HttpRequest {
-
+ /** The HTTP version */
private final HttpVersion version;
+ /** The HTTP method */
private final HttpMethod method;
+ /** The requested path */
private final String requestedPath;
+ /** The query string */
private final String queryString;
+ /** The set of headers */
private final Map<String, String> headers;
/**
@@ -145,18 +149,23 @@ public class HttpRequestImpl implements HttpRequest {
public Map<String, List<String>> getParameters() {
Map<String, List<String>> parameters = new HashMap<>();
String[] params = queryString.split("&");
+
if (params.length == 1) {
return parameters;
}
- for (int i = 0; i < params.length; i++) {
- String[] param = params[i].split("=");
+
+ for (String parameter:params) {
+ String[] param = parameter.split("=");
String name = param[0];
String value = param.length == 2 ? param[1] : "";
+
if (!parameters.containsKey(name)) {
parameters.put(name, new ArrayList<String>());
}
+
parameters.get(name).add(value);
}
+
return parameters;
}
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/HttpServerCodec.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpServerCodec.java b/mina-http/src/main/java/org/apache/mina/http/HttpServerCodec.java
index 45d43ac..6c23445 100644
--- a/mina-http/src/main/java/org/apache/mina/http/HttpServerCodec.java
+++ b/mina-http/src/main/java/org/apache/mina/http/HttpServerCodec.java
@@ -38,7 +38,10 @@ public class HttpServerCodec extends ProtocolCodecFilter {
/** Key for the partial HTTP requests head */
private static final String PARTIAL_HEAD_ATT = "http.ph";
+ /** The encoder instance */
private static ProtocolEncoder encoder = new HttpServerEncoder();
+
+ /** The decoder instance */
private static ProtocolDecoder decoder = new HttpServerDecoder();
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/api/HttpMessage.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/api/HttpMessage.java b/mina-http/src/main/java/org/apache/mina/http/api/HttpMessage.java
index 1cf963e..c215bed 100644
--- a/mina-http/src/main/java/org/apache/mina/http/api/HttpMessage.java
+++ b/mina-http/src/main/java/org/apache/mina/http/api/HttpMessage.java
@@ -58,6 +58,8 @@ public interface HttpMessage {
String getHeader(String name);
/**
+ * Tells if the message contains some header
+ *
* @param name the Header's name we are looking for
* @return <tt>true</tt> if the HTTP header with the specified name exists in this request.
*/
http://git-wip-us.apache.org/repos/asf/mina/blob/e7b76cc7/mina-http/src/main/java/org/apache/mina/http/api/HttpRequest.java
----------------------------------------------------------------------
diff --git a/mina-http/src/main/java/org/apache/mina/http/api/HttpRequest.java b/mina-http/src/main/java/org/apache/mina/http/api/HttpRequest.java
index 1e7cb4c..4976907 100644
--- a/mina-http/src/main/java/org/apache/mina/http/api/HttpRequest.java
+++ b/mina-http/src/main/java/org/apache/mina/http/api/HttpRequest.java
@@ -68,7 +68,8 @@ public interface HttpRequest extends HttpMessage {
HttpMethod getMethod();
/**
- * Retrurn the HTTP request path
+ * Return the HTTP request path
+ *
* @return the request path
*/
String getRequestPath();