Skip to content

Commit d6d1b1d

Browse files
committed
using in test virtual thread factory
1 parent a4bd5a6 commit d6d1b1d

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
services:
8181
postgres:
8282
image: postgres
83-
options: --name pg-container
8483
env:
8584
POSTGRES_USER: sa
8685
POSTGRES_PASSWORD: veryStrong123

RUN_AND_BUILD.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mvn versions:set -DnewVersion=1.6.0-SNAPSHOT -DgenerateBackupPoms=false
55

66
## postgres
77

8-
docker run --name pg-container -e POSTGRES_USER=sa -e POSTGRES_PASSWORD=veryStrong123 -p 5432:5432 -d postgres
8+
docker run -e POSTGRES_USER=sa -e POSTGRES_PASSWORD=veryStrong123 -p 5432:5432 -d postgres
99

1010
## azure-sql-edge
1111

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/config/SchedulerConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ SchedulerService schedulerService(
7777
maxShutdownWaitTime, trx);
7878
}
7979

80+
@Deprecated
8081
public static SchedulerService newSchedulerService(
8182
String name,
8283
MeterRegistry meterRegistry,

core/src/main/java/org/sterl/spring/persistent_tasks/scheduler/config/SchedulerThreadFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ enum Type {
2323
};
2424

2525
SchedulerThreadFactory VIRTUAL_THREAD_POOL_FACTORY = (maxThreads) -> {
26-
return Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("vpt-", 0) .factory());
26+
return Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("v-spt-", 0) .factory());
2727
};
2828
}

core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.springframework.context.annotation.Primary;
1717
import org.springframework.lang.Nullable;
1818
import org.springframework.stereotype.Component;
19+
import org.springframework.test.context.ActiveProfiles;
1920
import org.springframework.test.context.event.RecordApplicationEvents;
2021
import org.springframework.transaction.PlatformTransactionManager;
2122
import org.springframework.transaction.support.TransactionTemplate;
@@ -26,6 +27,7 @@
2627
import org.sterl.spring.persistent_tasks.scheduler.SchedulerService;
2728
import org.sterl.spring.persistent_tasks.scheduler.component.EditSchedulerStatusComponent;
2829
import org.sterl.spring.persistent_tasks.scheduler.config.SchedulerConfig;
30+
import org.sterl.spring.persistent_tasks.scheduler.config.SchedulerThreadFactory;
2931
import org.sterl.spring.persistent_tasks.task.TaskService;
3032
import org.sterl.spring.persistent_tasks.test.AsyncAsserts;
3133
import org.sterl.spring.persistent_tasks.test.PersistentTaskTestService;
@@ -38,7 +40,7 @@
3840
import jakarta.persistence.EntityManager;
3941
import lombok.RequiredArgsConstructor;
4042

41-
//@ActiveProfiles("mssql") // postgres mssql mariadb mysql
43+
@ActiveProfiles({"virtual-thread"}) // postgres mssql mariadb mysql
4244
@SpringBootTest(classes = SampleApp.class, webEnvironment = WebEnvironment.RANDOM_PORT)
4345
@RecordApplicationEvents
4446
public class AbstractSpringTest {
@@ -92,25 +94,26 @@ HibernateAsserts hibernateAsserts(EntityManager entityManager) {
9294

9395
@Primary
9496
@Bean("schedulerA")
95-
@SuppressWarnings("resource")
96-
SchedulerService schedulerA(TriggerService triggerService,
97+
SchedulerService schedulerA(
98+
TriggerService triggerService,
9799
MeterRegistry meterRegistry,
98100
EditSchedulerStatusComponent editSchedulerStatus,
101+
SchedulerThreadFactory threadFactory,
99102
TransactionTemplate trx) throws UnknownHostException {
100103

101104
final var name = "schedulerA";
102-
return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, 10, Duration.ZERO, trx);
105+
return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, threadFactory, 10, Duration.ZERO, trx);
103106
}
104107

105108
@Bean
106-
@SuppressWarnings("resource")
107109
SchedulerService schedulerB(TriggerService triggerService,
108110
MeterRegistry meterRegistry,
109111
EditSchedulerStatusComponent editSchedulerStatus,
112+
SchedulerThreadFactory threadFactory,
110113
TransactionTemplate trx) throws UnknownHostException {
111114

112115
final var name = "schedulerB";
113-
return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, 20, Duration.ZERO, trx);
116+
return SchedulerConfig.newSchedulerService(name, meterRegistry, triggerService, editSchedulerStatus, threadFactory, 20, Duration.ZERO, trx);
114117
}
115118

116119
/**

0 commit comments

Comments
 (0)