Skip to content

Commit b0ba665

Browse files
senivamsenivam
committed
Helidon Container SE Bootstrap
Signed-off-by: Maxim Nesen <[email protected]>
1 parent 506bd91 commit b0ba665

File tree

6 files changed

+323
-12
lines changed

6 files changed

+323
-12
lines changed

‎containers/helidon/src/main/java/org/glassfish/jersey/helidon/HelidonHttpContainer.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,17 @@ public final class HelidonHttpContainer implements Container, WebServer {
3636

3737
private ApplicationHandler applicationHandler;
3838

39-
private HelidonJerseyBridge bridge;
40-
4139
HelidonHttpContainer(Application application, HelidonJerseyBridge bridge) {
4240
this.applicationHandler = new ApplicationHandler(application,
4341
new HelidonHttpContainerBinder(), bridge.getParentContext());
44-
this.bridge = bridge;
45-
webServer = bridge.getBuilder().build();
42+
this.webServer = bridge.getBuilder().build();
43+
bridge.setContainer(this);
44+
}
45+
46+
HelidonHttpContainer(Class<? extends Application> applicationClass, HelidonJerseyBridge bridge) {
47+
this.applicationHandler = new ApplicationHandler(applicationClass,
48+
new HelidonHttpContainerBinder());
49+
this.webServer = bridge.getBuilder().build();
4650
bridge.setContainer(this);
4751
}
4852

@@ -108,4 +112,8 @@ public void reloadTls(String socketName, Tls tls) {
108112
public WebServerConfig prototype() {
109113
return webServer.prototype();
110114
}
115+
116+
public io.helidon.webserver.WebServer unwrap() {
117+
return webServer;
118+
}
111119
}

‎containers/helidon/src/main/java/org/glassfish/jersey/helidon/HelidonHttpContainerBuilder.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public class HelidonHttpContainerBuilder {
4444

4545
private Application application;
4646

47+
private Class<? extends Application> applicationClass;
48+
4749
private String path;
4850

4951
private Tls tls;
@@ -88,6 +90,11 @@ public Application application() {
8890
return this.application;
8991
}
9092

93+
public HelidonHttpContainerBuilder applicationClass(Class<? extends Application> applicationClass) {
94+
this.applicationClass = applicationClass;
95+
return this;
96+
}
97+
9198
public HelidonHttpContainerBuilder path(String path) {
9299
this.path = path;
93100
return this;
@@ -136,13 +143,14 @@ public Object parentContext() {
136143

137144
public HelidonHttpContainer build() {
138145
configureBaseUri();
139-
webServerBuilder.config(Config.global())
146+
webServerBuilder.config(Config.create())
140147
.routing(configureRouting());
141148
this.tls = configureTls();
142149
if (this.tls != null) {
143150
webServerBuilder.tls(this.tls);
144151
}
145-
return new HelidonHttpContainer(application, bridge);
152+
return (application == null)
153+
? new HelidonHttpContainer(applicationClass, bridge) : new HelidonHttpContainer(application, bridge);
146154
}
147155

148156
private TlsConfig.Builder addSSLParameterss(TlsConfig.Builder builder) {

‎containers/helidon/src/main/java/org/glassfish/jersey/helidon/HelidonHttpContainerProvider.java‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,37 @@
1616

1717
package org.glassfish.jersey.helidon;
1818

19-
import io.helidon.webserver.WebServer;
2019
import jakarta.ws.rs.ProcessingException;
20+
import jakarta.ws.rs.SeBootstrap;
2121
import jakarta.ws.rs.core.Application;
22+
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
2223
import org.glassfish.jersey.server.spi.ContainerProvider;
24+
import org.glassfish.jersey.server.spi.WebServer;
25+
import org.glassfish.jersey.server.spi.WebServerProvider;
2326

24-
public class HelidonHttpContainerProvider implements ContainerProvider {
27+
public class HelidonHttpContainerProvider implements ContainerProvider,
28+
WebServerProvider {
2529
@Override
2630
public <T> T createContainer(Class<T> type, Application application) throws ProcessingException {
27-
if (type != WebServer.class && type != HelidonHttpContainer.class) {
31+
if (type != io.helidon.webserver.WebServer.class && type != HelidonHttpContainer.class) {
2832
return null;
2933
}
3034
return type.cast(new HelidonHttpContainer(application, new HelidonJerseyBridge()));
3135
}
36+
37+
@Override
38+
public <T extends WebServer> T createServer(Class<T> type, Application application,
39+
SeBootstrap.Configuration configuration) throws ProcessingException {
40+
return WebServerProvider.isSupportedWebServer(HelidonHttpServer.class, type, configuration)
41+
? type.cast(new HelidonHttpServer(application, JerseySeBootstrapConfiguration.from(configuration)))
42+
: null;
43+
}
44+
45+
@Override
46+
public <T extends WebServer> T createServer(Class<T> type, Class<? extends Application> applicationClass,
47+
SeBootstrap.Configuration configuration) throws ProcessingException {
48+
return WebServerProvider.isSupportedWebServer(HelidonHttpServer.class, type, configuration)
49+
? type.cast(new HelidonHttpServer(applicationClass, JerseySeBootstrapConfiguration.from(configuration)))
50+
: null;
51+
}
3252
}

‎containers/helidon/src/main/java/org/glassfish/jersey/helidon/HelidonHttpServer.java‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
/*
2+
* Copyright (c) 2025 Oracle and/or its affiliates. All rights reserved.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0, which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the
10+
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
11+
* version 2 with the GNU Classpath Exception, which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
*/
16+
17+
package org.glassfish.jersey.helidon;
18+
19+
import jakarta.ws.rs.core.Application;
20+
import org.glassfish.jersey.server.JerseySeBootstrapConfiguration;
21+
import org.glassfish.jersey.server.spi.Container;
22+
import org.glassfish.jersey.server.spi.WebServer;
23+
24+
import javax.net.ssl.SSLParameters;
25+
import java.util.concurrent.CompletableFuture;
26+
import java.util.concurrent.CompletionException;
27+
import java.util.concurrent.CompletionStage;
28+
29+
final class HelidonHttpServer implements WebServer {
30+
31+
private final HelidonHttpContainer helidonHttpContainer;
32+
33+
HelidonHttpServer(Application application, JerseySeBootstrapConfiguration seBootstrapConfig) {
34+
this(HelidonHttpContainerBuilder.builder().application(application), seBootstrapConfig);
35+
}
36+
37+
HelidonHttpServer(Class<? extends Application> applicationClass, JerseySeBootstrapConfiguration seBootstrapConfig) {
38+
this(HelidonHttpContainerBuilder.builder().applicationClass(applicationClass), seBootstrapConfig);
39+
}
40+
41+
HelidonHttpServer(final HelidonHttpContainerBuilder builder, JerseySeBootstrapConfiguration seBootstrapConfig) {
42+
builder.uri(seBootstrapConfig.uri(false));
43+
if (seBootstrapConfig.isHttps()) {
44+
builder.sslContext(seBootstrapConfig.sslContext());
45+
if (seBootstrapConfig.sslClientAuthentication() != null) {
46+
final SSLParameters params = new SSLParameters();
47+
switch (seBootstrapConfig.sslClientAuthentication()) {
48+
case OPTIONAL:
49+
params.setWantClientAuth(true);
50+
break;
51+
case MANDATORY:
52+
params.setNeedClientAuth(true);
53+
break;
54+
}
55+
builder.sslParameters(params);
56+
}
57+
}
58+
this.helidonHttpContainer = builder.build();
59+
}
60+
61+
@Override
62+
public Container container() {
63+
return helidonHttpContainer;
64+
}
65+
66+
@Override
67+
public int port() {
68+
return helidonHttpContainer.port();
69+
}
70+
71+
@Override
72+
public CompletionStage<?> start() {
73+
return CompletableFuture.runAsync(() -> {
74+
try {
75+
this.helidonHttpContainer.start();
76+
} catch (final Exception e) {
77+
throw new CompletionException(e);
78+
}
79+
});
80+
}
81+
82+
@Override
83+
public CompletionStage<?> stop() {
84+
return CompletableFuture.runAsync(() -> {
85+
try {
86+
this.helidonHttpContainer.stop();
87+
} catch (final Exception e) {
88+
throw new CompletionException(e);
89+
}
90+
});
91+
}
92+
93+
@Override
94+
public <T> T unwrap(Class<T> nativeClass) {
95+
return nativeClass.cast(helidonHttpContainer.unwrap());
96+
}
97+
}

‎containers/helidon/src/main/java/org/glassfish/jersey/helidon/HelidonJerseyRoutingService.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@
5252
import java.lang.reflect.Type;
5353
import java.net.URI;
5454
import java.security.Principal;
55-
import java.util.Collections;
5655
import java.util.List;
5756
import java.util.Map;
5857
import java.util.Optional;
59-
import java.util.Set;
60-
import java.util.WeakHashMap;
6158
import java.util.concurrent.CountDownLatch;
6259
import java.util.concurrent.TimeUnit;
6360
import java.util.function.Supplier;
@@ -118,6 +115,7 @@ public void beforeStart() {
118115
public void afterStop() {
119116
try {
120117
final InjectionManager ij = appHandler().getInjectionManager();
118+
ij.shutdown();
121119
appHandler().onShutdown(bridge.getContainer());
122120
} catch (Exception e) {
123121
if (LOGGER.isLoggable(System.Logger.Level.DEBUG)) {

0 commit comments

Comments
 (0)