Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
github
/
spring-authorization-server
peilaus alkaen https://github.com/spring-projects/spring-authorization-server
2
0
Fork 0
Tiedostot Ongelmat 0 Wiki
Selaa lähdekoodia

Relocate classes out from config.annotation.web.configuration package

Closes gh-810
Joe Grandja 3 vuotta sitten
vanhempi
65400f8c71
commit
435a17e4b9
21 muutettua tiedostoa jossa 30 lisäystä ja 29 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1 1
      docs/src/docs/asciidoc/examples/src/main/java/sample/gettingStarted/SecurityConfig.java
  2. 1 1
      docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java
  3. 1 1
      docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java
  4. 1 1
      docs/src/docs/asciidoc/examples/src/test/java/sample/gettingStarted/SecurityConfigTests.java
  5. 1 1
      docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java
  6. 2 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
  7. 2 2
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java
  8. 2 2
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/JwkSetTests.java
  9. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java
  10. 2 2
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerMetadataTests.java
  11. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java
  12. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2RefreshTokenGrantTests.java
  13. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenIntrospectionTests.java
  14. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationTests.java
  15. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcClientRegistrationTests.java
  16. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcTests.java
  17. 1 1
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcUserInfoTests.java
  18. 5 4
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfigurationTests.java
  19. 2 2
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessorTests.java
  20. 1 1
      samples/default-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java
  21. 1 1
      samples/federated-identity-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java

+ 1 - 1
docs/src/docs/asciidoc/examples/src/main/java/sample/gettingStarted/SecurityConfig.java
Näytä tiedosto 

@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
 
 import org.springframework.core.annotation.Order;
 
 import org.springframework.security.config.Customizer;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.core.userdetails.User;
 
 import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 
@@ -44,6 +43,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 import org.springframework.security.web.SecurityFilterChain;
 
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;

+ 1 - 1
docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/EnableUserInfoSecurityConfig.java
Näytä tiedosto 

@@ -32,7 +32,6 @@ import org.springframework.context.annotation.Configuration;
 
 import org.springframework.core.annotation.Order;
 
 import org.springframework.security.config.Customizer;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 
 import org.springframework.security.core.userdetails.User;
 
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -46,6 +45,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 import org.springframework.security.web.SecurityFilterChain;
 
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;

+ 1 - 1
docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java
Näytä tiedosto 

@@ -33,7 +33,6 @@ import org.springframework.context.annotation.Configuration;
 
 import org.springframework.core.annotation.Order;
 
 import org.springframework.security.config.Customizer;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer;
 
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 
 import org.springframework.security.core.userdetails.User;
 
@@ -49,6 +48,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationContext;
 
 import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken;
 
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;

+ 1 - 1
docs/src/docs/asciidoc/examples/src/test/java/sample/gettingStarted/SecurityConfigTests.java
Näytä tiedosto 

@@ -30,7 +30,6 @@ import org.springframework.context.annotation.Bean;
 
 import org.springframework.context.annotation.ComponentScan;
 
 import org.springframework.context.annotation.Import;
 
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.core.OAuth2TokenType;
 
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 
 import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames;
 
@@ -43,6 +42,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
 
 import org.springframework.security.oauth2.server.authorization.client.InMemoryRegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.test.web.servlet.MockMvc;
 
 import org.springframework.util.StringUtils;

+ 1 - 1
docs/src/docs/asciidoc/examples/src/test/java/sample/jpa/JpaTests.java
Näytä tiedosto 

@@ -38,7 +38,6 @@ import org.springframework.context.annotation.Bean;
 
 import org.springframework.context.annotation.ComponentScan;
 
 import org.springframework.context.annotation.Import;
 
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.core.OAuth2TokenType;
 
 import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
 
 import org.springframework.security.oauth2.core.oidc.endpoint.OidcParameterNames;
 
@@ -49,6 +48,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
 
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.test.web.servlet.MockMvc;
 
 import org.springframework.util.StringUtils;

+ 2 - 2
oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020-2021 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -13,7 +13,7 @@
 
  * See the License for the specific language governing permissions and
 
  * limitations under the License.
 
  */
 
-package org.springframework.security.config.annotation.web.configuration;
 
+package org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration;
 
 
 import java.util.HashSet;
 
 import java.util.Set;

+ 2 - 2
oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessor.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020-2021 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -14,7 +14,7 @@
 
  * limitations under the License.
 
  */
 
 
-package org.springframework.security.config.annotation.web.configuration;
 
+package org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration;
 
 
 import java.util.ArrayList;
 
 import java.util.List;

+ 2 - 2
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/JwkSetTests.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020-2021 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -35,7 +35,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.oauth2.jose.TestJwks;
 
 import org.springframework.security.oauth2.server.authorization.JdbcOAuth2AuthorizationService;
 
@@ -43,6 +42,7 @@ import org.springframework.security.oauth2.server.authorization.OAuth2Authorizat
 
 import org.springframework.security.oauth2.server.authorization.client.JdbcRegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.test.web.servlet.MockMvc;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java
Näytä tiedosto 

@@ -61,7 +61,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.core.GrantedAuthority;
 
@@ -99,6 +98,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;
 
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;

+ 2 - 2
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerMetadataTests.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020-2021 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -33,7 +33,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.oauth2.jose.TestJwks;
 
 import org.springframework.security.oauth2.server.authorization.client.JdbcRegisteredClientRepository;
 
@@ -41,6 +40,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.test.web.servlet.MockMvc;
 
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java
Näytä tiedosto 

@@ -49,7 +49,6 @@ import org.springframework.security.authentication.AuthenticationProvider;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.core.context.SecurityContextHolder;
 
@@ -70,6 +69,7 @@ import org.springframework.security.oauth2.server.authorization.client.JdbcRegis
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
 
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2RefreshTokenGrantTests.java
Näytä tiedosto 

@@ -47,7 +47,6 @@ import org.springframework.mock.http.client.MockClientHttpResponse;
 
 import org.springframework.mock.web.MockHttpServletResponse;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.core.GrantedAuthority;
 
@@ -73,6 +72,7 @@ import org.springframework.security.oauth2.server.authorization.client.JdbcRegis
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
 
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenIntrospectionTests.java
Näytä tiedosto 

@@ -50,7 +50,6 @@ import org.springframework.security.authentication.AuthenticationProvider;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
@@ -84,6 +83,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.TokenSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext;
 
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsSet;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2TokenRevocationTests.java
Näytä tiedosto 

@@ -41,7 +41,6 @@ import org.springframework.security.authentication.AuthenticationProvider;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
@@ -64,6 +63,7 @@ import org.springframework.security.oauth2.server.authorization.client.JdbcRegis
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.web.SecurityFilterChain;
 
 import org.springframework.security.web.authentication.AuthenticationConverter;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcClientRegistrationTests.java
Näytä tiedosto 

@@ -48,7 +48,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 import org.springframework.security.config.Customizer;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 
@@ -80,6 +79,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.web.SecurityFilterChain;
 
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import org.springframework.test.web.servlet.MockMvc;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcTests.java
Näytä tiedosto 

@@ -50,7 +50,6 @@ import org.springframework.mock.web.MockHttpServletResponse;
 
 import org.springframework.security.authentication.TestingAuthenticationToken;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.core.Authentication;
 
 import org.springframework.security.core.GrantedAuthority;
 
@@ -80,6 +79,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.jackson2.TestingAuthenticationTokenMixin;
 
 import org.springframework.security.oauth2.server.authorization.token.DelegatingOAuth2TokenGenerator;
 
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;

+ 1 - 1
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OidcUserInfoTests.java
Näytä tiedosto 

@@ -36,7 +36,6 @@ import org.springframework.context.annotation.Bean;
 
 import org.springframework.http.HttpHeaders;
 
 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.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer;
 
 import org.springframework.security.config.test.SpringTestRule;
 
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
 
@@ -61,6 +60,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationContext;
 
 import org.springframework.security.oauth2.server.authorization.oidc.authentication.OidcUserInfoAuthenticationToken;
 
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;

+ 5 - 4
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfigurationTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfigurationTests.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -13,16 +13,17 @@
 
  * See the License for the specific language governing permissions and
 
  * limitations under the License.
 
  */
 
-package org.springframework.security.config.annotation.web.configuration;
 
+package org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration;
 
+
 
+import java.lang.reflect.Method;
 
 
 import org.junit.Test;
 
+
 
 import org.springframework.core.Ordered;
 
 import org.springframework.core.annotation.OrderUtils;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
 import org.springframework.util.ClassUtils;
 
 
-import java.lang.reflect.Method;
 
-
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 /**

+ 2 - 2
oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configuration/RegisterMissingBeanPostProcessorTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/RegisterMissingBeanPostProcessorTests.java
Näytä tiedosto 

@@ -1,5 +1,5 @@
 
 /*
 
- * Copyright 2020-2021 the original author or authors.
 
+ * Copyright 2020-2022 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.
 
@@ -14,7 +14,7 @@
 
  * limitations under the License.
 
  */
 
 
-package org.springframework.security.config.annotation.web.configuration;
 
+package org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration;
 
 
 import java.util.function.Supplier;

+ 1 - 1
samples/default-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java
Näytä tiedosto 

@@ -32,7 +32,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 
 import org.springframework.security.oauth2.core.oidc.OidcScopes;
 
@@ -45,6 +44,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.web.SecurityFilterChain;
 
 import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;

+ 1 - 1
samples/federated-identity-authorizationserver/src/main/java/sample/config/AuthorizationServerConfig.java
Näytä tiedosto 

@@ -34,7 +34,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 
-import org.springframework.security.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 
 import org.springframework.security.oauth2.core.oidc.OidcScopes;
 
@@ -47,6 +46,7 @@ import org.springframework.security.oauth2.server.authorization.client.Registere
 
 import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
 
 import org.springframework.security.oauth2.server.authorization.config.ClientSettings;
 
 import org.springframework.security.oauth2.server.authorization.config.ProviderSettings;
 
+import org.springframework.security.oauth2.server.authorization.config.annotation.web.configuration.OAuth2AuthorizationServerConfiguration;
 
 import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
 
 import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
 
 import org.springframework.security.web.SecurityFilterChain;