(nifi) branch main updated: NIFI-15201 Replaced deprecated Jetty WebSocket usage with API suggested alternatives (#10512)

[exceptionfactory]

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

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new b22f68e5e1 NIFI-15201 Replaced deprecated Jetty WebSocket usage with 
API suggested alternatives (#10512)
b22f68e5e1 is described below

commit b22f68e5e178a2ba3481a2b2b876b298ca3f8341
Author: dan-s1 <dsti...@gmail.com>
AuthorDate: Mon Nov 10 12:12:00 2025 -0500

    NIFI-15201 Replaced deprecated Jetty WebSocket usage with API suggested 
alternatives (#10512)
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java    | 4 ++--
 .../org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java
 
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java
index 4171d0bf23..0fa661949a 100644
--- 
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java
+++ 
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java
@@ -377,7 +377,7 @@ public class JettyWebSocketClient extends 
AbstractJettyWebSocketService implemen
             listener.setSessionId(sessionId);
             
listener.setSecure("wss".equalsIgnoreCase(webSocketUri.getScheme()));
 
-            final ClientUpgradeRequest request = new ClientUpgradeRequest();
+            final ClientUpgradeRequest request = new 
ClientUpgradeRequest(webSocketUri);
 
             if (!flowFileAttributes.isEmpty()) {
                 
request.setHeaders(HeaderMapExtractor.getHeaderMap(flowFileAttributes));
@@ -432,7 +432,7 @@ public class JettyWebSocketClient extends 
AbstractJettyWebSocketService implemen
     }
 
     Future<Session> createWebsocketSession(RoutingWebSocketListener listener, 
ClientUpgradeRequest request) throws IOException {
-        return client.connect(listener, webSocketUri, request);
+        return client.connect(listener, request);
     }
 
     void maintainSessions() throws Exception {
diff --git 
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
 
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
index 4d4ae4c331..b410ab2cb7 100644
--- 
a/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
+++ 
b/nifi-extension-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/RoutingWebSocketListener.java
@@ -47,8 +47,8 @@ public class RoutingWebSocketListener extends 
AbstractAutoDemanding {
     }
 
     @Override
-    public void onWebSocketClose(final int statusCode, final String reason) {
-        super.onWebSocketClose(statusCode, reason);
+    public void onWebSocketClose(final int statusCode, final String reason, 
Callback callback) {
+        super.onWebSocketClose(statusCode, reason, callback);
         router.onWebSocketClose(sessionId, statusCode, reason);
     }