Author: mgrigorov
Date: Thu Nov 10 12:48:39 2011
New Revision: 1200307
URL: http://svn.apache.org/viewvc?rev=1200307&view=rev
Log:
WICKET-4140 Make CryptoMapper easier to extend
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java?rev=1200307&r1=1200306&r2=1200307&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
Thu Nov 10 12:48:39 2011
@@ -25,6 +25,7 @@ import org.apache.wicket.request.Request
import org.apache.wicket.request.Url;
import org.apache.wicket.util.IProvider;
import org.apache.wicket.util.crypt.ICrypt;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -76,8 +77,8 @@ public class CryptoMapper implements IRe
*/
public CryptoMapper(final IRequestMapper wrappedMapper, final
IProvider<ICrypt> cryptProvider)
{
- this.wrappedMapper = wrappedMapper;
- this.cryptProvider = cryptProvider;
+ this.wrappedMapper = Args.notNull(wrappedMapper,
"wrappedMapper");
+ this.cryptProvider = Args.notNull(cryptProvider,
"cryptProvider");
}
public int getCompatibilityScore(final Request request)
@@ -109,11 +110,23 @@ public class CryptoMapper implements IRe
return wrappedMapper.mapRequest(request.cloneWithUrl(url));
}
- private ICrypt getCrypt()
+ /**
+ * @return the {@link ICrypt} implementation that may be used to
encrypt/decrypt {@link Url}'s
+ * segments and/or query string
+ */
+ protected final ICrypt getCrypt()
{
return cryptProvider.get();
}
+ /**
+ * @return the wrapped root request mapper
+ */
+ protected final IRequestMapper getWrappedMapper()
+ {
+ return wrappedMapper;
+ }
+
private Url encryptUrl(final Url url)
{
if (url.getSegments().isEmpty() &&
url.getQueryParameters().isEmpty())
