Move worker @Beans to the correct @Configuration class

This commit is contained in:
Andreas Svanberg 2025-02-07 12:14:38 +01:00
parent 34e986a6c9
commit 9823dc193c
2 changed files with 17 additions and 17 deletions
core/src/main/java/se/su/dsv/scipro
war/src/main/java/se/su/dsv/scipro/war

@ -28,7 +28,6 @@ import se.su.dsv.scipro.file.ProjectFileRepository;
import se.su.dsv.scipro.file.ProjectFileService;
import se.su.dsv.scipro.file.ProjectFileServiceImpl;
import se.su.dsv.scipro.finalseminar.AuthorRepository;
import se.su.dsv.scipro.finalseminar.ExpireUnfulfilledOppositionImprovementsWorker;
import se.su.dsv.scipro.finalseminar.FinalSeminarActiveParticipationRepository;
import se.su.dsv.scipro.finalseminar.FinalSeminarActiveParticipationServiceImpl;
import se.su.dsv.scipro.finalseminar.FinalSeminarCreationSubscribers;
@ -205,7 +204,6 @@ import se.su.dsv.scipro.system.UserRepo;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.system.UserServiceImpl;
import se.su.dsv.scipro.thesislink.ExternalLinkServiceImpl;
import se.su.dsv.scipro.workerthreads.Scheduler;
import se.su.dsv.scipro.workerthreads.WorkerDataServiceImpl;
@Configuration(proxyBeanMethods = false)
@ -1169,19 +1167,4 @@ public class CoreConfig {
notificationController
);
}
@Bean
public ExpireUnfulfilledOppositionImprovementsWorker expireUnfulfilledOppositionImprovementsWorker(
FinalSeminarOppositionServiceImpl finalSeminarOppositionService
) {
return new ExpireUnfulfilledOppositionImprovementsWorker(finalSeminarOppositionService);
}
@Bean
public ExpireUnfulfilledOppositionImprovementsWorker.Schedule expireUnfulfilledOppositionImprovementsWorkerSchedule(
Scheduler scheduler,
Provider<ExpireUnfulfilledOppositionImprovementsWorker> worker
) {
return new ExpireUnfulfilledOppositionImprovementsWorker.Schedule(scheduler, worker);
}
}

@ -13,6 +13,8 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Scope;
import org.springframework.transaction.PlatformTransactionManager;
import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.finalseminar.ExpireUnfulfilledOppositionImprovementsWorker;
import se.su.dsv.scipro.finalseminar.FinalSeminarOppositionServiceImpl;
import se.su.dsv.scipro.finalseminar.FinalSeminarService;
import se.su.dsv.scipro.firstmeeting.FirstMeetingReminderWorker;
import se.su.dsv.scipro.firstmeeting.FirstMeetingService;
@ -150,6 +152,14 @@ public class WorkerConfig {
return new SpringManagedWorkerTransactions(platformTransactionManager);
}
@Bean
public ExpireUnfulfilledOppositionImprovementsWorker.Schedule expireUnfulfilledOppositionImprovementsWorkerSchedule(
Scheduler scheduler,
Provider<ExpireUnfulfilledOppositionImprovementsWorker> worker
) {
return new ExpireUnfulfilledOppositionImprovementsWorker.Schedule(scheduler, worker);
}
@Configuration
public static class Workers {
@ -279,5 +289,12 @@ public class WorkerConfig {
public ExpiredRequestWorker expiredRequestWorker() {
return new ExpiredRequestWorker();
}
@Bean
public ExpireUnfulfilledOppositionImprovementsWorker expireUnfulfilledOppositionImprovementsWorker(
FinalSeminarOppositionServiceImpl finalSeminarOppositionService
) {
return new ExpireUnfulfilledOppositionImprovementsWorker(finalSeminarOppositionService);
}
}
}