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 2021/12/16 14:15:29 UTC
[wicket] branch master updated (0ad7549 -> 0fdb24b)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from 0ad7549 Bump maven-bundle-plugin to 5.1.3
new 65ea4ce Fix the setup of WebSocket support in StartExamples
new 40e4e25 Do not resolve the WebSocket IKey twice
new 0fdb24b Minor non-functional improvements/cleanups
The 3 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:
wicket-core/src/main/java/org/apache/wicket/Page.java | 3 +--
.../main/java/org/apache/wicket/feedback/FeedbackDelay.java | 2 +-
.../src/main/java/org/apache/wicket/page/IPageManager.java | 2 +-
.../test/java/org/apache/wicket/examples/StartExamples.java | 11 +++++------
.../wicket/protocol/ws/api/AbstractWebSocketProcessor.java | 5 +++--
.../apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java | 2 +-
.../ws/api/registry/SimpleWebSocketConnectionRegistry.java | 6 +++---
.../wicket/protocol/ws/javax/WicketServerEndpointConfig.java | 2 +-
8 files changed, 16 insertions(+), 17 deletions(-)
[wicket] 02/03: Do not resolve the WebSocket IKey twice
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 40e4e255bffa5968f9e799680bb81ccc025164ad
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Dec 16 16:14:16 2021 +0200
Do not resolve the WebSocket IKey twice
Directly call #broadcastMessage(Connection, Message)
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
.../apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
index f2a3a93..59e49d1 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
@@ -81,7 +81,6 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
* A pageId indicating that the endpoint is WebSocketResource
*/
static final int NO_PAGE_ID = -1;
- static final String NO_PAGE_CLASS = "_NO_PAGE";
private final WebRequest webRequest;
private final int pageId;
@@ -202,7 +201,9 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
{
if (webSocketSettings.shouldNotifyOnErrorEvent(t)) {
IKey key = getRegistryKey();
- broadcastMessage(new ErrorMessage(getApplication(), getSessionId(), key, t));
+ IWebSocketConnection connection = connectionRegistry.getConnection(application, sessionId, key);
+ ErrorMessage message = new ErrorMessage(application, sessionId, key, t);
+ broadcastMessage(message, connection);
}
}
[wicket] 01/03: Fix the setup of WebSocket support in StartExamples
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 65ea4ceeabfa9d34e676cd83669f4b7725fe8c72
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Dec 16 16:11:46 2021 +0200
Fix the setup of WebSocket support in StartExamples
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
.../test/java/org/apache/wicket/examples/StartExamples.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
index aa16038..90e72ad 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/StartExamples.java
@@ -16,12 +16,10 @@
*/
package org.apache.wicket.examples;
-import java.io.File;
import java.lang.management.ManagementFactory;
import javax.management.MBeanServer;
-import jakarta.websocket.server.ServerContainer;
import org.apache.wicket.protocol.ws.javax.WicketServerEndpointConfig;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.HttpConfiguration;
@@ -32,10 +30,11 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.session.DefaultSessionCache;
import org.eclipse.jetty.server.session.FileSessionDataStore;
+import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
/**
* Separate startup class for people that want to run the examples directly. Use parameter
@@ -107,9 +106,9 @@ public class StartExamples
// sessionCache.setSessionDataStore(sessionStore);
// bb.getSessionHandler().setSessionCache(sessionCache);
- // FIXME Wicket 10
-// ServerContainer serverContainer = JakartaWebSocketServerContainer.ensureContainer(bb);
-// serverContainer.addEndpoint(new WicketServerEndpointConfig());
+// ServletContextHandler contextHandler = ServletContextHandler.getServletContextHandler(bb.getServletContext());
+// JakartaWebSocketServletContainerInitializer.configure(contextHandler,
+// (servletContext, container) -> container.addEndpoint(new WicketServerEndpointConfig()));
// uncomment next line if you want to test with JSESSIONID encoded in the urls
// ((AbstractSessionManager) bb.getSessionHandler().getSessionManager()).setUsingCookies(false);
[wicket] 03/03: Minor non-functional improvements/cleanups
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 0fdb24b17c7db0392f08e1c96bf488f4bd8f2fe0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Dec 16 16:14:59 2021 +0200
Minor non-functional improvements/cleanups
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
wicket-core/src/main/java/org/apache/wicket/Page.java | 3 +--
.../src/main/java/org/apache/wicket/feedback/FeedbackDelay.java | 2 +-
wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java | 2 +-
.../org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java | 2 +-
.../protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java | 6 +++---
.../apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index d204335..956b9b5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -249,7 +249,6 @@ public abstract class Page extends MarkupContainer
dirty(false);
}
- /** {@inheritDoc} */
@Override
public boolean setFreezePageId(boolean freeze)
{
@@ -708,7 +707,7 @@ public abstract class Page extends MarkupContainer
// Set versioning of page based on default
setVersioned(getApplication().getPageSettings().getVersionPagesByDefault());
- // All Pages are born dirty so they get clustered right away
+ // All Pages are born dirty, so they get clustered right away
dirty(true);
// this is a bit of a dirty hack, but calling dirty(true) results in isStateless called
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
index b042b08..b7fd4ed 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackDelay.java
@@ -40,7 +40,7 @@ public class FeedbackDelay implements Serializable, AutoCloseable
private static final long serialVersionUID = 1L;
};
- private List<IFeedback> feedbacks = new ArrayList<>();
+ private final List<IFeedback> feedbacks = new ArrayList<>();
private RequestCycle cycle;
diff --git a/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java b/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java
index ef6094a..9a2da2e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java
+++ b/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java
@@ -27,7 +27,7 @@ import org.apache.wicket.pageStore.IPageStore;
public interface IPageManager
{
/**
- * Is versionining of pages supported, see {@link IPageStore#supportsVersioning()}.
+ * Is versioning of pages supported, see {@link IPageStore#supportsVersioning()}.
*
* @return {@code true} if versioning is supported
*/
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
index 420393e..4e37f54 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
@@ -136,7 +136,7 @@ public class BaseWebSocketBehavior extends Behavior
variables.put("context", getContext(component));
- // set falsy JS values for the non-used parameter
+ // set falsy JS values for the non-used parameters
if (Strings.isEmpty(resourceName))
{
int pageId = component.getPage().getPageId();
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
index 1a17590..6993230 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/registry/SimpleWebSocketConnectionRegistry.java
@@ -52,10 +52,10 @@ public class SimpleWebSocketConnectionRegistry implements IWebSocketConnectionRe
ConcurrentMap<String, ConcurrentMap<IKey, IWebSocketConnection>> connectionsBySession = application.getMetaData(KEY);
if (connectionsBySession != null)
{
- ConcurrentMap<IKey, IWebSocketConnection> connectionsByPage = connectionsBySession.get(sessionId);
- if (connectionsByPage != null)
+ ConcurrentMap<IKey, IWebSocketConnection> connectionsByKey = connectionsBySession.get(sessionId);
+ if (connectionsByKey != null)
{
- connection = connectionsByPage.get(key);
+ connection = connectionsByKey.get(key);
}
}
return connection;
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java
index d06ef06..632e9e4 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java
@@ -40,7 +40,7 @@ public class WicketServerEndpointConfig implements ServerEndpointConfig
/**
* A fake mount path used for WebSocket endpoint.
* WicketFilter should not process this path.
- * @see org.apache.wicket.protocol.http.WicketFilter#ignorePaths
+ * See JavaxWebSocketFilter.JavaxWebSocketFilterConfig#getInitParameter(String)
*/
static final String WICKET_WEB_SOCKET_PATH = "/wicket/websocket";