From 47ec9b1a7e22f8929eddf53cb85e566d9663b242 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Fri, 26 Mar 2021 14:55:32 +1100
Subject: [PATCH] Modify SecureClientContainerExample to use the new
 getContainer(HttpClient) method.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-javax-client/pom.xml     | 11 +++++++++++
 .../examples/SecureClientContainerExample.java     | 14 ++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml
index d7380a38d3a..b85ecaf4d19 100644
--- a/jetty-websocket/websocket-javax-client/pom.xml
+++ b/jetty-websocket/websocket-javax-client/pom.xml
@@ -45,6 +45,17 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java b/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java
index 7e52cf34e32..cafd4309a3e 100644
--- a/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java
+++ b/jetty-websocket/websocket-javax-client/src/test/java/examples/SecureClientContainerExample.java
@@ -13,6 +13,7 @@
 
 package examples;
 
+import java.lang.management.ManagementFactory;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 import javax.websocket.ClientEndpointConfig;
@@ -21,9 +22,11 @@ import javax.websocket.WebSocketContainer;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.io.ClientConnector;
+import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.util.component.Container;
 import org.eclipse.jetty.util.component.LifeCycle;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
+import org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider;
 
 public class SecureClientContainerExample
 {
@@ -76,9 +79,12 @@ public class SecureClientContainerExample
         clientConnector.setSslContextFactory(ssl);
 
         HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP(clientConnector));
-        JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer(httpClient);
-        clientContainer.addManaged(httpClient); // allow clientContainer to own httpClient (for start/stop lifecycle)
-        clientContainer.start();
+        WebSocketContainer clientContainer = JavaxWebSocketClientContainerProvider.getContainer(httpClient);
+
+        // Components can be added as a bean to the WebSocketContainer with the Container static method.
+        MBeanContainer mbeanContainer = new MBeanContainer(ManagementFactory.getPlatformMBeanServer());
+        Container.addBean(clientContainer, mbeanContainer);
+
         return clientContainer;
     }
 }