Merge branch 'master' into stage

paladins-webservice/src/main/java/dev/luzifer/spring/config/WebSecurityConfig.java

@@ -9,10 +9,7 @@
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.password.NoOpPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
 
@@ -26,11 +23,6 @@ public WebSecurityConfig(@Value("${api.key}") String apiKey) {
     this.apiKey = apiKey;
   }
 
-  @Bean
-  public PasswordEncoder passwordEncoder() {
-    return NoOpPasswordEncoder.getInstance();
-  }
-
   @Bean
   public ApiKeyAuthFilter apiKeyAuthFilter(AuthenticationManager authenticationManager) {
     return new ApiKeyAuthFilter("API-KEY-HEADER", authenticationManager);
@@ -53,11 +45,6 @@ public AuthenticationManager authenticationManager(
     return authenticationConfiguration.getAuthenticationManager();
   }
 
-  @Bean
-  public WebSecurityCustomizer webSecurityCustomizer() {
-    return (web) -> web.debug(true);
-  }
-
   @Autowired
   public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
     auth.authenticationProvider(new ApiKeyAuthenticationProvider(apiKey));

paladins-webservice/src/main/java/dev/luzifer/spring/config/AsyncConfiguration.java → paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncConfiguration.java

@@ -1,13 +1,15 @@
-package dev.luzifer.spring.config;
+package dev.luzifer.spring.config.async;
 
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync
-public class AsyncConfiguration {
+public class AsyncConfiguration implements AsyncConfigurer {
 
   @Bean(name = "taskExecutor")
   public ThreadPoolTaskExecutor taskExecutor() {
@@ -19,4 +21,9 @@ public ThreadPoolTaskExecutor taskExecutor() {
     executor.initialize();
     return executor;
   }
+
+  @Override
+  public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+    return new AsyncUncaughtExceptionHandlerImpl();
+  }
 }

paladins-webservice/src/main/java/dev/luzifer/spring/config/async/AsyncUncaughtExceptionHandlerImpl.java

@@ -0,0 +1,19 @@
+package dev.luzifer.spring.config.async;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+
+@Slf4j
+public class AsyncUncaughtExceptionHandlerImpl implements AsyncUncaughtExceptionHandler {
+
+  @Override
+  public void handleUncaughtException(Throwable throwable, Method method, Object... objects) {
+    log.error(
+        "Uncaught exception in async executed method {} with arguments {}",
+        method,
+        Arrays.toString(objects),
+        throwable);
+  }
+}