Repository: wicket Updated Branches: refs/heads/master 8342e4ef9 -> 5b37aedcb
WICKET-6137 renamed BookmarkableListenerInterfaceRequestHandler to BookmarkableListenerRequestHandler Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9ec235f9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9ec235f9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9ec235f9 Branch: refs/heads/master Commit: 9ec235f9f5c47112528cedcadb4cf5ae19172866 Parents: 8342e4e Author: Sven Meier <[email protected]> Authored: Mon Jan 30 17:19:54 2017 +0100 Committer: Sven Meier <[email protected]> Committed: Mon Jan 30 17:19:54 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 4 +- ...markableListenerInterfaceRequestHandler.java | 170 ------------------- .../BookmarkableListenerRequestHandler.java | 170 +++++++++++++++++++ .../mapper/AbstractBookmarkableMapper.java | 6 +- .../request/mapper/BookmarkableMapperTest.java | 6 +- .../core/request/mapper/CryptoMapperTest.java | 6 +- .../core/request/mapper/MountedMapperTest.java | 6 +- .../core/request/mapper/PackageMapperTest.java | 6 +- 8 files changed, 187 insertions(+), 187 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index a6aa54f..f732463 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -31,7 +31,7 @@ import org.apache.wicket.authorization.IAuthorizationStrategy; import org.apache.wicket.authorization.UnauthorizedActionException; import org.apache.wicket.authorization.strategies.page.SimplePageAuthorizationStrategy; import org.apache.wicket.behavior.Behavior; -import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.util.lang.WicketObjects; @@ -3392,7 +3392,7 @@ public abstract class Component if (page.isPageStateless() || (page.isBookmarkable() && page.wasCreatedBookmarkable())) { - return new BookmarkableListenerInterfaceRequestHandler(provider, id); + return new BookmarkableListenerRequestHandler(provider, id); } else { http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java deleted file mode 100644 index 772e215..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.core.request.handler; - -import org.apache.wicket.IRequestListener; -import org.apache.wicket.request.IRequestCycle; -import org.apache.wicket.request.component.IRequestableComponent; -import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.util.lang.Args; - -/** - * Request handler for bookmarkable pages with an {@link IRequestListener}. This handler is only used to - * generate URLs. Rendering is always handled by {@link ListenerRequestHandler}. - * - * @author Matej Knopp - */ -public class BookmarkableListenerInterfaceRequestHandler - implements - IPageRequestHandler, - IComponentRequestHandler -{ - private final IPageAndComponentProvider pageComponentProvider; - - private final Integer behaviorIndex; - - /** - * Construct. - * - * @param pageComponentProvider - * @param behaviorIndex - */ - public BookmarkableListenerInterfaceRequestHandler( - IPageAndComponentProvider pageComponentProvider, - Integer behaviorIndex) - { - Args.notNull(pageComponentProvider, "pageComponentProvider"); - - this.pageComponentProvider = pageComponentProvider; - this.behaviorIndex = behaviorIndex; - } - - /** - * Construct. - * - * @param pageComponentProvider - */ - public BookmarkableListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider) - { - this(pageComponentProvider, null); - } - - public boolean includeRenderCount() { - if (behaviorIndex == null) { - return ((IRequestListener)getComponent()).rendersPage(); - } else { - return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).rendersPage(); - } - } - - /** - * @see org.apache.wicket.core.request.handler.IComponentRequestHandler#getComponent() - */ - @Override - public IRequestableComponent getComponent() - { - return pageComponentProvider.getComponent(); - } - - @Override - public final String getComponentPath() - { - return pageComponentProvider.getComponentPath(); - } - - /** - * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPage() - */ - @Override - public IRequestablePage getPage() - { - return pageComponentProvider.getPageInstance(); - } - - /** - * @see org.apache.wicket.core.request.handler.IPageClassRequestHandler#getPageClass() - */ - @Override - public Class<? extends IRequestablePage> getPageClass() - { - return pageComponentProvider.getPageClass(); - } - - /** - * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPageId() - */ - @Override - public Integer getPageId() - { - return pageComponentProvider.getPageId(); - } - - /** - * @see org.apache.wicket.core.request.handler.IPageClassRequestHandler#getPageParameters() - */ - @Override - public PageParameters getPageParameters() - { - return pageComponentProvider.getPageParameters(); - } - - /** - * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle) - */ - @Override - public void detach(IRequestCycle requestCycle) - { - pageComponentProvider.detach(); - } - - /** - * Returns index of behavior this listener is targeted on or <code>null</code> if component is - * the target - * - * @return behavior index or <code>null</code> - */ - public Integer getBehaviorIndex() - { - return behaviorIndex; - } - - /** - * @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle) - */ - @Override - public void respond(IRequestCycle requestCycle) - { - // nothing to do here, this handler is only used to generate URLs - } - - @Override - public final boolean isPageInstanceCreated() - { - // this request handler always operates on a created page instance - return true; - } - - /** - * @return the render count of the page - */ - @Override - public final Integer getRenderCount() - { - return pageComponentProvider.getRenderCount(); - } -} http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerRequestHandler.java new file mode 100644 index 0000000..7779231 --- /dev/null +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerRequestHandler.java @@ -0,0 +1,170 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.core.request.handler; + +import org.apache.wicket.IRequestListener; +import org.apache.wicket.request.IRequestCycle; +import org.apache.wicket.request.component.IRequestableComponent; +import org.apache.wicket.request.component.IRequestablePage; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.lang.Args; + +/** + * Request handler for bookmarkable pages with an {@link IRequestListener}. This handler is only used to + * generate URLs. Rendering is always handled by {@link ListenerRequestHandler}. + * + * @author Matej Knopp + */ +public class BookmarkableListenerRequestHandler + implements + IPageRequestHandler, + IComponentRequestHandler +{ + private final IPageAndComponentProvider pageComponentProvider; + + private final Integer behaviorIndex; + + /** + * Construct. + * + * @param pageComponentProvider + * @param behaviorIndex + */ + public BookmarkableListenerRequestHandler( + IPageAndComponentProvider pageComponentProvider, + Integer behaviorIndex) + { + Args.notNull(pageComponentProvider, "pageComponentProvider"); + + this.pageComponentProvider = pageComponentProvider; + this.behaviorIndex = behaviorIndex; + } + + /** + * Construct. + * + * @param pageComponentProvider + */ + public BookmarkableListenerRequestHandler(PageAndComponentProvider pageComponentProvider) + { + this(pageComponentProvider, null); + } + + public boolean includeRenderCount() { + if (behaviorIndex == null) { + return ((IRequestListener)getComponent()).rendersPage(); + } else { + return ((IRequestListener)getComponent().getBehaviorById(getBehaviorIndex())).rendersPage(); + } + } + + /** + * @see org.apache.wicket.core.request.handler.IComponentRequestHandler#getComponent() + */ + @Override + public IRequestableComponent getComponent() + { + return pageComponentProvider.getComponent(); + } + + @Override + public final String getComponentPath() + { + return pageComponentProvider.getComponentPath(); + } + + /** + * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPage() + */ + @Override + public IRequestablePage getPage() + { + return pageComponentProvider.getPageInstance(); + } + + /** + * @see org.apache.wicket.core.request.handler.IPageClassRequestHandler#getPageClass() + */ + @Override + public Class<? extends IRequestablePage> getPageClass() + { + return pageComponentProvider.getPageClass(); + } + + /** + * @see org.apache.wicket.core.request.handler.IPageRequestHandler#getPageId() + */ + @Override + public Integer getPageId() + { + return pageComponentProvider.getPageId(); + } + + /** + * @see org.apache.wicket.core.request.handler.IPageClassRequestHandler#getPageParameters() + */ + @Override + public PageParameters getPageParameters() + { + return pageComponentProvider.getPageParameters(); + } + + /** + * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle) + */ + @Override + public void detach(IRequestCycle requestCycle) + { + pageComponentProvider.detach(); + } + + /** + * Returns index of behavior this listener is targeted on or <code>null</code> if component is + * the target + * + * @return behavior index or <code>null</code> + */ + public Integer getBehaviorIndex() + { + return behaviorIndex; + } + + /** + * @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle) + */ + @Override + public void respond(IRequestCycle requestCycle) + { + // nothing to do here, this handler is only used to generate URLs + } + + @Override + public final boolean isPageInstanceCreated() + { + // this request handler always operates on a created page instance + return true; + } + + /** + * @return the render count of the page + */ + @Override + public final Integer getRenderCount() + { + return pageComponentProvider.getRenderCount(); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java index ecb50a2..8e3b9a9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.wicket.IRequestListener; -import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.core.request.handler.IPageRequestHandler; import org.apache.wicket.core.request.handler.ListenerRequestHandler; @@ -430,10 +430,10 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper } } - else if (requestHandler instanceof BookmarkableListenerInterfaceRequestHandler) + else if (requestHandler instanceof BookmarkableListenerRequestHandler) { // request listener URL with page class information - BookmarkableListenerInterfaceRequestHandler handler = (BookmarkableListenerInterfaceRequestHandler)requestHandler; + BookmarkableListenerRequestHandler handler = (BookmarkableListenerRequestHandler)requestHandler; Class<? extends IRequestablePage> pageClass = handler.getPageClass(); if (!checkPageClass(pageClass)) http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/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 e22210b..4284f4d 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 @@ -24,7 +24,7 @@ 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.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.core.request.handler.IPageProvider; import org.apache.wicket.core.request.handler.IPageRequestHandler; @@ -607,7 +607,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -635,7 +635,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/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 f87dcc8..58e5a6d 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 @@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import java.util.function.Supplier; import org.apache.wicket.MockPage; -import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.ListenerRequestHandler; import org.apache.wicket.core.request.handler.PageAndComponentProvider; import org.apache.wicket.core.request.handler.PageProvider; @@ -163,7 +163,7 @@ public class CryptoMapperTest extends AbstractMapperTest public void homePageForceEncryptionOfRequestListener() { PageAndComponentProvider provider = new PageAndComponentProvider(tester.getApplication().getHomePage(), "link"); - IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider); + IRequestHandler requestHandler = new BookmarkableListenerRequestHandler(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))); @@ -265,7 +265,7 @@ public class CryptoMapperTest extends AbstractMapperTest public void bookmarkablePageForceEncryptionOfRequestListener() { PageAndComponentProvider provider = new PageAndComponentProvider(Page2.class, "link"); - IRequestHandler requestHandler = new BookmarkableListenerInterfaceRequestHandler(provider); + IRequestHandler requestHandler = new BookmarkableListenerRequestHandler(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(), http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/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 f19d866..c71c74b 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 @@ -19,7 +19,7 @@ package org.apache.wicket.core.request.mapper; import static org.hamcrest.CoreMatchers.instanceOf; import org.apache.wicket.MockPage; -import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.core.request.handler.IPageProvider; import org.apache.wicket.core.request.handler.IPageRequestHandler; @@ -462,7 +462,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -525,7 +525,7 @@ public class MountedMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider, 4); Url url = encoder.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/9ec235f9/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 b0bb221..fe3e99e 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 @@ -21,7 +21,7 @@ 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; +import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler; import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.core.request.handler.IPageProvider; import org.apache.wicket.core.request.handler.IPageRequestHandler; @@ -505,7 +505,7 @@ public class PackageMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider); Url url = encoder.mapHandler(handler); @@ -532,7 +532,7 @@ public class PackageMapperTest extends AbstractMapperTest IRequestableComponent c = page.get("foo:bar"); PageAndComponentProvider provider = new PageAndComponentProvider(page, c); - IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider, 4); + IRequestHandler handler = new BookmarkableListenerRequestHandler(provider, 4); Url url = encoder.mapHandler(handler);
