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 <[email protected]> AuthorDate: Thu Dec 16 16:14:59 2021 +0200 Minor non-functional improvements/cleanups Signed-off-by: Martin Tzvetanov Grigorov <[email protected]> --- 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";
