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 2012/06/13 12:31:38 UTC
[1/2] git commit: Minor code cleanup.
Updated Branches:
refs/heads/master f66033230 -> aa46135a5
Minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa46135a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa46135a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa46135a
Branch: refs/heads/master
Commit: aa46135a5a5814d0de7f1c51c2895be134440162
Parents: ef36f14
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jun 13 13:30:58 2012 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 13 13:30:58 2012 +0300
----------------------------------------------------------------------
.../apache/wicket/protocol/https/HttpsMapper.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/aa46135a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
index 2815c5c..a5f765a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
@@ -19,6 +19,7 @@ package org.apache.wicket.protocol.https;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Session;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.IRequestMapper;
@@ -26,10 +27,10 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.collections.ClassMetaCache;
+import org.apache.wicket.util.lang.Args;
/**
* A {@link IRequestMapper} that will issue a redirect to secured communication (over https) if the
@@ -74,7 +75,7 @@ public class HttpsMapper implements IRequestMapper
*/
public HttpsMapper(IRequestMapper delegate, HttpsConfig config)
{
- this.delegate = delegate;
+ this.delegate = Args.notNull(delegate, "delegate");
this.config = config;
}
@@ -202,7 +203,7 @@ public class HttpsMapper implements IRequestMapper
*/
protected Scheme getSchemeOf(Request request)
{
- HttpServletRequest req = (HttpServletRequest)((WebRequest)request).getContainerRequest();
+ HttpServletRequest req = (HttpServletRequest) request.getContainerRequest();
if ("https".equalsIgnoreCase(req.getScheme()))
{
@@ -300,8 +301,8 @@ public class HttpsMapper implements IRequestMapper
*/
public RedirectHandler(String url, HttpsConfig config)
{
- this.url = url;
- this.config = config;
+ this.url = Args.notNull(url, "url");
+ this.config = Args.notNull(config, "config");
}
/**
@@ -315,7 +316,7 @@ public class HttpsMapper implements IRequestMapper
@Override
public void respond(IRequestCycle requestCycle)
{
- String location = url.toString();
+ String location = url;
if (location.startsWith("/"))
{