diff --git a/core/src/main/java/org/nzbhydra/NzbHydraNativeEntrypoint.java b/core/src/main/java/org/nzbhydra/NzbHydraNativeEntrypoint.java index 37ef2d4e3..f55e558c3 100644 --- a/core/src/main/java/org/nzbhydra/NzbHydraNativeEntrypoint.java +++ b/core/src/main/java/org/nzbhydra/NzbHydraNativeEntrypoint.java @@ -16,7 +16,6 @@ package org.nzbhydra; -import jakarta.annotation.PostConstruct; import org.springframework.boot.SpringApplicationAotProcessor; import org.springframework.context.annotation.Configuration; import org.springframework.context.aot.AbstractAotProcessor; @@ -27,7 +26,7 @@ import org.springframework.util.StringUtils; import java.nio.file.Paths; import java.util.Arrays; -@Configuration +@Configuration(proxyBeanMethods = false) public class NzbHydraNativeEntrypoint { public static void main(String[] args) throws Exception { diff --git a/core/src/main/java/org/nzbhydra/auth/SecurityConfig.java b/core/src/main/java/org/nzbhydra/auth/SecurityConfig.java index 0bb145056..f72da00bd 100644 --- a/core/src/main/java/org/nzbhydra/auth/SecurityConfig.java +++ b/core/src/main/java/org/nzbhydra/auth/SecurityConfig.java @@ -29,7 +29,7 @@ import org.springframework.security.web.firewall.DefaultHttpFirewall; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.filter.ForwardedHeaderFilter; -@Configuration +@Configuration(proxyBeanMethods = false) @Order @EnableWebSecurity public class SecurityConfig { diff --git a/core/src/main/java/org/nzbhydra/config/ConfigSpringConfiguration.java b/core/src/main/java/org/nzbhydra/config/ConfigSpringConfiguration.java index c33e2c126..919f6ecae 100644 --- a/core/src/main/java/org/nzbhydra/config/ConfigSpringConfiguration.java +++ b/core/src/main/java/org/nzbhydra/config/ConfigSpringConfiguration.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +@Configuration(proxyBeanMethods = false) public class ConfigSpringConfiguration { @Autowired diff --git a/core/src/main/java/org/nzbhydra/database/DatabaseRecreationConfig.java b/core/src/main/java/org/nzbhydra/database/DatabaseRecreationConfig.java index 277085efb..fcb472281 100644 --- a/core/src/main/java/org/nzbhydra/database/DatabaseRecreationConfig.java +++ b/core/src/main/java/org/nzbhydra/database/DatabaseRecreationConfig.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration; import java.util.Set; -@Configuration +@Configuration(proxyBeanMethods = false) public class DatabaseRecreationConfig extends AbstractBeansOfTypeDatabaseInitializerDetector { @Bean diff --git a/core/src/main/java/org/nzbhydra/springconfig/AppConfig.java b/core/src/main/java/org/nzbhydra/springconfig/AppConfig.java index 618cb1586..4ae710039 100644 --- a/core/src/main/java/org/nzbhydra/springconfig/AppConfig.java +++ b/core/src/main/java/org/nzbhydra/springconfig/AppConfig.java @@ -9,7 +9,7 @@ import org.springframework.web.client.RestTemplate; @EnableAsync -@Configuration +@Configuration(proxyBeanMethods = false) public class AppConfig { @Autowired diff --git a/core/src/main/java/org/nzbhydra/tasks/HydraTaskConfiguration.java b/core/src/main/java/org/nzbhydra/tasks/HydraTaskConfiguration.java index 0c8e4a8fe..c05d4140b 100644 --- a/core/src/main/java/org/nzbhydra/tasks/HydraTaskConfiguration.java +++ b/core/src/main/java/org/nzbhydra/tasks/HydraTaskConfiguration.java @@ -20,7 +20,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -@Configuration +@Configuration(proxyBeanMethods = false) public class HydraTaskConfiguration { @Bean diff --git a/core/src/main/java/org/nzbhydra/web/WebConfiguration.java b/core/src/main/java/org/nzbhydra/web/WebConfiguration.java index 17a06b085..006c4738c 100644 --- a/core/src/main/java/org/nzbhydra/web/WebConfiguration.java +++ b/core/src/main/java/org/nzbhydra/web/WebConfiguration.java @@ -47,7 +47,7 @@ import java.util.List; import java.util.Map; @SuppressWarnings("unchecked") -@Configuration +@Configuration(proxyBeanMethods = false) public class WebConfiguration extends WebMvcConfigurationSupport { @Autowired diff --git a/core/src/main/java/org/nzbhydra/web/WebSocketConfig.java b/core/src/main/java/org/nzbhydra/web/WebSocketConfig.java index e33b5db1b..ea3395804 100644 --- a/core/src/main/java/org/nzbhydra/web/WebSocketConfig.java +++ b/core/src/main/java/org/nzbhydra/web/WebSocketConfig.java @@ -25,7 +25,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBr import org.springframework.web.socket.config.annotation.StompEndpointRegistry; import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer; -@Configuration +@Configuration(proxyBeanMethods = false) @EnableWebSocketMessageBroker public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {