You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by re...@apache.org on 2023/11/01 14:49:14 UTC
(wicket) branch reiern70/WICKET-7080 updated (ce46a09e89 -> eadd46bfcf)
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a change to branch reiern70/WICKET-7080
in repository https://gitbox.apache.org/repos/asf/wicket.git
omit ce46a09e89 [WICKET-7080] add caching
omit 3f2fb29d4b [WICKET-7080] 1) make default events delivery machinery pluggable 2) allow to disabled sending events 3) define reflection based machinery to deliver events
new eadd46bfcf [WICKET-7080] 1) make default events delivery machinery pluggable 2) allow to disabled sending events
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ce46a09e89)
\
N -- N -- N refs/heads/reiern70/WICKET-7080 (eadd46bfcf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/wicket/event/EventAwareObject.java | 34 --
.../org/apache/wicket/event/IEventAwareObject.java | 23 -
.../main/java/org/apache/wicket/event/OnEvent.java | 42 --
.../java/org/apache/wicket/event/OnEvents.java | 37 --
.../wicket/event/ReflectionEventDispatcher.java | 175 ------
.../event/ReflectionEventDispatcherTest.java | 587 ---------------------
6 files changed, 898 deletions(-)
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/event/EventAwareObject.java
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/event/IEventAwareObject.java
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/event/OnEvent.java
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/event/OnEvents.java
delete mode 100644 wicket-core/src/main/java/org/apache/wicket/event/ReflectionEventDispatcher.java
delete mode 100644 wicket-core/src/test/java/org/apache/wicket/event/ReflectionEventDispatcherTest.java
(wicket) 01/01: [WICKET-7080] 1) make default events delivery machinery pluggable 2) allow to disabled sending events
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reiern70 pushed a commit to branch reiern70/WICKET-7080
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit eadd46bfcfae6446b72dcdcd00c6c3c351a377e6
Author: reiern70 <re...@gmail.com>
AuthorDate: Mon Oct 16 12:19:53 2023 -0500
[WICKET-7080] 1) make default events delivery machinery pluggable 2) allow to disabled sending events
---
.../src/main/java/org/apache/wicket/Component.java | 8 ++-
.../java/org/apache/wicket/ComponentEvent.java | 2 +-
.../main/java/org/apache/wicket/event/IEvent.java | 5 ++
.../apache/wicket/settings/FrameworkSettings.java | 63 +++++++++++++++++-----
4 files changed, 62 insertions(+), 16 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
index ef065d8c28..4a6e382590 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -4445,8 +4445,12 @@ public abstract class Component
@Override
public final <T> void send(IEventSink sink, Broadcast type, T payload)
{
- new ComponentEventSender(this, getApplication().getFrameworkSettings()).send(sink, type,
- payload);
+ // if there are no event dispatchers then don't even try to send event
+ if (getApplication().getFrameworkSettings().hasAnyAnyEventDispatchers())
+ {
+ new ComponentEventSender(this, getApplication().getFrameworkSettings()).send(sink, type,
+ payload);
+ }
}
/**
diff --git a/wicket-core/src/main/java/org/apache/wicket/ComponentEvent.java b/wicket-core/src/main/java/org/apache/wicket/ComponentEvent.java
index d0f613e0dd..bab29ff435 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ComponentEvent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ComponentEvent.java
@@ -101,7 +101,7 @@ final class ComponentEvent<T> implements IEvent<T>
stop = true;
}
- boolean isStop()
+ public boolean isStop()
{
return stop;
}
diff --git a/wicket-core/src/main/java/org/apache/wicket/event/IEvent.java b/wicket-core/src/main/java/org/apache/wicket/event/IEvent.java
index 89ae35704b..6254f24afe 100644
--- a/wicket-core/src/main/java/org/apache/wicket/event/IEvent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/event/IEvent.java
@@ -30,6 +30,11 @@ public interface IEvent<T>
*/
void stop();
+ /**
+ * @return true iff event has been stopped.
+ */
+ boolean isStop();
+
/**
* Stops the broadcast of this event any deeper into the hierarchy of the current sink
*/
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java
index d193ca6a1b..2f84181695 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/FrameworkSettings.java
@@ -45,8 +45,28 @@ import org.apache.wicket.util.string.Strings;
*/
public class FrameworkSettings implements IEventDispatcher
{
+ /**
+ * Does the standard delivery of events. Override and do nothing if you want to disable it.
+ */
+ private static class DefaultEventDispatcher implements IEventDispatcher
+ {
+ @Override
+ public void dispatchEvent(Object sink, IEvent<?> event, Component component)
+ {
+ // direct delivery
+ if (component != null && sink instanceof IComponentAwareEventSink)
+ {
+ ((IComponentAwareEventSink)sink).onEvent(component, event);
+ }
+ else if (sink instanceof IEventSink)
+ {
+ ((IEventSink)sink).onEvent(event);
+ }
+ }
+ }
private IDetachListener detachListener;
+ private IEventDispatcher defaultEventDispatcher = new DefaultEventDispatcher();
private List<IEventDispatcher> eventDispatchers = null;
/**
@@ -68,7 +88,7 @@ public class FrameworkSettings implements IEventDispatcher
* Gets the Wicket version. The Wicket version is in the same format as the version element in
* the pom.xml file (project descriptor). The version is generated by maven in the build/release
* cycle and put in the /META-INF/MANIFEST.MF file located in the root folder of the Wicket jar.
- *
+ * <p></p>
* The version usually follows one of the following formats:
* <ul>
* <li>major.minor[.bug] for stable versions. 1.1, 1.2, 1.2.1 are examples</li>
@@ -112,7 +132,7 @@ public class FrameworkSettings implements IEventDispatcher
/**
* Registers a new event dispatcher
*
- * @param dispatcher
+ * @param dispatcher {@link IEventDispatcher}
* @return {@code this} object for chaining
*/
public FrameworkSettings add(IEventDispatcher dispatcher)
@@ -129,26 +149,30 @@ public class FrameworkSettings implements IEventDispatcher
return this;
}
+ /**
+ * @return Returns <code>true</code> if there is at least one event dispatcher
+ */
+ public final boolean hasAnyAnyEventDispatchers()
+ {
+ if (defaultEventDispatcher != null)
+ {
+ return true;
+ }
+ return eventDispatchers != null && !eventDispatchers.isEmpty();
+ }
+
/**
* Dispatches event to registered dispatchers
*
* @see IEventDispatcher#dispatchEvent(Object, IEvent, Component)
- *
- * @param sink
- * @param event
- * @param component
+ *
*/
@Override
public void dispatchEvent(Object sink, IEvent<?> event, Component component)
{
- // direct delivery
- if (component != null && sink instanceof IComponentAwareEventSink)
+ if (defaultEventDispatcher != null)
{
- ((IComponentAwareEventSink)sink).onEvent(component, event);
- }
- else if (sink instanceof IEventSink)
- {
- ((IEventSink)sink).onEvent(event);
+ defaultEventDispatcher.dispatchEvent(sink, event, component);
}
// additional dispatchers delivery
@@ -162,6 +186,19 @@ public class FrameworkSettings implements IEventDispatcher
}
}
+ /**
+ * Allows to set the default events dispatcher
+ *
+ * @param defaultEventDispatcher
+ * IEventDispatcher
+ * @return {@code this} object for chaining
+ */
+ public FrameworkSettings setDefaultEventDispatcher(IEventDispatcher defaultEventDispatcher)
+ {
+ this.defaultEventDispatcher = defaultEventDispatcher;
+ return this;
+ }
+
/**
* Sets the {@link ISerializer} that will be used to convert objects to/from byte arrays
*