Skip to content

Commit 123b0a3

Browse files
committed
Merge branch 'develop'
2 parents 7c1a806 + cb29f32 commit 123b0a3

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<modelVersion>4.0.0</modelVersion>
1717
<artifactId>http-server</artifactId>
18-
<version>1.0.0</version>
18+
<version>1.0.3</version>
1919
<name>HttpServer</name>
2020
<packaging>jar</packaging>
2121

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class HttpServer {
5959
private final List<HandlerGroup> handlerGroups = new ArrayList<>();
6060
private List<HandlerInstance> handlerInstances = new ArrayList<>();
6161
ExecutorService executorService;
62+
Consumer<Javalin> beforeStartHandler;
6263
List<String> appVersionFqns;
6364
@Getter
6465
@Setter
@@ -72,8 +73,10 @@ private HttpServer() {
7273

7374
@Builder
7475
private HttpServer(final String configPrefix, final String applicationName, final ObjectMapper objectMapper,
75-
final JsonMapper jsonMapper, final ExecutorService executorService, final String... appVersionFqns) {
76+
final JsonMapper jsonMapper, final ExecutorService executorService,
77+
final Consumer<Javalin> beforeStartHandler, final String... appVersionFqns) {
7678
config = HttpServerConfiguration.read(configPrefix);
79+
this.beforeStartHandler = beforeStartHandler;
7780
this.applicationName = applicationName;
7881
this.executorService = executorService;
7982
this.appVersionFqns = new ArrayList<>(List.of(Optional.ofNullable(appVersionFqns).orElse(new String[0])));
@@ -106,10 +109,6 @@ public <P extends BasicJpa, J extends BasicJson, E> GenericHandlerGroupBuilder<P
106109
}
107110

108111
private void create() {
109-
create(null);
110-
}
111-
112-
private void create(Consumer<Javalin> beforeStartHandler) {
113112
Server server = new Server();
114113
ServerConnector connector = new ServerConnector(server);
115114
connector.setHost(config.host());

0 commit comments

Comments
 (0)