Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions jooby/src/main/java/io/jooby/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,17 @@ abstract class Base implements Server {

private final AtomicBoolean stopping = new AtomicBoolean();

/**
* Clears custom connection lost listeners. Intended for internal testing use to prevent static
* state leakage between tests. Internal usage only.
*/
static void clearState() {
connectionLostListeners.clear();
connectionLostListeners.add(Base.CONNECTION_LOST);
addressInUseListeners.clear();
addressInUseListeners.add(Base.ADDRESS_IN_USE);
}

protected void fireStart(List<Jooby> applications, Executor defaultWorker) {
for (Jooby app : applications) {
app.setDefaultWorker(defaultWorker).start(this);
Expand Down
2 changes: 1 addition & 1 deletion jooby/src/test/java/io/jooby/DefaultContextTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ void sendErrorCustomHandlerException() {
doThrow(new RuntimeException("Handler crashed")).when(errorHandler).apply(any(), any(), any());

ctx.sendError(cause);
verify(log).error(anyString(), anyString(), any(RuntimeException.class));
verify(log).error(anyString(), any(RuntimeException.class));
}

@Test
Expand Down
8 changes: 8 additions & 0 deletions jooby/src/test/java/io/jooby/Issue2369.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,18 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class Issue2369 {

@BeforeEach
@AfterEach
public void cleanState() {
Server.Base.clearState();
}

@Test
public void shouldCustomizeServerLostException() {
Throwable cause = new IllegalArgumentException();
Expand Down
6 changes: 6 additions & 0 deletions modules/jooby-hibernate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
<artifactId>hibernate-core</artifactId>
</dependency>

<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-scan-jandex</artifactId>
<version>${hibernate.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
1 change: 1 addition & 0 deletions modules/jooby-hibernate/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
requires jakarta.inject;
requires jakarta.persistence;
requires java.naming;
requires org.hibernate.orm.scan.jandex;
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<!-- data -->
<HikariCP.version>7.0.2</HikariCP.version>
<log4jdbc.version>1.2</log4jdbc.version>
<hibernate.version>7.0.4.Final</hibernate.version>
<hibernate.version>7.3.4.Final</hibernate.version>
<ebean.version>17.6.0</ebean.version>
<jdbi.version>3.53.0</jdbi.version>
<flyway.version>11.20.1</flyway.version>
Expand Down
Loading