From aab929d029e6f4ca2114b48d94d42a58dabd91a1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 28 Mar 2025 14:49:21 +0000 Subject: [PATCH] Polish ReactiveUserDetailsServiceAutoConfigurationTests Closes gh-44934 --- ...rDetailsServiceAutoConfigurationTests.java | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java index 1b673b6dc96..41e7d556a7b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2024 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,6 @@ import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; -import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; import org.springframework.security.oauth2.server.resource.introspection.ReactiveOpaqueTokenIntrospector; import static org.assertj.core.api.Assertions.assertThat; @@ -108,14 +107,6 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { .doesNotHaveBean(ReactiveUserDetailsService.class)); } - @Test - void doesNotConfigureDefaultUserIfResourceServerWithJWTIsUsed() { - this.contextRunner.withUserConfiguration(JwtDecoderConfiguration.class).run((context) -> { - assertThat(context).hasSingleBean(ReactiveJwtDecoder.class); - assertThat(context).doesNotHaveBean(ReactiveUserDetailsService.class); - }); - } - @Test void doesNotConfigureDefaultUserIfResourceServerIsPresent() { this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(ReactiveUserDetailsService.class)); @@ -232,24 +223,4 @@ class ReactiveUserDetailsServiceAutoConfigurationTests { } - @Configuration(proxyBeanMethods = false) - static class JwtDecoderConfiguration { - - @Bean - ReactiveJwtDecoder jwtDecoder() { - return mock(ReactiveJwtDecoder.class); - } - - } - - @Configuration(proxyBeanMethods = false) - static class ReactiveOpaqueTokenIntrospectorConfiguration { - - @Bean - ReactiveOpaqueTokenIntrospector introspectionClient() { - return mock(ReactiveOpaqueTokenIntrospector.class); - } - - } - }