Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Lachlan Roberts 2021-03-26 16:20:47 +11:00
parent e1f2f8c989 b68a5fec2f
commit 03f6a318c7
5 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jetty-util/src/main/java/org/eclipse/jetty/util/component/Container.java
View File

@ -152,6 +152,46 @@ public interface Container
return Collections.unmodifiableList(new ArrayList<>(getBeans(EventListener.class)));
}
/**
* A utility method to add a bean to a container.
* @param parent the parent container.
* @param child the child bean.
* @return true if the child was added as a bean, false if parent was not instance of {@link Container} or bean was already present.
*/
static boolean addBean(Object parent, Object child)
{
if (parent instanceof Container)
return ((Container)parent).addBean(child);
return false;
}
/**
* A utility method to add a bean to a container.
* @param parent the parent container.
* @param child the child bean.
* @param managed whether to managed the lifecycle of the bean.
* @return true if the child was added as a bean, false if parent was not instance of {@link Container} or bean was already present.
*/
static boolean addBean(Object parent, Object child, boolean managed)
{
if (parent instanceof Container)
return ((Container)parent).addBean(child, managed);
return false;
}
/**
* A utility method to remove a bean from a container.
* @param parent the parent container.
* @param child the child bean.
* @return true if parent was an instance of {@link Container} and the bean was removed.
*/
static boolean removeBean(Object parent, Object child)
{
if (parent instanceof Container)
return ((Container)parent).removeBean(child);
return false;
}
/**
* A listener for Container events.
* If an added bean implements this interface it will receive the events

14
jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java
View File

@ -474,9 +474,9 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
if (listener instanceof InheritedListener && b.isManaged() && b._bean instanceof Container)
{
if (b._bean instanceof ContainerLifeCycle)
((ContainerLifeCycle)b._bean).addBean(listener, false);
Container.addBean(b._bean, listener, false);
else
((Container)b._bean).addBean(listener);
Container.addBean(b._bean, listener);
}
}
}
@ -499,8 +499,8 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
{
cl.beanRemoved(this, b._bean);
if (listener instanceof InheritedListener && b.isManaged() && b._bean instanceof Container)
((Container)b._bean).removeBean(listener);
if (listener instanceof InheritedListener && b.isManaged())
Container.removeBean(b._bean, listener);
}
}
return true;
@ -541,9 +541,9 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
if (l instanceof InheritedListener)
{
if (bean._bean instanceof ContainerLifeCycle)
((ContainerLifeCycle)bean._bean).addBean(l, false);
Container.addBean(bean._bean, l, false);
else
((Container)bean._bean).addBean(l);
Container.addBean(bean._bean, l);
}
}
}
@ -579,7 +579,7 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container,
for (Container.Listener l : _listeners)
{
if (l instanceof InheritedListener)
((Container)bean._bean).removeBean(l);
Container.removeBean(bean._bean, l);
}
}
bean._managed = Managed.UNMANAGED;

11
jetty-websocket/websocket-jakarta-client/pom.xml
View File

@ -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>

2
jetty-websocket/websocket-jakarta-client/src/main/java/org/eclipse/jetty/websocket/jakarta/client/JakartaWebSocketClientContainerProvider.java
View File

@ -59,7 +59,7 @@ public class JakartaWebSocketClientContainerProvider extends ContainerProvider
* @param httpClient a pre-configured {@link HttpClient} to be used by the implementation.
* @see #getContainer()
*/
public WebSocketContainer getContainer(HttpClient httpClient)
public static WebSocketContainer getContainer(HttpClient httpClient)
{
JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer(httpClient);
// See: https://github.com/eclipse-ee4j/websocket-api/issues/212

14
jetty-websocket/websocket-jakarta-client/src/test/java/examples/SecureClientContainerExample.java
View File

@ -13,6 +13,7 @@
package examples;
import java.lang.management.ManagementFactory;
import java.net.URI;
import java.util.concurrent.TimeUnit;
@ -21,9 +22,11 @@ import jakarta.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.jakarta.client.internal.JakartaWebSocketClientContainer;
import org.eclipse.jetty.websocket.jakarta.client.JakartaWebSocketClientContainerProvider;
public class SecureClientContainerExample
{
@ -76,9 +79,12 @@ public class SecureClientContainerExample
clientConnector.setSslContextFactory(ssl);
HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP(clientConnector));
JakartaWebSocketClientContainer clientContainer = new JakartaWebSocketClientContainer(httpClient);
clientContainer.addManaged(httpClient); // allow clientContainer to own httpClient (for start/stop lifecycle)
clientContainer.start();
WebSocketContainer clientContainer = JakartaWebSocketClientContainerProvider.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;
}
}