remove custom DelegatingTaskExecutor

reason: better interop with Spring Boot conventions. Async-annotated methods in NotificationServiceForUser [1] are not executed
by our customized "SteVe-TaskExecutor" but default Spring Boot task executor. this is because DelegatingTaskExecutor does not
extend some necessary interfaces which Spring Boot uses to decide whether to create a default. getting rid ofthis wrapper since it
was not useful anyways.

then, using the conventions from Spring Boot to create and name a task executor [2].

[1] introduced in #1263
[2] https://docs.spring.io/spring-boot/reference/features/task-execution-and-scheduling.html

Author: goekay

src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java

@@ -144,16 +144,17 @@ public DelegatingTaskScheduler asyncTaskScheduler() {
         return new DelegatingTaskScheduler(scheduler);
     }
 
-    @Bean(destroyMethod = "close")
-    public DelegatingTaskExecutor asyncTaskExecutor() {
+    @Bean
+    @Primary
+    public ThreadPoolTaskExecutor taskExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(5);
         executor.setThreadNamePrefix("SteVe-TaskExecutor-");
         executor.setWaitForTasksToCompleteOnShutdown(true);
         executor.setAwaitTerminationSeconds(30);
         executor.initialize();
 
-        return new DelegatingTaskExecutor(executor);
+        return executor;
     }
 
     /**

src/main/java/de/rwth/idsg/steve/config/DelegatingTaskExecutor.java

@@ -18,7 +18,6 @@
  */
 package de.rwth.idsg.steve.ocpp.soap;
 
-import de.rwth.idsg.steve.config.DelegatingTaskExecutor;
 import de.rwth.idsg.steve.ocpp.OcppProtocol;
 import de.rwth.idsg.steve.repository.OcppServerRepository;
 import de.rwth.idsg.steve.repository.impl.ChargePointRepositoryImpl;
@@ -37,6 +36,7 @@
 import org.apache.cxf.ws.addressing.AddressingProperties;
 import org.apache.cxf.ws.addressing.ContextUtils;
 import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Component;
 
 import javax.xml.namespace.QName;
@@ -61,18 +61,18 @@ public class MessageHeaderInterceptor extends AbstractPhaseInterceptor<Message>
 
     private final OcppServerRepository ocppServerRepository;
     private final ChargePointRegistrationService chargePointRegistrationService;
-    private final DelegatingTaskExecutor asyncTaskExecutor;
+    private final TaskExecutor taskExecutor;
 
     private static final String BOOT_OPERATION_NAME = "BootNotification";
     private static final String CHARGEBOX_ID_HEADER = "ChargeBoxIdentity";
 
     public MessageHeaderInterceptor(OcppServerRepository ocppServerRepository,
                                     ChargePointRegistrationService chargePointRegistrationService,
-                                    DelegatingTaskExecutor asyncTaskExecutor) {
+                                    TaskExecutor taskExecutor) {
         super(Phase.PRE_INVOKE);
         this.ocppServerRepository = ocppServerRepository;
         this.chargePointRegistrationService = chargePointRegistrationService;
-        this.asyncTaskExecutor = asyncTaskExecutor;
+        this.taskExecutor = taskExecutor;
     }
 
     @Override
@@ -97,7 +97,7 @@ public void handleMessage(Message message) throws Fault {
         // 2. update endpoint
         // -------------------------------------------------------------------------
 
-        asyncTaskExecutor.execute(() -> {
+        taskExecutor.execute(() -> {
             try {
                 String endpointAddress = getEndpointAddress(message);
                 if (endpointAddress != null) {

src/main/java/de/rwth/idsg/steve/ocpp/soap/MessageHeaderInterceptor.java

@@ -18,10 +18,10 @@
  */
 package de.rwth.idsg.steve.service;
 
-import de.rwth.idsg.steve.config.DelegatingTaskExecutor;
 import de.rwth.idsg.steve.repository.dto.ChargePointSelect;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
+import org.springframework.core.task.TaskExecutor;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -33,10 +33,10 @@
 @RequiredArgsConstructor
 public class BackgroundService {
 
-    private final DelegatingTaskExecutor asyncTaskExecutor;
+    private final TaskExecutor taskExecutor;
 
-    public static BackgroundService with(DelegatingTaskExecutor asyncTaskExecutor) {
-        return new BackgroundService(asyncTaskExecutor);
+    public static BackgroundService with(TaskExecutor taskExecutor) {
+        return new BackgroundService(taskExecutor);
     }
 
     public Runner forFirst(List<ChargePointSelect> list) {
@@ -57,7 +57,7 @@ private class BackgroundSingleRunner implements Runner {
 
         @Override
         public void execute(Consumer<ChargePointSelect> consumer) {
-            asyncTaskExecutor.execute(() -> consumer.accept(cps));
+            taskExecutor.execute(() -> consumer.accept(cps));
         }
     }
 
@@ -67,7 +67,7 @@ private class BackgroundListRunner implements Runner {
 
         @Override
         public void execute(Consumer<ChargePointSelect> consumer) {
-            asyncTaskExecutor.execute(() -> list.forEach(consumer));
+            taskExecutor.execute(() -> list.forEach(consumer));
         }
     }
 }

src/main/java/de/rwth/idsg/steve/service/BackgroundService.java

@@ -19,7 +19,6 @@
 package de.rwth.idsg.steve.service;
 
 import de.rwth.idsg.steve.SteveException;
-import de.rwth.idsg.steve.config.DelegatingTaskExecutor;
 import de.rwth.idsg.steve.ocpp.ChargePointServiceInvokerImpl;
 import de.rwth.idsg.steve.ocpp.OcppCallback;
 import de.rwth.idsg.steve.ocpp.task.CancelReservationTask;
@@ -73,6 +72,7 @@
 import ocpp.cp._2015._10.ChargingProfilePurposeType;
 import ocpp.cp._2015._10.GetCompositeScheduleResponse;
 import org.joda.time.DateTime;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -90,7 +90,7 @@ public class ChargePointServiceClient {
     private final ReservationRepository reservationRepository;
     private final OcppTagService ocppTagService;
 
-    private final DelegatingTaskExecutor asyncTaskExecutor;
+    private final TaskExecutor taskExecutor;
     private final TaskStore taskStore;
     private final ChargePointServiceInvokerImpl invoker;
 
@@ -107,7 +107,7 @@ public final int changeAvailability(ChangeAvailabilityParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.changeAvailability(c, task));
 
@@ -123,7 +123,7 @@ public final int changeConfiguration(ChangeConfigurationParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.changeConfiguration(c, task));
 
@@ -139,7 +139,7 @@ public final int clearCache(MultipleChargePointSelect params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.clearCache(c, task));
 
@@ -155,7 +155,7 @@ public final int getDiagnostics(GetDiagnosticsParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.getDiagnostics(c, task));
 
@@ -171,7 +171,7 @@ public final int reset(ResetParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.reset(c, task));
 
@@ -187,7 +187,7 @@ public final int updateFirmware(UpdateFirmwareParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.updateFirmware(c, task));
 
@@ -217,7 +217,7 @@ public final int remoteStartTransaction(RemoteStartTransactionParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forFirst(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.remoteStartTransaction(c, task));
 
@@ -233,7 +233,7 @@ public final int remoteStopTransaction(RemoteStopTransactionParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forFirst(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.remoteStopTransaction(c, task));
 
@@ -249,7 +249,7 @@ public final int unlockConnector(UnlockConnectorParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forFirst(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.unlockConnector(c, task));
 
@@ -269,7 +269,7 @@ public final int dataTransfer(DataTransferParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.dataTransfer(c, task));
 
@@ -285,7 +285,7 @@ public final int getConfiguration(GetConfigurationParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.getConfiguration(c, task));
 
@@ -301,7 +301,7 @@ public final int getLocalListVersion(MultipleChargePointSelect params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.getLocalListVersion(c, task));
 
@@ -317,7 +317,7 @@ public final int sendLocalList(SendLocalListParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.sendLocalList(c, task));
 
@@ -351,7 +351,7 @@ public final int reserveNow(ReserveNowParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forFirst(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.reserveNow(c, task));
 
@@ -367,7 +367,7 @@ public final int cancelReservation(CancelReservationParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forFirst(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.cancelReservation(c, task));
 
@@ -387,7 +387,7 @@ public final int triggerMessage(TriggerMessageParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.triggerMessage(c, task));
 
@@ -401,7 +401,7 @@ public final int setChargingProfile(SetChargingProfileTask task,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.setChargingProfile(c, task));
 
@@ -427,7 +427,7 @@ public final int clearChargingProfile(ClearChargingProfileParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.clearChargingProfile(c, task));
 
@@ -443,7 +443,7 @@ public final int getCompositeSchedule(GetCompositeScheduleParams params,
             task.addCallback(callback);
         }
 
-        BackgroundService.with(asyncTaskExecutor)
+        BackgroundService.with(taskExecutor)
             .forEach(task.getParams().getChargePointSelectList())
             .execute(c -> invoker.getCompositeSchedule(c, task));
 

src/main/java/de/rwth/idsg/steve/service/ChargePointServiceClient.java

@@ -20,11 +20,11 @@
 
 import com.google.common.base.Strings;
 import de.rwth.idsg.steve.SteveException;
-import de.rwth.idsg.steve.config.DelegatingTaskExecutor;
 import de.rwth.idsg.steve.repository.SettingsRepository;
 import de.rwth.idsg.steve.web.dto.SettingsForm.MailSettings;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
 import jakarta.mail.Authenticator;
@@ -50,7 +50,7 @@
 public class MailServiceDefault implements MailService {
 
     private final SettingsRepository settingsRepository;
-    private final DelegatingTaskExecutor asyncTaskExecutor;
+    private final TaskExecutor taskExecutor;
 
     @Override
     public MailSettings getSettings() {
@@ -68,7 +68,7 @@ public void sendTestMail() {
 
     @Override
     public void sendAsync(String subject, String body) {
-        asyncTaskExecutor.execute(() -> {
+        taskExecutor.execute(() -> {
             try {
                 send(subject, body);
             } catch (MessagingException e) {