(wicket) branch wicket-9.x updated: WICKET-7150: Do not check whether the javax impl is in use (#1121)

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch wicket-9.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-9.x by this push:
     new 40c2ca18cb WICKET-7150: Do not check whether the javax impl is in use 
(#1121)
40c2ca18cb is described below

commit 40c2ca18cb857defa8b3976b02000602ed4d38f2
Author: Martin Grigorov <marti...@users.noreply.github.com>
AuthorDate: Thu Mar 13 10:34:06 2025 +0200

    WICKET-7150: Do not check whether the javax impl is in use (#1121)
    
    The non-JSR-356 impls were removed long time ago in favour of the
    standard one.
    
    Signed-off-by: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
    (cherry picked from commit f821f7b4c0e184c1a69672ea3c1fd6332666c784)
---
 .../wicket/protocol/ws/WebSocketSettings.java      | 30 +---------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git 
a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
 
b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
index 5d203d0deb..326d633697 100644
--- 
a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
+++ 
b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/WebSocketSettings.java
@@ -61,27 +61,6 @@ public class WebSocketSettings
        {
        };
 
-       /**
-        * A flag indicating whether JavaxWebSocketFilter is in use.
-        * When using JSR356 based implementations the ws:// url should not
-        * use the WicketFilter's filterPath because JSR356 Upgrade connections
-        * are never passed to the Servlet Filters.
-        */
-       private static boolean USING_JAVAX_WEB_SOCKET = false;
-
-       static
-       {
-               try
-               {
-                       
Class.forName("org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter");
-                       USING_JAVAX_WEB_SOCKET = true;
-                       LOG.debug("Using JSR356 Native WebSocket 
implementation!");
-               } catch (ClassNotFoundException e)
-               {
-                       LOG.debug("Using non-JSR356 Native WebSocket 
implementation!");
-               }
-       }
-
        private final AtomicReference<CharSequence> filterPrefix = new 
AtomicReference<>();
        private final AtomicReference<CharSequence> contextPath = new 
AtomicReference<>();
        private final AtomicReference<CharSequence> baseUrl = new 
AtomicReference<>();
@@ -380,14 +359,7 @@ public class WebSocketSettings
        {
                if (filterPrefix.get() == null)
                {
-                       if (USING_JAVAX_WEB_SOCKET)
-                       {
-                               filterPrefix.compareAndSet(null, "");
-                       }
-                       else
-                       {
-                               filterPrefix.compareAndSet(null, 
RequestCycle.get().getRequest().getFilterPath());
-                       }
+                       filterPrefix.compareAndSet(null, "");
                }
                return filterPrefix.get();
        }