You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/20 16:35:19 UTC
[1/2] git commit: Code formatting.
Code formatting.
No functional changes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d8ce394d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d8ce394d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d8ce394d
Branch: refs/heads/master
Commit: d8ce394d4d841476d9412adc8c6e00b8cf476a70
Parents: cf9d262
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 20 17:05:48 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 20 17:05:48 2013 +0200
----------------------------------------------------------------------
.../wicket/protocol/ws/AbstractUpgradeFilter.java | 39 +++++++++------
1 files changed, 24 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d8ce394d/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
index 0485170..8a80738 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
@@ -41,11 +41,11 @@ import org.apache.wicket.request.http.WebResponse;
*/
public class AbstractUpgradeFilter extends WicketFilter
{
-
protected boolean processRequestCycle(final RequestCycle requestCycle, final WebResponse webResponse,
final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse,
final FilterChain chain)
- throws IOException, ServletException {
+ throws IOException, ServletException
+ {
// Assume we are able to handle the request
boolean res = true;
@@ -80,37 +80,43 @@ public class AbstractUpgradeFilter extends WicketFilter
String subProtocol = null;
List<String> extensions = Collections.emptyList();
- if (!headerContainsToken(req, "upgrade", "websocket")) {
+ if (!headerContainsToken(req, "upgrade", "websocket"))
+ {
// resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
return false;
}
- if (!headerContainsToken(req, "connection", "upgrade")) {
+ if (!headerContainsToken(req, "connection", "upgrade"))
+ {
resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
return false;
}
- if (!headerContainsToken(req, "sec-websocket-version", "13")) {
+ if (!headerContainsToken(req, "sec-websocket-version", "13"))
+ {
resp.setStatus(426);
resp.setHeader("Sec-WebSocket-Version", "13");
return false;
}
key = req.getHeader("Sec-WebSocket-Key");
- if (key == null) {
+ if (key == null)
+ {
resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
return false;
}
String origin = req.getHeader("Origin");
- if (!verifyOrigin(origin)) {
+ if (!verifyOrigin(origin))
+ {
resp.sendError(HttpServletResponse.SC_FORBIDDEN);
return false;
}
List<String> subProtocols = getTokensFromHeader(req,
"Sec-WebSocket-Protocol-Client");
- if (!subProtocols.isEmpty()) {
+ if (!subProtocols.isEmpty())
+ {
subProtocol = selectSubProtocol(subProtocols);
}
@@ -118,7 +124,8 @@ public class AbstractUpgradeFilter extends WicketFilter
resp.setHeader("upgrade", "websocket");
resp.setHeader("connection", "upgrade");
- if (subProtocol != null) {
+ if (subProtocol != null)
+ {
resp.setHeader("Sec-WebSocket-Protocol", subProtocol);
}
@@ -130,8 +137,8 @@ public class AbstractUpgradeFilter extends WicketFilter
* This only works for tokens. Quoted strings need more sophisticated
* parsing.
*/
- private boolean headerContainsToken(HttpServletRequest req,
- String headerName, String target) {
+ private boolean headerContainsToken(HttpServletRequest req, String headerName, String target)
+ {
Enumeration<String> headers = req.getHeaders(headerName);
while (headers.hasMoreElements()) {
String header = headers.nextElement();
@@ -149,8 +156,8 @@ public class AbstractUpgradeFilter extends WicketFilter
* This only works for tokens. Quoted strings need more sophisticated
* parsing.
*/
- protected List<String> getTokensFromHeader(HttpServletRequest req,
- String headerName) {
+ protected List<String> getTokensFromHeader(HttpServletRequest req, String headerName)
+ {
List<String> result = new ArrayList<String>();
Enumeration<String> headers = req.getHeaders(headerName);
@@ -175,7 +182,8 @@ public class AbstractUpgradeFilter extends WicketFilter
* reject it. This default implementation always returns
* <code>true</code>.
*/
- protected boolean verifyOrigin(String origin) {
+ protected boolean verifyOrigin(String origin)
+ {
return true;
}
@@ -191,7 +199,8 @@ public class AbstractUpgradeFilter extends WicketFilter
* the client. This default implementation always returns
* <code>null</code>.
*/
- protected String selectSubProtocol(List<String> subProtocols) {
+ protected String selectSubProtocol(List<String> subProtocols)
+ {
return null;
}
}