Skip to content

Commit 8224f9c

Browse files
committed
remove: install(Server)
- fix #3725 - fix #3721
1 parent 03defaf commit 8224f9c

File tree

5 files changed

+49
-17
lines changed

5 files changed

+49
-17
lines changed

jooby/src/main/java/io/jooby/Jooby.java

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -659,17 +659,6 @@ public Jooby encoder(@NonNull MediaType contentType, @NonNull MessageEncoder enc
659659
return this;
660660
}
661661

662-
/**
663-
* Set server to use.
664-
*
665-
* @param server Web Server.
666-
* @return This application.
667-
*/
668-
@NonNull public Jooby install(@NonNull Server server) {
669-
this.server = server;
670-
return this;
671-
}
672-
673662
@NonNull @Override
674663
public Jooby dispatch(@NonNull Runnable body) {
675664
router.dispatch(body);
@@ -1230,6 +1219,18 @@ public static void runApp(@NonNull String[] args, @NonNull Supplier<Jooby> provi
12301219
runApp(args, ExecutionMode.DEFAULT, provider);
12311220
}
12321221

1222+
/**
1223+
* Setup default environment, logging (logback or log4j2) and run application.
1224+
*
1225+
* @param args Application arguments.
1226+
* @param provider Application provider.
1227+
*/
1228+
public static void runApp(
1229+
@NonNull String[] args, @NonNull Server server, @NonNull Supplier<Jooby> provider) {
1230+
configurePackage(provider.getClass().getPackage());
1231+
runApp(args, server, List.of(provider));
1232+
}
1233+
12331234
/**
12341235
* Setup default environment, logging (logback or log4j2) and run application.
12351236
*
@@ -1295,7 +1296,23 @@ public static void runApp(
12951296
@NonNull String[] args,
12961297
@NonNull ExecutionMode executionMode,
12971298
@NonNull Supplier<Jooby> provider) {
1298-
runApp(args, Server.loadServer(), executionMode, List.of(provider));
1299+
runApp(args, Server.loadServer(), executionMode, provider);
1300+
}
1301+
1302+
/**
1303+
* Setup default environment, logging (logback or log4j2) and run application.
1304+
*
1305+
* @param args Application arguments.
1306+
* @param executionMode Application execution mode.
1307+
* @param provider Application provider.
1308+
*/
1309+
public static void runApp(
1310+
@NonNull String[] args,
1311+
@NonNull Server server,
1312+
@NonNull ExecutionMode executionMode,
1313+
@NonNull Supplier<Jooby> provider) {
1314+
configurePackage(provider.getClass().getPackage());
1315+
runApp(args, server, executionMode, List.of(provider));
12991316
}
13001317

13011318
/**

modules/jooby-cli/src/main/resources/cli/App.java.hbs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import io.jooby.OpenAPIModule;
99
public class App extends Jooby {
1010

1111
{
12-
install(new {{serverClassName}}());
1312
{{#if openapi}}
1413
install(new OpenAPIModule());
1514
{{/if}}
@@ -21,7 +20,6 @@ public class App extends Jooby {
2120
}
2221

2322
public static void main(final String[] args) {
24-
runApp(args, App::new);
23+
runApp(args, new {{serverClassName}}(), App::new);
2524
}
26-
2725
}

modules/jooby-cli/src/main/resources/cli/App.kt.hbs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import io.jooby.OpenAPIModule
88
{{/if}}
99

1010
class App: Kooby({
11-
install({{serverClassName}}())
1211
{{#if openapi}}
1312
install(OpenAPIModule())
1413
{{/if}}
@@ -22,5 +21,5 @@ class App: Kooby({
2221
})
2322

2423
fun main(args: Array<String>) {
25-
runApp(args, ::App)
24+
runApp(args, {{serverClassName}}(), ::App)
2625
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
6+
package examples;
7+
8+
import io.jooby.Jooby;
9+
import io.jooby.jetty.JettyServer;
10+
11+
public class AppNoInstallServer extends Jooby {
12+
13+
public static void main(String[] args) {
14+
runApp(args, new JettyServer(), AppNoInstallServer::new);
15+
}
16+
}

tests/src/test/kotlin/KtMultiApp.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import io.jooby.kt.runApp
1010
import io.jooby.netty.NettyServer
1111

1212
fun main(args: Array<String>) {
13+
runApp(args, NettyServer(), ::FooApp)
14+
1315
runApp(args, NettyServer(), ExecutionMode.DEFAULT, ::BarApp, ::FooApp)
1416

1517
runApp(args, NettyServer(), ::BarApp, ::FooApp)

0 commit comments

Comments
 (0)