Skip to content

Commit 0793250

Browse files
committed
Small webserver code-style improvements
1 parent a23178f commit 0793250

File tree

3 files changed

+14
-10
lines changed
  • BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin
  • BlueMapCore/src/main/java/de/bluecolored/bluemap/core/webserver
  • implementations/cli/src/main/java/de/bluecolored/bluemap/cli

3 files changed

+14
-10
lines changed

BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ public void load() throws IOException, ParseResourceException {
120120
}
121121

122122
webServer = new WebServer(
123+
webServerConfig.getWebserverBindAddress(),
123124
webServerConfig.getWebserverPort(),
124125
webServerConfig.getWebserverMaxConnections(),
125-
webServerConfig.getWebserverBindAddress(),
126126
requestHandler,
127127
false
128128
);

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/webserver/WebServer.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
package de.bluecolored.bluemap.core.webserver;
2626

27+
import de.bluecolored.bluemap.core.logger.Logger;
28+
2729
import java.io.IOException;
2830
import java.net.InetAddress;
2931
import java.net.ServerSocket;
@@ -34,26 +36,28 @@
3436
import java.util.concurrent.ThreadPoolExecutor;
3537
import java.util.concurrent.TimeUnit;
3638

37-
import de.bluecolored.bluemap.core.logger.Logger;
38-
3939
public class WebServer extends Thread {
4040

4141
private final int port;
4242
private final int maxConnections;
43-
private final InetAddress bindAdress;
43+
private final InetAddress bindAddress;
4444
private final boolean verbose;
4545

46-
private HttpRequestHandler handler;
46+
private final HttpRequestHandler handler;
4747

4848
private ThreadPoolExecutor connectionThreads;
4949

5050
private ServerSocket server;
5151

52-
public WebServer(int port, int maxConnections, InetAddress bindAdress, HttpRequestHandler handler, boolean verbose) {
52+
public WebServer(InetAddress bindAddress, int port, int maxConnections, HttpRequestHandler handler) {
53+
this(bindAddress, port, maxConnections, handler, false);
54+
}
55+
56+
public WebServer(InetAddress bindAddress, int port, int maxConnections, HttpRequestHandler handler, boolean verbose) {
5357
this.port = port;
5458
this.maxConnections = maxConnections;
55-
this.bindAdress = bindAdress;
56-
this.verbose = verbose;
59+
this.bindAddress = bindAddress;
60+
this.verbose = verbose;
5761

5862
this.handler = handler;
5963

@@ -68,7 +72,7 @@ public synchronized void start() {
6872
connectionThreads.allowCoreThreadTimeOut(true);
6973

7074
try {
71-
server = new ServerSocket(port, maxConnections, bindAdress);
75+
server = new ServerSocket(port, maxConnections, bindAddress);
7276
server.setSoTimeout(0);
7377
} catch (IOException e){
7478
Logger.global.logError("Error while starting the WebServer!", e);

implementations/cli/src/main/java/de/bluecolored/bluemap/cli/BlueMapCLI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ public void startWebserver(BlueMapService blueMap, boolean verbose) throws IOExc
224224
HttpRequestHandler requestHandler = new FileRequestHandler(config.getWebRoot().toPath(), "BlueMap v" + BlueMap.VERSION);
225225

226226
WebServer webServer = new WebServer(
227+
config.getWebserverBindAddress(),
227228
config.getWebserverPort(),
228229
config.getWebserverMaxConnections(),
229-
config.getWebserverBindAddress(),
230230
requestHandler,
231231
verbose
232232
);

0 commit comments

Comments
 (0)