WICKET-6137 renamed BookmarkableListenerInterfaceRequestHandler to Bo…

…okmarkableListenerRequestHandler
apache · Jan 30, 2017 · 9ec235f · 9ec235f
1 parent 8342e4e
commit 9ec235f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git 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.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 @@ private IRequestHandler createRequestHandler(PageParameters parameters, Integer
 		if (page.isPageStateless()
 			|| (page.isBookmarkable() && page.wasCreatedBookmarkable()))
 		{
-			return new BookmarkableListenerInterfaceRequestHandler(provider, id);
+			return new BookmarkableListenerRequestHandler(provider, id);
 		}
 		else
 		{

diff --git a/...kableListenerInterfaceRequestHandler.java → ...r/BookmarkableListenerRequestHandler.java b/...kableListenerInterfaceRequestHandler.java → ...r/BookmarkableListenerRequestHandler.java
@@ -29,7 +29,7 @@
  *
  * @author Matej Knopp
  */
-public class BookmarkableListenerInterfaceRequestHandler
+public class BookmarkableListenerRequestHandler
 	implements
 		IPageRequestHandler,
 		IComponentRequestHandler
@@ -44,7 +44,7 @@ public class BookmarkableListenerInterfaceRequestHandler
 	 * @param pageComponentProvider
 	 * @param behaviorIndex
 	 */
-	public BookmarkableListenerInterfaceRequestHandler(
+	public BookmarkableListenerRequestHandler(
 		IPageAndComponentProvider pageComponentProvider,
 		Integer behaviorIndex)
 	{
@@ -59,7 +59,7 @@ public BookmarkableListenerInterfaceRequestHandler(
 	 *
 	 * @param pageComponentProvider
 	 */
-	public BookmarkableListenerInterfaceRequestHandler(PageAndComponentProvider pageComponentProvider)
+	public BookmarkableListenerRequestHandler(PageAndComponentProvider pageComponentProvider)
 	{
 		this(pageComponentProvider, null);
 	}

diff --git a/...-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/...-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -20,7 +20,7 @@
 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 @@ else if (requestHandler instanceof RenderPageRequestHandler)
 			}
 
 		}
-		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))

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
@@ -24,7 +24,7 @@
 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 void encode6()
 		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 void encode7()
 		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);
 

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
@@ -21,7 +21,7 @@
 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 void homePageWithNonEncryptedQueryParameters()
 	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 void bookmarkablePageForceEncryption()
 	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(),

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
@@ -19,7 +19,7 @@
 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 void encode6()
 		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 void encode7()
 		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);
 

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
@@ -21,7 +21,7 @@
 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 void encode6()
 		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 void encode7()
 		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);