getVirtualHosts()
{
- if (_vhosts == null)
- return null;
return _vhosts.stream().map(VHost::getName).collect(Collectors.toList());
}
@@ -1044,7 +1042,7 @@ public String toString()
b.append(",b=").append(getBaseResource());
b.append(",a=").append(_availability);
- if (vhosts != null && !vhosts.isEmpty())
+ if (!vhosts.isEmpty())
{
b.append(",vh=[");
b.append(String.join(",", vhosts));
diff --git a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/CachingSessionDataStore.java b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/CachingSessionDataStore.java
index 7941f25efb17..5e9c6e98965b 100644
--- a/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/CachingSessionDataStore.java
+++ b/jetty-core/jetty-session/src/main/java/org/eclipse/jetty/session/CachingSessionDataStore.java
@@ -52,14 +52,14 @@ public class CachingSessionDataStore extends ContainerLifeCycle implements Sessi
/**
* @param cache the front cache to use
- * @param store the actual store for the the session data
+ * @param store the actual store for the session data
*/
public CachingSessionDataStore(SessionDataMap cache, SessionDataStore store)
{
_cache = cache;
- addBean(_cache, true);
+ installBean(_cache, true);
_store = store;
- addBean(_store, true);
+ installBean(_store, true);
}
/**
diff --git a/jetty-core/jetty-unixdomain-server/src/main/java/org/eclipse/jetty/unixdomain/server/UnixDomainServerConnector.java b/jetty-core/jetty-unixdomain-server/src/main/java/org/eclipse/jetty/unixdomain/server/UnixDomainServerConnector.java
index 0629b66e4fba..5681314f03c3 100644
--- a/jetty-core/jetty-unixdomain-server/src/main/java/org/eclipse/jetty/unixdomain/server/UnixDomainServerConnector.java
+++ b/jetty-core/jetty-unixdomain-server/src/main/java/org/eclipse/jetty/unixdomain/server/UnixDomainServerConnector.java
@@ -82,7 +82,7 @@ public UnixDomainServerConnector(Server server, Executor executor, Scheduler sch
{
super(server, executor, scheduler, bufferPool, acceptors, factories.length > 0 ? factories : new ConnectionFactory[]{new HttpConnectionFactory()});
selectorManager = newSelectorManager(getExecutor(), getScheduler(), selectors);
- addBean(selectorManager, true);
+ installBean(selectorManager, true);
}
protected SelectorManager newSelectorManager(Executor executor, Scheduler scheduler, int selectors)
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
index 4409d113e120..66134183b066 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
@@ -371,7 +371,7 @@ public Scanner(Scheduler scheduler, boolean reportRealPaths)
{
//Create the scheduler and start it
_scheduler = scheduler == null ? new ScheduledExecutorScheduler("Scanner-" + SCANNER_IDS.getAndIncrement(), true, 1) : scheduler;
- addBean(_scheduler);
+ installBean(_scheduler);
_linkOptions = reportRealPaths ? new LinkOption[0] : new LinkOption[] {LinkOption.NOFOLLOW_LINKS};
}
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
index 2b8f639b271a..0e4a0ae37bcd 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
@@ -300,6 +300,7 @@ public boolean isUnmanaged(Object bean)
* The {@link #addBean(Object, boolean)}
* method should be used if this is not correct, or the {@link #manage(Object)} and {@link #unmanage(Object)}
* methods may be used after an add to change the status.
+ * This method should not be called from a constructor, instead use {@link #installBean(Object)}
*
* @param o the bean object to add
* @return true if the bean was added, false if it was already present
@@ -309,12 +310,12 @@ public boolean addBean(Object o)
{
if (o instanceof LifeCycle l)
return addBean(o, l.isRunning() ? Managed.UNMANAGED : Managed.AUTO);
-
return addBean(o, Managed.POJO);
}
/**
- * Adds the given bean, explicitly managing it or not.
+ * Adds the given bean, explicitly managing it or not.
+ * This method should not be called from a constructor, instead use {@link #installBean(Object)}
*
* @param o The bean object to add
* @param managed whether to manage the lifecycle of the bean
@@ -413,6 +414,56 @@ else if (isStarted())
return true;
}
+ /**
+ * Add a bean in a way that is safe to call from a super constructor of this {@code ContainerLifeCycle}:
+ * there are no {@link Container.Listener}s registered;
+ * the object itself is not a {@link Container.Listener};
+ * this {@link LifeCycle} is not started or starting;
+ * and the is no debugging call to {@code this.toString()}.
+ * @param o The bean to add
+ * @return true if the bean was added
+ */
+ protected final boolean installBean(Object o)
+ {
+ return installBean(o, o instanceof LifeCycle l ? (l.isRunning() ? Managed.UNMANAGED : Managed.AUTO) : Managed.POJO);
+ }
+
+ /**
+ * Add a bean in a way that is safe to call from a super constructor of this {@code ContainerLifeCycle}:
+ * there are no {@link Container.Listener}s registered;
+ * the object itself is not a {@link Container.Listener};
+ * this {@link LifeCycle} is not started or starting;
+ * and the is no debugging call to {@code this.toString()}.
+ * @param o The bean to add
+ * @param managed true if the bean is to be managed.
+ * @return true if the bean was added
+ */
+ protected final boolean installBean(Object o, boolean managed)
+ {
+ return installBean(o, o instanceof LifeCycle
+ ? (managed ? Managed.MANAGED : Managed.UNMANAGED)
+ : (managed ? Managed.POJO : Managed.UNMANAGED));
+ }
+
+ private boolean installBean(Object o, Managed managed)
+ {
+ if (o == null || contains(o))
+ return false;
+ if (o instanceof Container.Listener || !_listeners.isEmpty())
+ throw new IllegalArgumentException("Cannot call Container.Listeners from constructor");
+
+ if (o instanceof EventListener eventListener)
+ addEventListener(eventListener);
+
+ Bean newBean = new Bean(o);
+ newBean._managed = managed;
+ _beans.add(newBean);
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("{}@{} added {}", getClass().getSimpleName(), hashCode(), newBean);
+ return true;
+ }
+
/**
* Adds a managed lifecycle.
* This is a convenience method that uses addBean(lifecycle,true)
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java
index 1be738b27889..6f823479d873 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/KeyStoreScanner.java
@@ -68,7 +68,7 @@ public KeyStoreScanner(SslContextFactory sslContextFactory)
_scanner.setReportExistingFilesOnStartup(false);
_scanner.setScanDepth(1);
_scanner.addListener(this);
- addBean(_scanner);
+ installBean(_scanner);
}
private Path getRealKeyStorePath()
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/MonitoredQueuedThreadPool.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/MonitoredQueuedThreadPool.java
index fdc39f85b1b2..275608eb6339 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/MonitoredQueuedThreadPool.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/MonitoredQueuedThreadPool.java
@@ -47,10 +47,10 @@ public MonitoredQueuedThreadPool(int maxThreads)
public MonitoredQueuedThreadPool(int maxThreads, int minThreads, int idleTimeOut, BlockingQueue queue)
{
super(maxThreads, minThreads, idleTimeOut, queue);
- addBean(queueStats);
- addBean(queueLatencyStats);
- addBean(taskLatencyStats);
- addBean(threadStats);
+ installBean(queueStats);
+ installBean(queueLatencyStats);
+ installBean(taskLatencyStats);
+ installBean(threadStats);
}
@Override
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/AdaptiveExecutionStrategy.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/AdaptiveExecutionStrategy.java
index 5328694a63c2..5e0850e649fb 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/AdaptiveExecutionStrategy.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/AdaptiveExecutionStrategy.java
@@ -145,9 +145,9 @@ public AdaptiveExecutionStrategy(Producer producer, Executor executor)
_executor = executor;
_tryExecutor = TryExecutor.asTryExecutor(executor);
_virtualExecutor = VirtualThreads.getVirtualThreadsExecutor(_executor);
- addBean(_producer);
- addBean(_tryExecutor);
- addBean(_virtualExecutor);
+ installBean(_producer);
+ installBean(_tryExecutor);
+ installBean(_virtualExecutor);
if (LOG.isDebugEnabled())
LOG.debug("{} created", this);
}
diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java
index 24be85559d86..dd3854360fd5 100644
--- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java
+++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java
@@ -19,6 +19,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class LifeCycleListenerTest
@@ -222,4 +223,58 @@ public void lifeCycleStopping(LifeCycle event)
}
}
}
+
+ @Test
+ public void testInstallBeanNotAListener()
+ {
+ Container.Listener listener = new TestContainerListener();
+
+ assertThrows(IllegalArgumentException.class, () -> new ContainerLifeCycle()
+ {
+ {
+ installBean(listener);
+ }
+ });
+ }
+
+ @Test
+ public void testInstallBeanNoListeners()
+ {
+ Container.Listener listener = new TestContainerListener();
+
+ assertThrows(IllegalArgumentException.class, () -> new ContainerLifeCycle()
+ {
+ {
+ addEventListener(listener);
+ installBean("test");
+ }
+ });
+ }
+
+ @Test
+ public void testInstallBean()
+ {
+ assertEquals("test",
+ new ContainerLifeCycle()
+ {
+ {
+ installBean("test");
+ }
+ }.getBean(String.class));
+ }
+
+ private static class TestContainerListener implements Container.Listener
+ {
+ @Override
+ public void beanAdded(Container parent, Object child)
+ {
+
+ }
+
+ @Override
+ public void beanRemoved(Container parent, Object child)
+ {
+
+ }
+ }
}
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
index 29f212390ffe..967c20f4df91 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
@@ -53,7 +53,7 @@ public WebSocketCoreClient(WebSocketComponents webSocketComponents)
public WebSocketCoreClient(HttpClient httpClient, WebSocketComponents webSocketComponents)
{
client = Objects.requireNonNullElse(httpClient, HttpClientProvider.get());
- addBean(client);
+ installBean(client);
if (webSocketComponents == null)
{
if (client.isStarted())
@@ -62,7 +62,7 @@ public WebSocketCoreClient(HttpClient httpClient, WebSocketComponents webSocketC
webSocketComponents = new WebSocketComponents();
}
components = webSocketComponents;
- addBean(components);
+ installBean(components);
if (!client.isStarted())
{
if (client.getByteBufferPool() == null)
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
index 9ff744b0530a..9c6965ecfa9c 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
@@ -69,12 +69,12 @@ public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, Decorat
_executor = executor;
}
- addBean(_inflaterPool);
- addBean(_deflaterPool);
- addBean(_bufferPool);
- addBean(_extensionRegistry);
- addBean(_objectFactory);
- addBean(_executor);
+ installBean(_inflaterPool);
+ installBean(_deflaterPool);
+ installBean(_bufferPool);
+ installBean(_extensionRegistry);
+ installBean(_objectFactory);
+ installBean(_executor);
}
public ByteBufferPool getByteBufferPool()
diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
index 0c6266b03a42..4eef2672fe48 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
@@ -49,7 +49,7 @@ public WebSocketUpgradeHandler(WebSocketComponents components, Consumer connect(Object websocket, URI toUri) throws IOException
diff --git a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java
index 1b0ea60bf543..12b23489b02f 100644
--- a/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java
+++ b/jetty-core/jetty-websocket/jetty-websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/ServerWebSocketContainer.java
@@ -131,7 +131,7 @@ public static ServerWebSocketContainer get(Context context)
this.mappings = mappings;
this.factory = new ServerFrameHandlerFactory(this, mappings.getWebSocketComponents());
addSessionListener(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
@Override
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
index f2d54f384104..27bb02f2b1ee 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextHandler.java
@@ -284,7 +284,7 @@ public ServletContextHandler(String contextPath, SessionHandler sessionHandler,
setErrorHandler(errorHandler);
_objFactory = new DecoratedObjectFactory();
- addBean(_objFactory, true);
+ installBean(_objFactory, true);
// Link the handlers
relinkHandlers();
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletTester.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletTester.java
index 205e918d66ed..45e832edb970 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletTester.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletTester.java
@@ -220,7 +220,7 @@ public ServletTester(String contextPath, int options)
_context = new ServletContextHandler(contextPath, options);
_server.setHandler(_context);
_server.setConnectors(new Connector[]{_connector});
- addBean(_server);
+ installBean(_server);
}
public ServletContextHandler getContext()
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketContainer.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketContainer.java
index ce2d71a1bd8d..c915d64cf816 100644
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketContainer.java
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee10/websocket/jakarta/common/JakartaWebSocketContainer.java
@@ -46,7 +46,7 @@ public JakartaWebSocketContainer(WebSocketComponents components)
{
this.components = components;
addSessionListener(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
public abstract Executor getExecutor();
diff --git a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java
index 601ee44a1014..d9e329f0cdbb 100644
--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee10/websocket/server/JettyWebSocketServerContainer.java
@@ -134,10 +134,10 @@ public String toString()
this.components = components;
this.executor = executor;
this.frameHandlerFactory = new JettyServerFrameHandlerFactory(this, components);
- addBean(frameHandlerFactory);
+ installBean(frameHandlerFactory);
addSessionListener(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
public void addMapping(String pathSpec, JettyWebSocketCreator creator)
diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
index c6eee3a973c5..b6627296f501 100644
--- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
+++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java
@@ -267,7 +267,7 @@ protected ContextHandler(APIContext context,
String contextPath)
{
_coreContextHandler = new CoreContextHandler();
- addBean(_coreContextHandler, false);
+ installBean(_coreContextHandler, false);
_apiContext = context == null ? new APIContext() : context;
_initParams = new HashMap<>();
if (contextPath != null)
@@ -2539,7 +2539,7 @@ public class CoreContextHandler extends org.eclipse.jetty.server.handler.Context
CoreContextHandler()
{
super.setHandler(new CoreToNestedHandler());
- addBean(ContextHandler.this, true);
+ installBean(ContextHandler.this, true);
}
@Override
diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/SessionHandler.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/SessionHandler.java
index 1edaa2b7fe1f..2bfb27344213 100644
--- a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/SessionHandler.java
+++ b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/SessionHandler.java
@@ -69,11 +69,11 @@ public class SessionHandler extends ScopedHandler implements SessionConfig.Mutab
public SessionHandler()
{
setSessionTrackingModes(DEFAULT_SESSION_TRACKING_MODES);
- addBean(_sessionManager);
- addBean(_cookieConfig);
- addBean(_sessionListeners);
- addBean(_sessionIdListeners);
- addBean(_sessionAttributeListeners);
+ installBean(_sessionManager);
+ installBean(_cookieConfig);
+ installBean(_sessionListeners);
+ installBean(_sessionIdListeners);
+ installBean(_sessionAttributeListeners);
}
public SessionManager getSessionManager()
diff --git a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java
index 9f4eb0705f28..9ca5afcf7986 100644
--- a/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java
+++ b/jetty-ee9/jetty-ee9-osgi/jetty-ee9-osgi-boot/src/main/java/org/eclipse/jetty/ee9/osgi/boot/EE9Activator.java
@@ -16,7 +16,6 @@
import java.io.File;
import java.net.URI;
import java.net.URL;
-import java.net.URLClassLoader;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
diff --git a/jetty-ee9/jetty-ee9-security/src/main/java/org/eclipse/jetty/ee9/security/SecurityHandler.java b/jetty-ee9/jetty-ee9-security/src/main/java/org/eclipse/jetty/ee9/security/SecurityHandler.java
index ff92704b8345..a3092792b3fd 100644
--- a/jetty-ee9/jetty-ee9-security/src/main/java/org/eclipse/jetty/ee9/security/SecurityHandler.java
+++ b/jetty-ee9/jetty-ee9-security/src/main/java/org/eclipse/jetty/ee9/security/SecurityHandler.java
@@ -84,7 +84,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
protected SecurityHandler()
{
- addBean(new DumpableCollection("knownAuthenticatorFactories", __knownAuthenticatorFactories));
+ installBean(new DumpableCollection("knownAuthenticatorFactories", __knownAuthenticatorFactories));
}
/**
diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java
index d819163e7c27..a411a03cb313 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java
+++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletContextHandler.java
@@ -173,7 +173,7 @@ public ServletContextHandler(Container parent, String contextPath, SessionHandle
_servletHandler = servletHandler;
_objFactory = new DecoratedObjectFactory();
- addBean(_objFactory, true);
+ installBean(_objFactory, true);
// Link the handlers
relinkHandlers();
diff --git a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletTester.java b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletTester.java
index 90662c0e17c4..7541d0f0f11d 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletTester.java
+++ b/jetty-ee9/jetty-ee9-servlet/src/main/java/org/eclipse/jetty/ee9/servlet/ServletTester.java
@@ -229,7 +229,7 @@ public ServletTester(String contextPath, int options)
{
_context = new ServletContextHandler(_server, contextPath, options);
_server.setConnectors(new Connector[]{_connector});
- addBean(_server);
+ installBean(_server);
}
public ServletContextHandler getContext()
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketContainer.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketContainer.java
index 10cb7e004d40..0f94e7ee736a 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketContainer.java
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-common/src/main/java/org/eclipse/jetty/ee9/websocket/jakarta/common/JakartaWebSocketContainer.java
@@ -46,7 +46,7 @@ public JakartaWebSocketContainer(WebSocketComponents components)
{
this.components = components;
addSessionListener(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
public abstract Executor getExecutor();
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee9/websocket/client/WebSocketClient.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee9/websocket/client/WebSocketClient.java
index fcd6b49ad7fd..c5fc52e9797e 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee9/websocket/client/WebSocketClient.java
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-client/src/main/java/org/eclipse/jetty/ee9/websocket/client/WebSocketClient.java
@@ -85,7 +85,7 @@ public WebSocketClient(HttpClient httpClient)
addManaged(coreClient);
frameHandlerFactory = new JettyWebSocketFrameHandlerFactory(this, components);
sessionListeners.add(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
public CompletableFuture connect(Object websocket, URI toUri) throws IOException
diff --git a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java
index baae7a52143e..f57c41314736 100644
--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jetty-server/src/main/java/org/eclipse/jetty/ee9/websocket/server/JettyWebSocketServerContainer.java
@@ -137,10 +137,10 @@ public String toString()
this.components = components;
this.executor = executor;
this.frameHandlerFactory = new JettyServerFrameHandlerFactory(this, components);
- addBean(frameHandlerFactory);
+ installBean(frameHandlerFactory);
addSessionListener(sessionTracker);
- addBean(sessionTracker);
+ installBean(sessionTracker);
}
public void addMapping(String pathSpec, JettyWebSocketCreator creator)