You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/04/19 22:41:56 UTC
wicket git commit: WICKET-6146 Provide default implementation of
IRequestHandler#detach() in IModel
Repository: wicket
Updated Branches:
refs/heads/master 83a728458 -> 8ee9a4efa
WICKET-6146 Provide default implementation of IRequestHandler#detach() in IModel
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8ee9a4ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8ee9a4ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8ee9a4ef
Branch: refs/heads/master
Commit: 8ee9a4efa9bf4fa63205b4f00d674d9c4db78469
Parents: 83a7284
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Apr 19 22:41:38 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Apr 19 22:41:38 2016 +0200
----------------------------------------------------------------------
.../handler/BufferedResponseRequestHandler.java | 7 -------
.../request/handler/EmptyAjaxRequestHandler.java | 15 ---------------
.../apache/wicket/protocol/https/HttpsMapper.java | 6 ------
.../resource/ResourceReferenceRequestHandler.java | 8 --------
.../handler/resource/ResourceRequestHandler.java | 8 --------
.../WebExternalResourceRequestHandler.java | 17 -----------------
.../request/cycle/RequestCycleListenerTest.java | 15 +--------------
.../atmosphere/AtmosphereRequestHandler.java | 5 -----
.../html/autocomplete/AutoCompleteBehavior.java | 7 +------
.../ws/api/WebSocketMessageBroadcastHandler.java | 5 -----
.../org/apache/wicket/request/IRequestHandler.java | 6 ++++--
.../request/handler/EmptyRequestHandler.java | 7 -------
.../wicket/request/handler/TextRequestHandler.java | 6 ------
.../http/handler/ErrorCodeRequestHandler.java | 6 ------
.../http/handler/RedirectRequestHandler.java | 8 +-------
15 files changed, 7 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BufferedResponseRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BufferedResponseRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BufferedResponseRequestHandler.java
index 53eaca6..9a91f32 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BufferedResponseRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BufferedResponseRequestHandler.java
@@ -40,13 +40,6 @@ public class BufferedResponseRequestHandler implements IRequestHandler
this.bufferedWebResponse = bufferedWebResponse;
}
- /** {@inheritDoc} */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- /** {@inheritDoc} */
@Override
public void respond(IRequestCycle requestCycle)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
index d19dff3..c05d766 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
@@ -73,33 +73,18 @@ public final class EmptyAjaxRequestHandler implements IRequestHandler
response.write("\"?><ajax-response></ajax-response>");
}
- /** {@inheritDoc} */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj)
{
return obj instanceof EmptyAjaxRequestHandler;
}
- /**
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode()
{
return HASH;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
index 391aab0..caaa056 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
@@ -341,11 +341,5 @@ public class HttpsMapper implements IRequestMapperDelegate
WebResponse response = (WebResponse)requestCycle.getResponse();
response.sendRedirect(location);
}
-
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
index f09382e..77dc67d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceReferenceRequestHandler.java
@@ -81,9 +81,6 @@ public class ResourceReferenceRequestHandler implements IRequestHandler, ILoggab
return pageParameters;
}
- /**
- * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
- */
@Override
public void detach(IRequestCycle requestCycle)
{
@@ -91,17 +88,12 @@ public class ResourceReferenceRequestHandler implements IRequestHandler, ILoggab
logData = new ResourceReferenceLogData(this);
}
- /** {@inheritDoc} */
@Override
public ResourceReferenceLogData getLogData()
{
return logData;
}
-
- /**
- * @see org.apache.wicket.request.IRequestHandler#respond(org.apache.wicket.request.IRequestCycle)
- */
@Override
public void respond(IRequestCycle requestCycle)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
index 4dcf2f1..ea257d3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/ResourceRequestHandler.java
@@ -104,12 +104,4 @@ public class ResourceRequestHandler implements IRequestHandler
requestCycle.getResponse(), parameters);
resource.respond(a);
}
-
- /**
- * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
- */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/WebExternalResourceRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/WebExternalResourceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/WebExternalResourceRequestHandler.java
index a8feeb1..fac03d1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/WebExternalResourceRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/handler/resource/WebExternalResourceRequestHandler.java
@@ -62,17 +62,6 @@ public class WebExternalResourceRequestHandler extends ResourceStreamRequestHand
return uri;
}
- /**
- * @see org.apache.wicket.request.IRequestHandler#detach(org.apache.wicket.request.IRequestCycle)
- */
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj)
{
@@ -84,9 +73,6 @@ public class WebExternalResourceRequestHandler extends ResourceStreamRequestHand
return false;
}
- /**
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode()
{
@@ -95,9 +81,6 @@ public class WebExternalResourceRequestHandler extends ResourceStreamRequestHand
return 17 * result;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
index 76a0389..31258a5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java
@@ -271,20 +271,7 @@ public class RequestCycleListenerTest extends BaseRequestHandlerStackTest
@Override
public IRequestHandler onException(final RequestCycle cycle, Exception ex)
{
- return new IRequestHandler()
- {
- @Override
- public void respond(IRequestCycle requestCycle)
- {
- errorCode = code;
- }
-
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
-
- };
+ return requestCycle -> errorCode = code;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
index 4fd5f02..cbb8ef5 100644
--- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
+++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/AtmosphereRequestHandler.java
@@ -138,9 +138,4 @@ public class AtmosphereRequestHandler implements IRequestHandler
};
eventSubscriptionInvoker.invoke(target, subscription, base, event, initializer);
}
-
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
index 4ec1e99..02472ac 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
@@ -114,11 +114,6 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavi
}
renderer.renderFooter(r, count);
}
-
- @Override
- public void detach(final IRequestCycle requestCycle)
- {
- }
};
requestCycle.scheduleRequestHandlerAfterCurrent(target);
@@ -134,4 +129,4 @@ public abstract class AutoCompleteBehavior<T> extends AbstractAutoCompleteBehavi
* @return iterator over all possible choice objects
*/
protected abstract Iterator<T> getChoices(String input);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketMessageBroadcastHandler.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketMessageBroadcastHandler.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketMessageBroadcastHandler.java
index 0529fe3..3cb433b 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketMessageBroadcastHandler.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/WebSocketMessageBroadcastHandler.java
@@ -96,9 +96,4 @@ public class WebSocketMessageBroadcastHandler implements IRequestHandler
WebSocketSettings webSocketSettings = WebSocketSettings.Holder.get(application);
webSocketSettings.getSendPayloadExecutor().run(action);
}
-
- @Override
- public void detach(IRequestCycle requestCycle)
- {
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-request/src/main/java/org/apache/wicket/request/IRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/IRequestHandler.java b/wicket-request/src/main/java/org/apache/wicket/request/IRequestHandler.java
index 2265fb7..966010b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/IRequestHandler.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/IRequestHandler.java
@@ -25,6 +25,7 @@ package org.apache.wicket.request;
* @author Eelco Hillenius
* @author Matej Knopp
*/
+@FunctionalInterface
public interface IRequestHandler
{
/**
@@ -42,5 +43,6 @@ public interface IRequestHandler
* @param requestCycle
* the current request cycle
*/
- void detach(IRequestCycle requestCycle);
-}
\ No newline at end of file
+ default void detach(IRequestCycle requestCycle)
+ {}
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java b/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
index 126e70b..044b1ba 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/handler/EmptyRequestHandler.java
@@ -43,11 +43,4 @@ public final class EmptyRequestHandler implements IRequestHandler
public void respond(final IRequestCycle requestCycle)
{
}
-
- /** {@inheritDoc} */
- @Override
- public void detach(final IRequestCycle requestCycle)
- {
- }
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java b/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
index b884b01..06e0965 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/handler/TextRequestHandler.java
@@ -120,12 +120,6 @@ public class TextRequestHandler implements IRequestHandler
return encoding;
}
- /** {@inheritDoc} */
- @Override
- public void detach(final IRequestCycle requestCycle)
- {
- }
-
/**
* Gets the string property.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java b/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
index 7f7d291..26c99d9 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/http/handler/ErrorCodeRequestHandler.java
@@ -96,10 +96,4 @@ public final class ErrorCodeRequestHandler implements IRequestHandler
{
return message;
}
-
- /** {@inheritDoc} */
- @Override
- public void detach(final IRequestCycle requestCycle)
- {
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8ee9a4ef/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java b/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
index 13c99fa..e10ab12 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/http/handler/RedirectRequestHandler.java
@@ -83,13 +83,7 @@ public class RedirectRequestHandler implements IRequestHandler
{
return status;
}
-
- /** {@inheritDoc} */
- public void detach(final IRequestCycle requestCycle)
- {
- }
-
- /** {@inheritDoc} */
+
public void respond(final IRequestCycle requestCycle)
{
final String location;