Skip to content

Commit 4934088

Browse files
jgrandjajgrandja
committed
Remove generic type from OAuth2AuthorizationServerConfigurer
Closes gh-831
1 parent 0656fde commit 4934088

24 files changed

+227
-227
lines changed

‎docs/src/docs/asciidoc/configuration-model.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ Furthermore, it lets you customize the request processing logic for the protocol
8383
----
8484
@Bean
8585
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
86-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
87-
new OAuth2AuthorizationServerConfigurer<>();
86+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
87+
new OAuth2AuthorizationServerConfigurer();
8888
http.apply(authorizationServerConfigurer);
8989
9090
authorizationServerConfigurer
@@ -197,8 +197,8 @@ It defines extension points that let you customize the pre-processing, main proc
197197
----
198198
@Bean
199199
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
200-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
201-
new OAuth2AuthorizationServerConfigurer<>();
200+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
201+
new OAuth2AuthorizationServerConfigurer();
202202
http.apply(authorizationServerConfigurer);
203203
204204
authorizationServerConfigurer

‎docs/src/docs/asciidoc/core-model-components.adoc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ Alternatively, you can configure the `RegisteredClientRepository` through the xr
120120
----
121121
@Bean
122122
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
123-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
124-
new OAuth2AuthorizationServerConfigurer<>();
123+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
124+
new OAuth2AuthorizationServerConfigurer();
125125
http.apply(authorizationServerConfigurer);
126126
127127
authorizationServerConfigurer
@@ -213,8 +213,8 @@ Alternatively, you can configure the `OAuth2AuthorizationService` through the xr
213213
----
214214
@Bean
215215
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
216-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
217-
new OAuth2AuthorizationServerConfigurer<>();
216+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
217+
new OAuth2AuthorizationServerConfigurer();
218218
http.apply(authorizationServerConfigurer);
219219
220220
authorizationServerConfigurer
@@ -285,8 +285,8 @@ Alternatively, you can configure the `OAuth2AuthorizationConsentService` through
285285
----
286286
@Bean
287287
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
288-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
289-
new OAuth2AuthorizationServerConfigurer<>();
288+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
289+
new OAuth2AuthorizationServerConfigurer();
290290
http.apply(authorizationServerConfigurer);
291291
292292
authorizationServerConfigurer
@@ -396,8 +396,8 @@ Alternatively, you can configure the `OAuth2TokenGenerator` through the xref:con
396396
----
397397
@Bean
398398
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
399-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
400-
new OAuth2AuthorizationServerConfigurer<>();
399+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
400+
new OAuth2AuthorizationServerConfigurer();
401401
http.apply(authorizationServerConfigurer);
402402
403403
authorizationServerConfigurer
@@ -488,4 +488,4 @@ public OAuth2TokenCustomizer<JwtEncodingContext> jwtCustomizer() {
488488
If the `OAuth2TokenGenerator` is not provided as a `@Bean` or is not configured through the `OAuth2AuthorizationServerConfigurer`, an `OAuth2TokenCustomizer<JwtEncodingContext>` `@Bean` will automatically be configured with a `JwtGenerator`.
489489

490490
[TIP]
491-
For an example showing how you can xref:guides/how-to-userinfo.adoc#customize-id-token[customize the ID token], see the guide xref:guides/how-to-userinfo.adoc#how-to-userinfo[How-to: Customize the OpenID Connect 1.0 UserInfo response].
491+
For an example showing how you can xref:guides/how-to-userinfo.adoc#customize-id-token[customize the ID token], see the guide xref:guides/how-to-userinfo.adoc#how-to-userinfo[How-to: Customize the OpenID Connect 1.0 UserInfo response].

‎docs/src/docs/asciidoc/examples/src/main/java/sample/userinfo/jwt/JwtUserInfoMapperSecurityConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public class JwtUserInfoMapperSecurityConfig {
6363
@Bean // <1>
6464
@Order(1)
6565
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
66-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
67-
new OAuth2AuthorizationServerConfigurer<>();
66+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
67+
new OAuth2AuthorizationServerConfigurer();
6868
RequestMatcher endpointsMatcher = authorizationServerConfigurer
6969
.getEndpointsMatcher();
7070

‎docs/src/docs/asciidoc/protocol-endpoints.adoc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ It defines extension points that let you customize the pre-processing, main proc
1313
----
1414
@Bean
1515
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
16-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
17-
new OAuth2AuthorizationServerConfigurer<>();
16+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
17+
new OAuth2AuthorizationServerConfigurer();
1818
http.apply(authorizationServerConfigurer);
1919
2020
authorizationServerConfigurer
@@ -57,8 +57,8 @@ It defines extension points that let you customize the pre-processing, main proc
5757
----
5858
@Bean
5959
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
60-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
61-
new OAuth2AuthorizationServerConfigurer<>();
60+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
61+
new OAuth2AuthorizationServerConfigurer();
6262
http.apply(authorizationServerConfigurer);
6363
6464
authorizationServerConfigurer
@@ -102,8 +102,8 @@ It defines extension points that let you customize the pre-processing, main proc
102102
----
103103
@Bean
104104
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
105-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
106-
new OAuth2AuthorizationServerConfigurer<>();
105+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
106+
new OAuth2AuthorizationServerConfigurer();
107107
http.apply(authorizationServerConfigurer);
108108
109109
authorizationServerConfigurer
@@ -145,8 +145,8 @@ It defines extension points that let you customize the pre-processing, main proc
145145
----
146146
@Bean
147147
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
148-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
149-
new OAuth2AuthorizationServerConfigurer<>();
148+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
149+
new OAuth2AuthorizationServerConfigurer();
150150
http.apply(authorizationServerConfigurer);
151151
152152
authorizationServerConfigurer
@@ -215,8 +215,8 @@ It defines extension points that let you customize the https://openid.net/specs/
215215
----
216216
@Bean
217217
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
218-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
219-
new OAuth2AuthorizationServerConfigurer<>();
218+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
219+
new OAuth2AuthorizationServerConfigurer();
220220
http.apply(authorizationServerConfigurer);
221221
222222
authorizationServerConfigurer
@@ -249,8 +249,8 @@ The following example shows how to enable the OAuth2 resource server configurati
249249
----
250250
@Bean
251251
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
252-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
253-
new OAuth2AuthorizationServerConfigurer<>();
252+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
253+
new OAuth2AuthorizationServerConfigurer();
254254
http.apply(authorizationServerConfigurer);
255255
256256
...
@@ -282,8 +282,8 @@ The following example shows how to enable (disabled by default) the OpenID Conne
282282
----
283283
@Bean
284284
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
285-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
286-
new OAuth2AuthorizationServerConfigurer<>();
285+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
286+
new OAuth2AuthorizationServerConfigurer();
287287
http.apply(authorizationServerConfigurer);
288288
289289
authorizationServerConfigurer
@@ -323,8 +323,8 @@ The following example shows how to enable the OAuth2 resource server configurati
323323
----
324324
@Bean
325325
public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
326-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
327-
new OAuth2AuthorizationServerConfigurer<>();
326+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
327+
new OAuth2AuthorizationServerConfigurer();
328328
http.apply(authorizationServerConfigurer);
329329
330330
...

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity h
5757

5858
// @formatter:off
5959
public static void applyDefaultSecurity(HttpSecurity http) throws Exception {
60-
OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer =
61-
new OAuth2AuthorizationServerConfigurer<>();
60+
OAuth2AuthorizationServerConfigurer authorizationServerConfigurer =
61+
new OAuth2AuthorizationServerConfigurer();
6262
RequestMatcher endpointsMatcher = authorizationServerConfigurer
6363
.getEndpointsMatcher();
6464

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/AbstractOAuth2Configurer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers;
1717

1818
import org.springframework.security.config.annotation.ObjectPostProcessor;
19-
import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
19+
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2020
import org.springframework.security.web.util.matcher.RequestMatcher;
2121

2222
/**
@@ -32,9 +32,9 @@ abstract class AbstractOAuth2Configurer {
3232
this.objectPostProcessor = objectPostProcessor;
3333
}
3434

35-
abstract <B extends HttpSecurityBuilder<B>> void init(B builder);
35+
abstract void init(HttpSecurity httpSecurity);
3636

37-
abstract <B extends HttpSecurityBuilder<B>> void configure(B builder);
37+
abstract void configure(HttpSecurity httpSecurity);
3838

3939
abstract RequestMatcher getRequestMatcher();
4040

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OAuth2AuthorizationEndpointConfigurer.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.springframework.security.authentication.AuthenticationManager;
2525
import org.springframework.security.authentication.AuthenticationProvider;
2626
import org.springframework.security.config.annotation.ObjectPostProcessor;
27-
import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
27+
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2828
import org.springframework.security.oauth2.core.OAuth2Error;
2929
import org.springframework.security.oauth2.core.endpoint.OAuth2AuthorizationResponse;
3030
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2AuthorizationCodeRequestAuthenticationException;
@@ -148,8 +148,8 @@ public OAuth2AuthorizationEndpointConfigurer consentPage(String consentPage) {
148148
}
149149

150150
@Override
151-
<B extends HttpSecurityBuilder<B>> void init(B builder) {
152-
ProviderSettings providerSettings = OAuth2ConfigurerUtils.getProviderSettings(builder);
151+
void init(HttpSecurity httpSecurity) {
152+
ProviderSettings providerSettings = OAuth2ConfigurerUtils.getProviderSettings(httpSecurity);
153153
this.requestMatcher = new OrRequestMatcher(
154154
new AntPathRequestMatcher(
155155
providerSettings.getAuthorizationEndpoint(),
@@ -161,15 +161,15 @@ <B extends HttpSecurityBuilder<B>> void init(B builder) {
161161
List<AuthenticationProvider> authenticationProviders =
162162
!this.authenticationProviders.isEmpty() ?
163163
this.authenticationProviders :
164-
createDefaultAuthenticationProviders(builder);
164+
createDefaultAuthenticationProviders(httpSecurity);
165165
authenticationProviders.forEach(authenticationProvider ->
166-
builder.authenticationProvider(postProcess(authenticationProvider)));
166+
httpSecurity.authenticationProvider(postProcess(authenticationProvider)));
167167
}
168168

169169
@Override
170-
<B extends HttpSecurityBuilder<B>> void configure(B builder) {
171-
AuthenticationManager authenticationManager = builder.getSharedObject(AuthenticationManager.class);
172-
ProviderSettings providerSettings = OAuth2ConfigurerUtils.getProviderSettings(builder);
170+
void configure(HttpSecurity httpSecurity) {
171+
AuthenticationManager authenticationManager = httpSecurity.getSharedObject(AuthenticationManager.class);
172+
ProviderSettings providerSettings = OAuth2ConfigurerUtils.getProviderSettings(httpSecurity);
173173

174174
OAuth2AuthorizationEndpointFilter authorizationEndpointFilter =
175175
new OAuth2AuthorizationEndpointFilter(
@@ -187,22 +187,22 @@ <B extends HttpSecurityBuilder<B>> void configure(B builder) {
187187
if (StringUtils.hasText(this.consentPage)) {
188188
authorizationEndpointFilter.setConsentPage(this.consentPage);
189189
}
190-
builder.addFilterBefore(postProcess(authorizationEndpointFilter), AbstractPreAuthenticatedProcessingFilter.class);
190+
httpSecurity.addFilterBefore(postProcess(authorizationEndpointFilter), AbstractPreAuthenticatedProcessingFilter.class);
191191
}
192192

193193
@Override
194194
RequestMatcher getRequestMatcher() {
195195
return this.requestMatcher;
196196
}
197197

198-
private <B extends HttpSecurityBuilder<B>> List<AuthenticationProvider> createDefaultAuthenticationProviders(B builder) {
198+
private List<AuthenticationProvider> createDefaultAuthenticationProviders(HttpSecurity httpSecurity) {
199199
List<AuthenticationProvider> authenticationProviders = new ArrayList<>();
200200

201201
OAuth2AuthorizationCodeRequestAuthenticationProvider authorizationCodeRequestAuthenticationProvider =
202202
new OAuth2AuthorizationCodeRequestAuthenticationProvider(
203-
OAuth2ConfigurerUtils.getRegisteredClientRepository(builder),
204-
OAuth2ConfigurerUtils.getAuthorizationService(builder),
205-
OAuth2ConfigurerUtils.getAuthorizationConsentService(builder));
203+
OAuth2ConfigurerUtils.getRegisteredClientRepository(httpSecurity),
204+
OAuth2ConfigurerUtils.getAuthorizationService(httpSecurity),
205+
OAuth2ConfigurerUtils.getAuthorizationConsentService(httpSecurity));
206206
authenticationProviders.add(authorizationCodeRequestAuthenticationProvider);
207207

208208
return authenticationProviders;

0 commit comments

Comments
 (0)