Commit f470f276 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.2.x'

Closes gh-20549
parents 988d6503 4b82d7d9
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -45,7 +45,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain; ...@@ -45,7 +45,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
*/ */
class ReactiveOAuth2ClientConfigurations { class ReactiveOAuth2ClientConfigurations {
@Configuration @Configuration(proxyBeanMethods = false)
@Conditional(ClientsConfiguredCondition.class) @Conditional(ClientsConfiguredCondition.class)
@ConditionalOnMissingBean(ReactiveClientRegistrationRepository.class) @ConditionalOnMissingBean(ReactiveClientRegistrationRepository.class)
static class ReactiveClientRegistrationRepositoryConfiguration { static class ReactiveClientRegistrationRepositoryConfiguration {
...@@ -59,7 +59,7 @@ class ReactiveOAuth2ClientConfigurations { ...@@ -59,7 +59,7 @@ class ReactiveOAuth2ClientConfigurations {
} }
@Configuration @Configuration(proxyBeanMethods = false)
@ConditionalOnBean(ReactiveClientRegistrationRepository.class) @ConditionalOnBean(ReactiveClientRegistrationRepository.class)
static class ReactiveOAuth2ClientConfiguration { static class ReactiveOAuth2ClientConfiguration {
...@@ -77,7 +77,7 @@ class ReactiveOAuth2ClientConfigurations { ...@@ -77,7 +77,7 @@ class ReactiveOAuth2ClientConfigurations {
return new AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(authorizedClientService); return new AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(authorizedClientService);
} }
@Configuration @Configuration(proxyBeanMethods = false)
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE) @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
static class SecurityWebFilterChainConfiguration { static class SecurityWebFilterChainConfiguration {
......
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher; ...@@ -32,7 +32,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
* @author Madhura Bhave * @author Madhura Bhave
*/ */
@ConditionalOnClass(WebSecurityConfigurerAdapter.class) @ConditionalOnClass(WebSecurityConfigurerAdapter.class)
@Configuration @Configuration(proxyBeanMethods = false)
class RemoteDevtoolsSecurityConfiguration { class RemoteDevtoolsSecurityConfiguration {
@Order(SecurityProperties.BASIC_AUTH_ORDER - 1) @Order(SecurityProperties.BASIC_AUTH_ORDER - 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment