Skip to content

Documentation update and small refactor #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjmrocha merged 2 commits into from
May 23, 2025
Merged

Documentation update and small refactor #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5314554
Documentation update and small refactor
jjmrocha May 23, 2025
01d1938
Update tests
jjmrocha May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/net/uiqui/embedhttp/HttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public interface HttpServer {

/**
* Retrieves the port on which the server is running.
* If the server is not running, this method will return -1.
*
* @return The port number.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/uiqui/embedhttp/server/ServerInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ protected String serverLogMessage(String message, Object... args) {
? String.format(message, args)
: message;

return String.format("Server(%d): %s", port, finalMessage);
return String.format("Instance(%d): %s", port, finalMessage);
}
}
9 changes: 4 additions & 5 deletions src/main/java/net/uiqui/embedhttp/server/io/IOServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public IOServer(int port, int backlog) {

@Override
public void listenAndServe(Router router) {
try (var serverSocket = new ServerSocket(port, backlog)) {
try (var serverSocket = new ServerSocket(port, backlog);
var executorService = Executors.newVirtualThreadPerTaskExecutor()) {
instancePort.set(serverSocket.getLocalPort());
serverSocket.setSoTimeout(SO_TIMEOUT);

Expand All @@ -37,10 +38,8 @@ public void listenAndServe(Router router) {
stateMachine.setState(ServerState.RUNNING);
logger.log(INFO, () -> serverLogMessage("Started on port %d", serverSocket.getLocalPort()));

try (var executorService = Executors.newVirtualThreadPerTaskExecutor()) {
while (stateMachine.getCurrentState() == ServerState.RUNNING) {
acceptAndProcess(serverSocket, executorService, requestProcessor);
}
while (stateMachine.getCurrentState() == ServerState.RUNNING) {
acceptAndProcess(serverSocket, executorService, requestProcessor);
}
} catch (Exception e) {
logger.log(ERROR, () -> serverLogMessage("Error starting server"), e);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/net/uiqui/embedhttp/server/ServerInstanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void testServerMessageWithoutParameters() {
// when
var result = classUnderTest.serverLogMessage(message);
// then
assertThat(result).isEqualTo("Server(0): test");
assertThat(result).isEqualTo("Instance(0): test");
}

@Test
Expand All @@ -27,6 +27,6 @@ void testServerMessageWithParameters() {
// when
var result = classUnderTest.serverLogMessage(message, params1, params2);
// then
assertThat(result).isEqualTo("Server(0): test param1 10");
assertThat(result).isEqualTo("Instance(0): test param1 10");
}
}