Author: ivaynberg
Date: Tue Oct 6 19:21:16 2009
New Revision: 822446
URL: http://svn.apache.org/viewvc?rev=822446&view=rev
Log:
make mapper names more people friendly
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/RequestMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ThreadsafeCompoundRequestMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/RequestMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/RequestMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/RequestMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/RequestMapper.java
Tue Oct 6 19:21:16 2009
@@ -20,7 +20,7 @@
/**
* Encodes {...@link RequestHandler}(s) into {...@link Url}(s) and decodes
{...@link Request}(s) to
* {...@link RequestHandler}(s). For {...@link RequestHandler}s and {...@link
Request}s the implementation
- * doesn't know the {...@link #map(RequestHandler)} and {...@link
#map(Request)} methods
+ * doesn't know the {...@link #mapHandler(RequestHandler)} and {...@link
#mapRequest(Request)} methods
* must return <code>null</code>.
*
* @author Matej Knopp
@@ -36,7 +36,7 @@
*
* @return RequestHandler instance or <code>null</code>
*/
- RequestHandler map(Request request);
+ RequestHandler mapRequest(Request request);
/**
* Returns the score representing how compatible this request mapper is to
processing the given
@@ -64,5 +64,5 @@
* @param requestHandler
* @return Url instance or <code>null</code>.
*/
- Url map(RequestHandler requestHandler);
+ Url mapHandler(RequestHandler requestHandler);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
Tue Oct 6 19:21:16 2009
@@ -123,7 +123,7 @@
*/
protected RequestHandler resolveRequestHandler()
{
- RequestHandler handler = requestMapper.map(request);
+ RequestHandler handler = requestMapper.mapRequest(request);
return handler;
}
@@ -288,7 +288,7 @@
*/
public Url urlFor(RequestHandler handler)
{
- return requestMapper.map(handler);
+ return requestMapper.mapHandler(handler);
}
/**
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
Tue Oct 6 19:21:16 2009
@@ -182,7 +182,7 @@
}
}
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
UrlInfo urlInfo = parseRequest(request);
@@ -220,7 +220,7 @@
return true;
}
- public Url map(RequestHandler requestHandler)
+ public Url mapHandler(RequestHandler requestHandler)
{
if (requestHandler instanceof BookmarkablePageRequestHandler)
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/BufferedResponseMapper.java
Tue Oct 6 19:21:16 2009
@@ -62,7 +62,7 @@
}
}
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
request = getRequest(request);
@@ -77,7 +77,7 @@
}
}
- public Url map(RequestHandler requestHandler)
+ public Url mapHandler(RequestHandler requestHandler)
{
return null;
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/PageInstanceMapper.java
Tue Oct 6 19:21:16 2009
@@ -54,7 +54,7 @@
{
}
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
Url url = request.getUrl();
if (urlStartsWith(url, getContext().getNamespace(),
getContext().getPageIdentifier()))
@@ -92,7 +92,7 @@
return null;
}
- public Url map(RequestHandler requestHandler)
+ public Url mapHandler(RequestHandler requestHandler)
{
PageComponentInfo info = null;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ResourceReferenceMapper.java
Tue Oct 6 19:21:16 2009
@@ -65,7 +65,7 @@
this(new SimplePageParametersEncoder());
}
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
Url url = request.getUrl();
if (url.getSegments().size() >= 4
@@ -118,7 +118,7 @@
return scope.getName();
}
- public Url map(RequestHandler requestHandler)
+ public Url mapHandler(RequestHandler requestHandler)
{
if (requestHandler instanceof ResourceReferenceRequestHandler)
{
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/SystemMapper.java
Tue Oct 6 19:21:16 2009
@@ -33,15 +33,15 @@
}
/** {...@inheritdoc} */
- public Url map(RequestHandler handler)
+ public Url mapHandler(RequestHandler handler)
{
- return mapper.map(handler);
+ return mapper.mapHandler(handler);
}
/** {...@inheritdoc} */
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
- return mapper.map(request);
+ return mapper.mapRequest(request);
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ThreadsafeCompoundRequestMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ThreadsafeCompoundRequestMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ThreadsafeCompoundRequestMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/ThreadsafeCompoundRequestMapper.java
Tue Oct 6 19:21:16 2009
@@ -88,7 +88,7 @@
* @return RequestHandler for the request or <code>null</code> if no
encoder for the request is
* found.
*/
- public RequestHandler map(Request request)
+ public RequestHandler mapRequest(Request request)
{
List<EncoderWithSegmentsCount> list = new
ArrayList<EncoderWithSegmentsCount>(mappers
.size());
@@ -102,7 +102,7 @@
for (EncoderWithSegmentsCount encoder : list)
{
- RequestHandler handler = encoder.getMapper().map(request);
+ RequestHandler handler = encoder.getMapper().mapRequest(request);
if (handler != null)
{
return handler;
@@ -124,11 +124,11 @@
* @param handler
* @return Url for the handler or <code>null</code> if no encoder for the
handler is found.
*/
- public Url map(RequestHandler handler)
+ public Url mapHandler(RequestHandler handler)
{
for (RequestMapper encoder : mappers)
{
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
if (url != null)
{
return url;
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
Tue Oct 6 19:21:16 2009
@@ -35,7 +35,7 @@
}
}
- public final RequestHandler map(Request request)
+ public final RequestHandler mapRequest(Request request)
{
final Url url = request.getUrl();
@@ -62,7 +62,7 @@
protected abstract RequestHandler map(Request request, MountParameters
params);
- public Url map(RequestHandler handler)
+ public Url mapHandler(RequestHandler handler)
{
final MountParameters mountParameters = mapMountParameters(handler);
Url url = mapUnmountedUrl(handler);
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/BookmarkableEncoderTest.java
Tue Oct 6 19:21:16 2009
@@ -64,7 +64,7 @@
public void testDecode1()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -79,7 +79,7 @@
public void testDecode2()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/indexed1?a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -100,7 +100,7 @@
public void testDecode3()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -113,7 +113,7 @@
public void testDecode4()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15&a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -135,7 +135,7 @@
public void testDecode5()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"?15-ILinkListener-foo-bar");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
@@ -156,7 +156,7 @@
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -184,7 +184,7 @@
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
@@ -208,7 +208,7 @@
context.setNextPageRenderCount(5);
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -229,7 +229,7 @@
try
{
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
((PageRequestHandler)handler).getPage();
@@ -250,7 +250,7 @@
PageProvider provider = new PageProvider(MockPage.class, new
PageParameters());
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
}
@@ -267,7 +267,7 @@
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?a=b&b=c", url.toString());
}
@@ -285,7 +285,7 @@
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?a=b&b=c", url.toString());
}
@@ -304,7 +304,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15&a=b&b=c", url.toString());
}
@@ -324,7 +324,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
// never allow bookmarkable render url for page that has not been
created by bookmarkable
// URL
@@ -353,7 +353,7 @@
RequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
@@ -380,7 +380,7 @@
RequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE, 4);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
@@ -399,7 +399,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
Tue Oct 6 19:21:16 2009
@@ -72,7 +72,7 @@
public void testDecode1()
{
Url url = Url.parse("some/mount/path");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -87,7 +87,7 @@
public void testDecode2()
{
Url url = Url.parse("some/mount/path/indexed1?a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -107,7 +107,7 @@
public void testDecode3()
{
Url url = Url.parse("some/mount/path?15");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -120,7 +120,7 @@
public void testDecode4()
{
Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -142,7 +142,7 @@
public void testDecode5()
{
Url url = Url.parse("some/mount/path?15-ILinkListener-foo-bar");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
@@ -162,7 +162,7 @@
public void testDecode6()
{
Url url =
Url.parse("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -189,7 +189,7 @@
public void testDecode7()
{
Url url = Url.parse("some/mount/path?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
@@ -209,7 +209,7 @@
public void testDecode8()
{
Url url = Url.parse("some/mmount/path?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -221,7 +221,7 @@
{
// capture the home page
Url url = Url.parse("");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
}
@@ -232,7 +232,7 @@
{
Url url = Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
context.setNextPageRenderCount(5);
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
@@ -252,7 +252,7 @@
try
{
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
((PageRequestHandler)handler).getPage();
@@ -273,7 +273,7 @@
PageProvider provider = new PageProvider(MockPage.class, new
PageParameters());
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path", url.toString());
}
@@ -290,7 +290,7 @@
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?a=b&b=c", url.toString());
}
@@ -308,7 +308,7 @@
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?a=b&b=c", url.toString());
}
@@ -327,7 +327,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?15&a=b&b=c", url.toString());
}
@@ -347,7 +347,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
// mounted pages must render mounted url even for page that has not
been created by
// bookmarkable
@@ -378,7 +378,7 @@
RequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c",
url.toString());
}
@@ -405,7 +405,7 @@
RequestHandler handler = new
BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE, 4);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c",
url.toString());
}
@@ -423,7 +423,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path", url.toString());
}
@@ -472,7 +472,7 @@
public void testPlaceholderDecode1()
{
Url url = Url.parse("some/p1/path/p2");
- RequestHandler handler = placeholderEncoder.map(getRequest(url));
+ RequestHandler handler =
placeholderEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -489,7 +489,7 @@
public void testPlaceholderDecode2()
{
Url url = Url.parse("some/p1/path/p2/indexed1?a=b&b=c");
- RequestHandler handler = placeholderEncoder.map(getRequest(url));
+ RequestHandler handler =
placeholderEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
@@ -522,7 +522,7 @@
PageProvider provider = new PageProvider(MockPage.class, parameters);
provider.setPageSource(context);
RequestHandler handler = new BookmarkablePageRequestHandler(provider);
- Url url = placeholderEncoder.map(handler);
+ Url url = placeholderEncoder.mapHandler(handler);
assertEquals("some/p1/path/p2/i1/i2?a=b&b=c", url.toString());
}
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/PageInstanceMapperTest.java
Tue Oct 6 19:21:16 2009
@@ -61,7 +61,7 @@
{
Url url = Url.parse("wicket/page?4");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
@@ -75,7 +75,7 @@
{
Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
@@ -89,7 +89,7 @@
{
Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -106,7 +106,7 @@
{
Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -117,7 +117,7 @@
{
Url url = Url.parse("wicket/page?abc");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -128,7 +128,7 @@
{
Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -147,7 +147,7 @@
context.setNextPageRenderCount(6);
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h =
(ListenerInterfaceRequestHandler)handler;
@@ -165,7 +165,7 @@
try
{
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
((PageRequestHandler)handler).getPage();
@@ -187,7 +187,7 @@
PageProvider provider = new PageProvider(page);
RequestHandler handler = new RenderPageRequestHandler(provider);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/page?15", url.toString());
}
@@ -206,7 +206,7 @@
RequestHandler handler = new ListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString());
}
Modified:
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
URL:
http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java?rev=822446&r1=822445&r2=822446&view=diff
==============================================================================
---
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
(original)
+++
wicket/sandbox/knopp/experimental/wicket-ng/src/test/java/org/apache/wicket/request/mapper/ResourceReferenceEncoderTest.java
Tue Oct 6 19:21:16 2009
@@ -53,7 +53,7 @@
public void testDecode1()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -69,7 +69,7 @@
public void testDecode1A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1?en");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -85,7 +85,7 @@
public void testDecode2()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1?p1=v1&p2=v2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -102,7 +102,7 @@
public void testDecode2A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference1?-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -119,7 +119,7 @@
public void testDecode3()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -135,7 +135,7 @@
public void testDecode3A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN-style");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -151,7 +151,7 @@
public void testDecode3B()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -162,7 +162,7 @@
{
Url url = Url
.parse("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN&p1=v1&p2=v2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -178,7 +178,7 @@
public void testDecode5()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference3?-style");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource3, h.getResource());
@@ -194,7 +194,7 @@
public void testDecode6()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference3?-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource3, h.getResource());
@@ -212,7 +212,7 @@
public void testDecode7()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference4?en-style");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource4, h.getResource());
@@ -228,7 +228,7 @@
public void testDecode7A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference4?sk");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -238,7 +238,7 @@
public void testDecode8()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference4?en-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.map(getRequest(url));
+ RequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource4, h.getResource());
@@ -256,7 +256,7 @@
{
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference1,
null);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference1",
url.toString());
}
@@ -272,7 +272,7 @@
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference1,
parameters);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME +
"/reference1?p1=v1&p2=v2", url.toString());
}
@@ -283,7 +283,7 @@
{
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference2,
null);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN", url.toString());
}
@@ -299,7 +299,7 @@
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference2,
parameters);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME +
"/reference2/name2?en_EN&p1=v1&p2=v2", url
.toString());
}
@@ -311,7 +311,7 @@
{
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference3,
null);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference3?-style",
url.toString());
}
@@ -327,7 +327,7 @@
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference3,
parameters);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME +
"/reference3?-style&p1=v1&p2=v2", url
.toString());
}
@@ -339,7 +339,7 @@
{
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference4,
null);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference4?en-style",
url.toString());
}
@@ -355,7 +355,7 @@
ResourceReferenceRequestHandler handler = new
ResourceReferenceRequestHandler(reference4,
parameters);
- Url url = encoder.map(handler);
+ Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME +
"/reference4?en-style&p1=v1&p2=v2", url
.toString());
}
