Skip to content

Commit 3b304f4

Browse files
committed
Merge branch 'develop'
2 parents 123b0a3 + 7039205 commit 3b304f4

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/main/java/info/unterrainer/commons/httpserver/HttpServer.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
import java.util.concurrent.TimeUnit;
1313
import java.util.function.Consumer;
1414

15-
import org.eclipse.jetty.server.Server;
16-
import org.eclipse.jetty.server.ServerConnector;
17-
1815
import info.unterrainer.commons.httpserver.accessmanager.HttpAccessManager;
1916
import info.unterrainer.commons.httpserver.accessmanager.UserAccessInterceptor;
2017
import info.unterrainer.commons.httpserver.daos.CoreDaoProvider;
@@ -109,21 +106,15 @@ public <P extends BasicJpa, J extends BasicJson, E> GenericHandlerGroupBuilder<P
109106
}
110107

111108
private void create() {
112-
Server server = new Server();
113-
ServerConnector connector = new ServerConnector(server);
114-
connector.setHost(config.host());
115-
connector.setPort(config.port());
116-
server.setConnectors(new ServerConnector[] { connector });
117-
118109
javalin = Javalin.create(c -> {
119-
c.server(() -> server)
120-
.accessManager(new HttpAccessManager(config.keycloakHost(), config.keycloakRealm()))
121-
.enableCorsForAllOrigins();
110+
c.accessManager(new HttpAccessManager(config.keycloakHost(), config.keycloakRealm()));
111+
c.enableCorsForAllOrigins();
122112
});
113+
123114
if (beforeStartHandler != null) {
124115
beforeStartHandler.accept(javalin);
125116
}
126-
javalin.start(config.port());
117+
javalin.start(config.host(), config.port());
127118

128119
javalin.before(ctx -> ctx.attribute(Attribute.JAVALIN_SERVER, this));
129120
javalin.before(ctx -> ctx.attribute(Attribute.RESPONSE_TYPE, ResponseType.JSON));

0 commit comments

Comments
 (0)