http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java index 7f819e1..7497351 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorRequestTest.java @@ -17,16 +17,15 @@ package org.apache.wicket; import org.apache.wicket.behavior.Behavior; -import org.apache.wicket.behavior.IBehaviorListener; +import org.apache.wicket.core.request.handler.IPageAndComponentProvider; +import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; +import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.core.request.handler.IPageAndComponentProvider; -import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; -import org.apache.wicket.core.request.handler.ListenerInvocationNotAllowedException; -import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; @@ -84,8 +83,7 @@ public class BehaviorRequestTest extends WicketTestCase final int index = page.container.getBehaviorId(behaviorUnderTest); final IPageAndComponentProvider provider = new PageAndComponentProvider(page, page.container); - final IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - IBehaviorListener.INTERFACE, index); + final IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, index); return tester.urlFor(handler).toString(); } @@ -125,7 +123,7 @@ public class BehaviorRequestTest extends WicketTestCase /** */ - private static class TestCallbackBehavior extends Behavior implements IBehaviorListener + private static class TestCallbackBehavior extends Behavior implements IRequestListener { private static final long serialVersionUID = 1L; @@ -136,11 +134,16 @@ public class BehaviorRequestTest extends WicketTestCase public void onComponentTag(Component component, ComponentTag tag) { super.onComponentTag(component, tag); - tag.put("href", - component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters())); + tag.put("href", component.urlFor(this, new PageParameters())); } @Override + public boolean includeRenderCount() + { + return true; + } + + @Override public void onRequest() { called = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java index b16ff43..fdcff04 100644 --- a/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/BehaviorUrlTest.java @@ -19,7 +19,6 @@ package org.apache.wicket; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.behavior.Behavior; -import org.apache.wicket.behavior.IBehaviorListener; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -125,7 +124,7 @@ public class BehaviorUrlTest extends WicketTestCase /** */ - private static class TestCallbackBehavior extends Behavior implements IBehaviorListener + private static class TestCallbackBehavior extends Behavior implements IRequestListener { private static final long serialVersionUID = 1L; @@ -134,10 +133,16 @@ public class BehaviorUrlTest extends WicketTestCase { super.onComponentTag(component, tag); tag.put("href", - component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters())); + component.urlFor(this, new PageParameters())); } @Override + public boolean includeRenderCount() + { + return true; + } + + @Override public void onRequest() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java index 7a6a678..c4465bd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java @@ -17,7 +17,8 @@ package org.apache.wicket; import org.apache.wicket.behavior.Behavior; -import org.apache.wicket.behavior.IBehaviorListener; +import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; @@ -25,8 +26,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; -import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; @@ -109,7 +108,7 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase } } - private static class TestCallbackBehavior extends Behavior implements IBehaviorListener + private static class TestCallbackBehavior extends Behavior implements IRequestListener { private static final long serialVersionUID = 1L; private boolean requested; @@ -122,12 +121,17 @@ public class ComponentWithLazyModelCreationTest extends WicketTestCase super.onComponentTag(component, tag); int index = component.getBehaviorId(this); IRequestHandler handler = new ListenerInterfaceRequestHandler( - new PageAndComponentProvider(component.getPage(), component), - IBehaviorListener.INTERFACE, index); + new PageAndComponentProvider(component.getPage(), component), index); statefullUrl = component.getRequestCycle().mapUrlFor(handler).toString(); } @Override + public boolean includeRenderCount() + { + return true; + } + + @Override public void onRequest() { requested = true; http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java index 2698efc..1bb7f24 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java @@ -20,6 +20,7 @@ import java.util.List; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.IRequestListener; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -150,7 +151,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase } - private static class LinkBehavior extends Behavior implements IBehaviorListener + private static class LinkBehavior extends Behavior implements IRequestListener { private static final long serialVersionUID = 1L; @@ -165,10 +166,16 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase public void onComponentTag(Component component, ComponentTag tag) { super.onComponentTag(component, tag); - tag.put(attr, component.urlFor(this, IBehaviorListener.INTERFACE, new PageParameters())); + tag.put(attr, component.urlFor(this, new PageParameters())); } @Override + public boolean includeRenderCount() + { + return true; + } + + @Override public void onRequest() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java index 62a84ff..930bec3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/handler/ListenerInterfaceRequestHandlerTest.java @@ -21,15 +21,12 @@ import java.text.ParseException; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; -import org.apache.wicket.RequestListenerInterface; import org.apache.wicket.Session; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.form.IOnChangeListener; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.request.Url; import org.apache.wicket.resource.DummyPage; import org.apache.wicket.util.resource.IResourceStream; @@ -53,14 +50,14 @@ public class ListenerInterfaceRequestHandlerTest extends WicketTestCase // non-existing component on fresh page is ignored PageAndComponentProvider freshPage = new PageAndComponentProvider(DummyPage.class, null, "foo"); - new ListenerInterfaceRequestHandler(freshPage, IOnChangeListener.INTERFACE).respond(tester + new ListenerInterfaceRequestHandler(freshPage).respond(tester .getRequestCycle()); // non-existing component on old page fails PageAndComponentProvider oldPage = new PageAndComponentProvider(new DummyPage(), "foo"); try { - new ListenerInterfaceRequestHandler(oldPage, IOnChangeListener.INTERFACE) + new ListenerInterfaceRequestHandler(oldPage) .respond(tester.getRequestCycle()); fail(); } @@ -149,8 +146,7 @@ public class ListenerInterfaceRequestHandlerTest extends WicketTestCase public void isPageInstanceCreatedOnClassLinks() { PageAndComponentProvider provider = new PageAndComponentProvider(Page.class, "link"); - ListenerInterfaceRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - RequestListenerInterface.forName(ILinkListener.class.getSimpleName())); + ListenerInterfaceRequestHandler handler = new ListenerInterfaceRequestHandler(provider); assertFalse("Handler should not report a page instance is available ", handler.isPageInstanceCreated()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java index 8d0a4a2..d2022a8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractMapperTest.java @@ -19,13 +19,10 @@ package org.apache.wicket.core.request.mapper; import java.nio.charset.Charset; import java.util.Locale; -import org.apache.wicket.RequestListenerInterface; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; import org.apache.wicket.request.component.IRequestablePage; import org.junit.Assert; -import org.junit.Before; /** * @author Matej Knopp @@ -41,16 +38,6 @@ public abstract class AbstractMapperTest extends Assert protected TestMapperContext context = new TestMapperContext(); - /** - * @throws Exception - */ - @Before - public void before() throws Exception - { - // inititalize the interface - RequestListenerInterface i = ILinkListener.INTERFACE; - } - protected Request getRequest(final Url url) { return new Request() http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java index 123fbb1..da486dc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java @@ -207,7 +207,6 @@ public abstract class AbstractResourceReferenceMapperTest extends AbstractMapper } }; - @Override @Before public void before() throws Exception { http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java index bcd4ba6..3e90cb1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java @@ -16,12 +16,13 @@ */ package org.apache.wicket.core.request.mapper; -import java.nio.charset.Charset; -import java.util.Locale; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; +import java.nio.charset.Charset; +import java.util.Locale; + import org.apache.wicket.MockPage; import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; @@ -31,7 +32,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; @@ -184,7 +184,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertNull(h.getBehaviorIndex()); } @@ -205,7 +204,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); PageParameters p = page.getPageParameters(); @@ -231,7 +229,6 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertEquals((Object)4, h.getBehaviorIndex()); } @@ -610,8 +607,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -639,8 +635,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE, 4); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java index 7c9bf6b..5a9b950 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java @@ -30,7 +30,6 @@ import org.apache.wicket.core.request.handler.RequestSettingRequestHandler; import org.apache.wicket.markup.IMarkupFragment; import org.apache.wicket.markup.Markup; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.protocol.http.PageExpiredException; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.IRequestHandler; @@ -75,7 +74,6 @@ public class CryptoMapperTest extends AbstractMapperTest * * @throws Exception */ - @Override @Before public void before() throws Exception { @@ -164,7 +162,7 @@ public class CryptoMapperTest extends AbstractMapperTest public void homePageForceEncryptionOfRequestListener() { PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "some:link"); - IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE); + IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider); Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler); assertTrue("Plain URL for home page has segments: " + plainUrl.toString(), plainUrl.getSegments().isEmpty()); assertNull(mapper.mapRequest(getRequest(plainUrl))); @@ -266,7 +264,7 @@ public class CryptoMapperTest extends AbstractMapperTest public void bookmarkablePageForceEncryptionOfRequestListener() { PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "some:link"); - IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE); + IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider); Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler); assertTrue("Plain text request listener URL for bookmarkable page does not start with: " + PLAIN_BOOKMARKABLE_URL + ": " + plainUrl.toString(), @@ -359,7 +357,7 @@ public class CryptoMapperTest extends AbstractMapperTest final String componentPath = "some:path:to:link"; PageAndComponentProvider provider = new PageAndComponentProvider(Page1.class, componentPath); - IRequestHandler requestHandler = new ListenerInterfaceRequestHandler(provider, ILinkListener.INTERFACE); + IRequestHandler requestHandler = new ListenerInterfaceRequestHandler(provider); Url plainUrl = mapper.getDelegateMapper().mapHandler(requestHandler); assertTrue(plainUrl.toString().startsWith(MOUNTED_URL)); @@ -604,8 +602,7 @@ public class CryptoMapperTest extends AbstractMapperTest MockPage page = new MockPage(); IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new ListenerInterfaceRequestHandler(provider); Url url = mapper.mapHandler(handler); url.addQueryParameter("q", "foo"); http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java index 2ad6033..a917d67 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java @@ -27,7 +27,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.request.Request; @@ -218,7 +217,6 @@ public class MountedMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertNull(h.getBehaviorIndex()); } @@ -238,7 +236,6 @@ public class MountedMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); PageParameters p = page.getPageParameters(); @@ -263,7 +260,6 @@ public class MountedMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertEquals((Object)4, h.getBehaviorIndex()); } @@ -339,7 +335,6 @@ public class MountedMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 1); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertNull(h.getBehaviorIndex()); @@ -467,8 +462,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -503,8 +497,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new ListenerInterfaceRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -532,8 +525,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE, 4); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); @@ -563,8 +555,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE, 4); + IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java index 3716397..f41ec26 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java @@ -17,8 +17,8 @@ package org.apache.wicket.core.request.mapper; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import org.apache.wicket.MockPage; import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; @@ -30,7 +30,6 @@ import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; import org.apache.wicket.core.request.mapper.PackageMapperTest.OuterPage.InnerPage; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.mock.MockWebRequest; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; @@ -251,7 +250,6 @@ public class PackageMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertNull(h.getBehaviorIndex()); } @@ -271,7 +269,6 @@ public class PackageMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); PageParameters p = h.getPageParameters(); @@ -296,7 +293,6 @@ public class PackageMapperTest extends AbstractMapperTest IRequestablePage page = h.getPage(); checkPage(page, 15); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals("foo:bar", h.getComponent().getPageRelativePath()); assertEquals((Object)4, h.getBehaviorIndex()); } @@ -509,8 +505,7 @@ public class PackageMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -537,8 +532,7 @@ public class PackageMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE, 4); + IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java index fefd8c7..2bd8a57 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java @@ -28,7 +28,6 @@ import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; @@ -96,7 +95,6 @@ public class PageInstanceMapperTest extends AbstractMapperTest ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler; checkPage(h.getPage(), 4); assertEquals(h.getComponent().getPageRelativePath(), "a:b:c"); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertNull(h.getBehaviorIndex()); } @@ -138,7 +136,6 @@ public class PageInstanceMapperTest extends AbstractMapperTest ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler; checkPage(h.getPage(), 4); assertEquals(h.getComponent().getPageRelativePath(), "a:b:c"); - assertEquals(ILinkListener.INTERFACE, h.getListenerInterface()); assertEquals((Object)5, h.getBehaviorIndex()); } @@ -290,8 +287,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("a:b:c"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new ListenerInterfaceRequestHandler(provider, - ILinkListener.INTERFACE); + IRequestHandler handler = new ListenerInterfaceRequestHandler(provider); Url url = encoder.mapHandler(handler); assertEquals("wicket/page?15-5.ILinkListener-a-b-c", url.toString()); http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java index b3e137a..a1b960d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java @@ -17,8 +17,8 @@ package org.apache.wicket.core.request.mapper; import org.apache.wicket.MockPage; -import org.apache.wicket.RequestListenerInterface; import org.apache.wicket.WicketRuntimeException; +import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.markup.MarkupParser; import org.apache.wicket.page.IPageManagerContext; import org.apache.wicket.page.PageStoreManager; @@ -27,7 +27,6 @@ import org.apache.wicket.pageStore.IDataStore; import org.apache.wicket.pageStore.IPageStore; import org.apache.wicket.pageStore.memory.DummyPageManagerContext; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.core.request.handler.PageProvider; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.ResourceReference.Key; @@ -202,18 +201,6 @@ public class TestMapperContext implements IMapperContext } @Override - public RequestListenerInterface requestListenerInterfaceFromString(String interfaceName) - { - return RequestListenerInterface.forName(interfaceName); - } - - @Override - public String requestListenerInterfaceToString(RequestListenerInterface listenerInterface) - { - return listenerInterface.getName(); - } - - @Override public Class<? extends IRequestablePage> getHomePageClass() { return MockPage.class; http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java index 7cc01ce..0a7ce91 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java @@ -33,7 +33,6 @@ public class ComponentInfoTest extends Assert { String s = "listener-component-path"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals("component:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -60,7 +59,6 @@ public class ComponentInfoTest extends Assert String s = "listener-"; ComponentInfo info = ComponentInfo.parse(s); // empty component path is allowed - listener invoked on page - assertEquals("listener", info.getListenerInterface()); assertEquals("", info.getComponentPath()); } @@ -93,7 +91,6 @@ public class ComponentInfoTest extends Assert { String s = "listener-compo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals("compo--nent:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -108,7 +105,6 @@ public class ComponentInfoTest extends Assert { String s = "listener-co~mpo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals("co-mpo--nent:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -123,7 +119,6 @@ public class ComponentInfoTest extends Assert { String s = "listener.12-component-path"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals("component:path", info.getComponentPath()); assertEquals((Object)12, info.getBehaviorId()); @@ -138,7 +133,6 @@ public class ComponentInfoTest extends Assert { String s = "4.listener-a-b"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals((Integer)4, info.getRenderCount()); assertEquals(s, info.toString()); @@ -152,7 +146,6 @@ public class ComponentInfoTest extends Assert { String s = "4.listener.5-a-b"; ComponentInfo info = ComponentInfo.parse(s); - assertEquals("listener", info.getListenerInterface()); assertEquals((Integer)4, info.getRenderCount()); assertEquals((Integer)5, info.getBehaviorId()); @@ -170,15 +163,13 @@ public class ComponentInfoTest extends Assert final String componentPath = "-nav-container-:-nav:1:link"; final Integer behaviorId = null; - ComponentInfo info = new ComponentInfo(renderCount, listenerInterface, componentPath, - behaviorId); + ComponentInfo info = new ComponentInfo(renderCount, componentPath, behaviorId); final String encoded = info.toString(); assertEquals("1.ILinkListener-~nav~container~-~nav-1-link", encoded); ComponentInfo decoded = ComponentInfo.parse(encoded); assertEquals(renderCount, decoded.getRenderCount()); - assertEquals(listenerInterface, decoded.getListenerInterface()); assertEquals(componentPath, decoded.getComponentPath()); assertEquals(behaviorId, decoded.getBehaviorId()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java index 06a221f..adeb089 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java @@ -16,10 +16,10 @@ */ package org.apache.wicket.request.mapper.info; -import junit.framework.TestCase; - import org.junit.Test; +import junit.framework.TestCase; + /** * * @author Matej Knopp @@ -43,7 +43,6 @@ public class PageComponentInfoTest extends TestCase assertEquals(pageId, info.getPageInfo().getPageId()); - assertEquals(listener, info.getComponentInfo().getListenerInterface()); assertEquals(componentPath, info.getComponentInfo().getComponentPath()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java index a85429e..2795eb5 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java @@ -16,17 +16,16 @@ */ package org.apache.wicket.examples.ajax.prototype; +import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler; +import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.link.ILinkListener; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Url; import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.core.request.handler.ComponentRenderingRequestHandler; -import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; -import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.util.string.AppendingStringBuffer; @@ -81,7 +80,7 @@ public class Index extends WicketExamplePage protected String getOnClickScript(CharSequence url) { IRequestHandler handler = new ListenerInterfaceRequestHandler( - new PageAndComponentProvider(getPage(), this), ILinkListener.INTERFACE); + new PageAndComponentProvider(getPage(), this)); Url componentUrl = RequestCycle.get().mapUrlFor(handler); componentUrl.addQueryParameter("anticache", Math.random()); return new AppendingStringBuffer("new Ajax.Updater('counter', '").append( http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-examples/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/webapp/WEB-INF/web.xml b/wicket-examples/src/main/webapp/WEB-INF/web.xml index baf91fd..75df6e5 100644 --- a/wicket-examples/src/main/webapp/WEB-INF/web.xml +++ b/wicket-examples/src/main/webapp/WEB-INF/web.xml @@ -784,27 +784,6 @@ <url-pattern>/mailtemplate/*</url-pattern> </filter-mapping> - - <!-- CDI EXAMPLE APPLICATION --> - <filter> - <filter-name>CdiApplication</filter-name> - <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> - <init-param> - <param-name>applicationClassName</param-name> - <param-value>org.apache.wicket.examples.cdi.CdiApplication</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>CdiApplication</filter-name> - <url-pattern>/cdi/*</url-pattern> - </filter-mapping> - - <listener> - <!-- initialize Weld in servlet environment --> - <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> - </listener> - <!-- END CDI EXAMPLE APPLICATION --> - <!-- Bean Validation EXAMPLE APPLICATION --> <filter> <filter-name>BeanValidation</filter-name> http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java index f2d424b..68fb424 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java @@ -33,7 +33,6 @@ import javax.imageio.ImageIO; import javax.imageio.stream.MemoryCacheImageInputStream; import org.apache.wicket.Component; -import org.apache.wicket.IResourceListener; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxCallListener; @@ -213,8 +212,7 @@ public class KittenCaptchaPanel extends Panel javascript.append("Wicket.$('") .append(image.getMarkupId()) .append("').src = '"); - CharSequence url = image.urlFor(IResourceListener.INTERFACE, - new PageParameters()); + CharSequence url = image.urlFor(new PageParameters()); javascript.append(url); javascript.append(url.toString().indexOf('?') > -1 ? "&" : "?") .append("rand=") http://git-wip-us.apache.org/repos/asf/wicket/blob/d1710298/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java index 230dc6d..1263c66 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java @@ -108,7 +108,6 @@ public class ComponentInfo } } - private final String listenerInterface; private final String componentPath; private final Integer behaviorId; private final Integer renderCount; @@ -121,13 +120,10 @@ public class ComponentInfo * @param componentPath * @param behaviorId */ - public ComponentInfo(final Integer renderCount, final String listenerInterface, - final String componentPath, final Integer behaviorId) + public ComponentInfo(final Integer renderCount, final String componentPath, final Integer behaviorId) { - Args.notEmpty(listenerInterface, "listenerInterface"); Args.notNull(componentPath, "componentPath"); - this.listenerInterface = listenerInterface; this.componentPath = componentPath; this.behaviorId = behaviorId; this.renderCount = renderCount; @@ -142,14 +138,6 @@ public class ComponentInfo } /** - * @return listener interface name - */ - public String getListenerInterface() - { - return listenerInterface; - } - - /** * @return behavior index */ public Integer getBehaviorId() @@ -177,14 +165,12 @@ public class ComponentInfo if (renderCount != null) { result.append(renderCount); - result.append(BEHAVIOR_INDEX_SEPARATOR); } - result.append(listenerInterface); - + result.append(BEHAVIOR_INDEX_SEPARATOR); + if (behaviorId != null) { - result.append(BEHAVIOR_INDEX_SEPARATOR); result.append(behaviorId); } result.append(SEPARATOR); @@ -237,11 +223,6 @@ public class ComponentInfo String listenerInterface = string.substring(0, i); String componentPath = decodeComponentPath(string.substring(i + 1)); - if (Strings.isEmpty(listenerInterface)) - { - return null; - } - Integer behaviorIndex = null; Integer renderCount = null; @@ -251,34 +232,18 @@ public class ComponentInfo if (isNumber(listenerParts[0])) { renderCount = Integer.valueOf(listenerParts[0]); - listenerInterface = listenerParts[1]; } - else if (isNumber(listenerParts[1])) + if (isNumber(listenerParts[1])) { - listenerInterface = listenerParts[0]; behaviorIndex = Integer.valueOf(listenerParts[1]); } - else - { - return null; - } - } - else if (listenerParts.length == 3) - { - if (!isNumber(listenerParts[0]) && !isNumber(listenerParts[1])) - { - return null; - } - renderCount = Integer.valueOf(listenerParts[0]); - listenerInterface = listenerParts[1]; - behaviorIndex = Integer.valueOf(listenerParts[2]); + + return new ComponentInfo(renderCount, componentPath, behaviorIndex); } - else if (listenerParts.length != 1) + else { return null; } - - return new ComponentInfo(renderCount, listenerInterface, componentPath, behaviorIndex); } } }
