Skip to content

Commit 3cbc735

Browse files
committed
Refactored configuration
1 parent 5e1909f commit 3cbc735

File tree

6 files changed

+21
-25
lines changed

6 files changed

+21
-25
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#/in/erail/server/HttpServerOptions
2+
$class=io.vertx.core.http.HttpServerOptions
3+
4+
port=8888
5+
host=localhost
6+
maxInitialLineLength=10240

config-layers/common/in/erail/server/Server.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#/in/erail/server/Server
22
$class=in.erail.server.Server
33

4-
port=8888
5-
host=localhost
4+
httpServerOptions=/in/erail/server/HttpServerOptions
65
vertx=/io/vertx/core/Vertx
76
log=true
87
routerBuilder=\

src/main/java/in/erail/server/Server.java

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,18 @@
1818
*/
1919
public class Server {
2020

21-
private int mPort;
22-
private String mHost;
2321
private Vertx mVertx;
2422
private String[] mRouterBuilder;
2523
private String[] mMountPath;
2624
private Router[] mRouter;
2725
private Logger mLog;
2826
private SockJSHandler mSockJSHandler;
27+
private HttpServerOptions mHttpServerOptions;
2928

3029
@StartService
3130
public void start() {
3231

33-
HttpServer server = getVertx().createHttpServer(new HttpServerOptions().setPort(getPort()).setHost(getHost()));
32+
HttpServer server = getVertx().createHttpServer(getHttpServerOptions());
3433

3534
Router router = Router.router(getVertx());
3635

@@ -52,7 +51,7 @@ public void start() {
5251
.rxListen()
5352
.blockingGet();
5453

55-
getLog().debug(() -> String.format("---------------Server[%s:%s] is ready-----------------", getHost(), getPort()));
54+
getLog().debug(() -> String.format("---------------Server[%s:%s] is ready-----------------", getHttpServerOptions().getHost(), getHttpServerOptions().getPort()));
5655
}
5756

5857
public Vertx getVertx() {
@@ -63,22 +62,6 @@ public void setVertx(Vertx pVertx) {
6362
this.mVertx = pVertx;
6463
}
6564

66-
public int getPort() {
67-
return mPort;
68-
}
69-
70-
public void setPort(int pPort) {
71-
this.mPort = pPort;
72-
}
73-
74-
public String getHost() {
75-
return mHost;
76-
}
77-
78-
public void setHost(String pHost) {
79-
this.mHost = pHost;
80-
}
81-
8265
public String[] getRouterBuilder() {
8366
return mRouterBuilder;
8467
}
@@ -115,4 +98,12 @@ public void setSockJSHandler(SockJSHandler pSockJSHandler) {
11598
this.mSockJSHandler = pSockJSHandler;
11699
}
117100

101+
public HttpServerOptions getHttpServerOptions() {
102+
return mHttpServerOptions;
103+
}
104+
105+
public void setHttpServerOptions(HttpServerOptions pHttpServerOptions) {
106+
this.mHttpServerOptions = pHttpServerOptions;
107+
}
108+
118109
}

src/test/java/in/erail/route/CORSRouteBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void testProcess(TestContext context) {
3333
server
3434
.getVertx()
3535
.createHttpClient()
36-
.options(server.getPort(), server.getHost(), "/v1/broadcast/testTopic")
36+
.options(server.getHttpServerOptions().getPort(), server.getHttpServerOptions().getHost(), "/v1/broadcast/testTopic")
3737
.putHeader("content-type", "application/json")
3838
.putHeader(HttpHeaders.ORIGIN, "https://test.com")
3939
.putHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, "POST")

src/test/java/in/erail/service/BinaryBodyServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void testProcess(TestContext context) {
3737
server
3838
.getVertx()
3939
.createHttpClient()
40-
.post(server.getPort(), server.getHost(), "/v1/broadcastv2/testTopic")
40+
.post(server.getHttpServerOptions().getPort(), server.getHttpServerOptions().getHost(), "/v1/broadcastv2/testTopic")
4141
.putHeader("content-type", "application/json")
4242
.putHeader(HttpHeaders.ORIGIN, "https://test.com")
4343
.putHeader("content-length", Integer.toString(json.length()))

src/test/java/in/erail/service/BroadcastServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void testProcess(TestContext context) {
4545
server
4646
.getVertx()
4747
.createHttpClient()
48-
.post(server.getPort(), server.getHost(), "/v1/broadcast/testTopic")
48+
.post(server.getHttpServerOptions().getPort(), server.getHttpServerOptions().getHost(), "/v1/broadcast/testTopic")
4949
.putHeader("content-type", MediaType.JSON_UTF_8.toString())
5050
.putHeader(HttpHeaders.ORIGIN, "https://test.com")
5151
.putHeader("content-length", Integer.toString(json.length()))

0 commit comments

Comments
 (0)