Skip to content

Commit 667cd4a

Browse files
committed
Remove unnecessary throws Exception from spring-security-config
Closes gh-17957
1 parent be20201 commit 667cd4a

File tree

56 files changed

+204
-307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+204
-307
lines changed

config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ protected AbstractConfiguredSecurityBuilder(ObjectPostProcessor<Object> objectPo
9696
}
9797

9898
/**
99-
* Similar to {@link #build()} and {@link #getObject()} but checks the state to
100-
* determine if {@link #build()} needs to be called first.
101-
* @return the result of {@link #build()} or {@link #getObject()}. If an error occurs
102-
* while building, returns null.
99+
* Similar to {@link SecurityBuilder#build()} and {@link #getObject()} but checks the
100+
* state to determine if {@link SecurityBuilder#build()} needs to be called first.
101+
* @return the result of {@link SecurityBuilder#build()} or {@link #getObject()}. If
102+
* an error occurs while building, returns null.
103103
*/
104104
public O getOrBuild() {
105105
if (!isUnbuilt()) {
@@ -122,7 +122,7 @@ public O getOrBuild() {
122122
* @return the {@link SecurityConfigurerAdapter} for further customizations
123123
* @throws Exception
124124
*/
125-
public <C extends SecurityConfigurer<O, B>> C apply(C configurer) throws Exception {
125+
public <C extends SecurityConfigurer<O, B>> C apply(C configurer) {
126126
add(configurer);
127127
return configurer;
128128
}
@@ -145,7 +145,7 @@ public <C extends SecurityConfigurer<O, B>> C apply(C configurer) throws Excepti
145145
* @throws Exception
146146
* @since 7.0
147147
*/
148-
public <C extends SecurityConfigurerAdapter<O, B>> B with(C configurer) throws Exception {
148+
public <C extends SecurityConfigurerAdapter<O, B>> B with(C configurer) {
149149
return with(configurer, Customizer.withDefaults());
150150
}
151151

@@ -158,7 +158,7 @@ public <C extends SecurityConfigurerAdapter<O, B>> B with(C configurer) throws E
158158
* @since 6.2
159159
*/
160160
@SuppressWarnings("unchecked")
161-
public <C extends SecurityConfigurerAdapter<O, B>> B with(C configurer, Customizer<C> customizer) throws Exception {
161+
public <C extends SecurityConfigurerAdapter<O, B>> B with(C configurer, Customizer<C> customizer) {
162162
configurer.addObjectPostProcessor(this.objectPostProcessor);
163163
configurer.setBuilder((B) this);
164164
add(configurer);
@@ -326,7 +326,7 @@ protected <P> P postProcess(P object) {
326326
* </ul>
327327
*/
328328
@Override
329-
protected final O doBuild() throws Exception {
329+
protected final O doBuild() {
330330
synchronized (this.configurers) {
331331
this.buildState = BuildState.INITIALIZING;
332332
beforeInit();
@@ -346,7 +346,7 @@ protected final O doBuild() throws Exception {
346346
* method. Subclasses may override this method to hook into the lifecycle without
347347
* using a {@link SecurityConfigurer}.
348348
*/
349-
protected void beforeInit() throws Exception {
349+
protected void beforeInit() {
350350
}
351351

352352
/**
@@ -355,17 +355,17 @@ protected void beforeInit() throws Exception {
355355
* override this method to hook into the lifecycle without using a
356356
* {@link SecurityConfigurer}.
357357
*/
358-
protected void beforeConfigure() throws Exception {
358+
protected void beforeConfigure() {
359359
}
360360

361361
/**
362362
* Subclasses must implement this method to build the object that is being returned.
363363
* @return the Object to be buit or null if the implementation allows it
364364
*/
365-
protected abstract O performBuild() throws Exception;
365+
protected abstract O performBuild();
366366

367367
@SuppressWarnings("unchecked")
368-
private void init() throws Exception {
368+
private void init() {
369369
Collection<SecurityConfigurer<O, B>> configurers = getConfigurers();
370370
for (SecurityConfigurer<O, B> configurer : configurers) {
371371
configurer.init((B) this);
@@ -380,7 +380,7 @@ private void init() throws Exception {
380380
}
381381

382382
@SuppressWarnings("unchecked")
383-
private void configure() throws Exception {
383+
private void configure() {
384384
Collection<SecurityConfigurer<O, B>> configurers = getConfigurers();
385385
for (SecurityConfigurer<O, B> configurer : configurers) {
386386
configurer.configure((B) this);

config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public abstract class AbstractSecurityBuilder<O> implements SecurityBuilder<O> {
3333
private O object;
3434

3535
@Override
36-
public final O build() throws Exception {
36+
public final O build() {
3737
if (this.building.compareAndSet(false, true)) {
3838
this.object = doBuild();
3939
return this.object;
@@ -55,9 +55,9 @@ public final O getObject() {
5555

5656
/**
5757
* Subclasses should implement this to perform the build.
58-
* @return the object that should be returned by {@link #build()}.
58+
* @return the object that should be returned by {@link SecurityBuilder#build()}.
5959
* @throws Exception if an error occurs
6060
*/
61-
protected abstract O doBuild() throws Exception;
61+
protected abstract O doBuild();
6262

6363
}

config/src/main/java/org/springframework/security/config/annotation/AlreadyBuiltException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.security.config.annotation;
1818

1919
/**
20-
* Thrown when {@link AbstractSecurityBuilder#build()} is two or more times.
20+
* Thrown when {@link SecurityBuilder#build()} is two or more times.
2121
*
2222
* @author Rob Winch
2323
* @since 3.2

config/src/main/java/org/springframework/security/config/annotation/SecurityBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ public interface SecurityBuilder<O> {
3030
* @return the Object to be built or null if the implementation allows it.
3131
* @throws Exception if an error occurred when building the Object
3232
*/
33-
O build() throws Exception;
33+
O build();
3434

3535
}

config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public interface SecurityConfigurer<O, B extends SecurityBuilder<O>> {
3838
* @param builder
3939
* @throws Exception
4040
*/
41-
void init(B builder) throws Exception;
41+
void init(B builder);
4242

4343
/**
4444
* Configure the {@link SecurityBuilder} by setting the necessary properties on the
4545
* {@link SecurityBuilder}.
4646
* @param builder
4747
* @throws Exception
4848
*/
49-
void configure(B builder) throws Exception;
49+
void configure(B builder);
5050

5151
}

config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
4444
private CompositeObjectPostProcessor objectPostProcessor = new CompositeObjectPostProcessor();
4545

4646
@Override
47-
public void init(B builder) throws Exception {
47+
public void init(B builder) {
4848
}
4949

5050
@Override
51-
public void configure(B builder) throws Exception {
51+
public void configure(B builder) {
5252
}
5353

5454
/**

config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,7 @@ public AuthenticationManagerBuilder eraseCredentials(boolean eraseCredentials) {
127127
* the in memory authentication
128128
* @throws Exception if an error occurs when adding the in memory authentication
129129
*/
130-
public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication()
131-
throws Exception {
130+
public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication() {
132131
return apply(new InMemoryUserDetailsManagerConfigurer<>());
133132
}
134133

@@ -156,7 +155,7 @@ public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemo
156155
* JDBC authentication
157156
* @throws Exception if an error occurs when adding the JDBC authentication
158157
*/
159-
public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication() throws Exception {
158+
public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication() {
160159
return apply(new JdbcUserDetailsManagerConfigurer<>());
161160
}
162161

@@ -177,7 +176,7 @@ public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthen
177176
* based authentication
178177
*/
179178
public <T extends UserDetailsService> DaoAuthenticationConfigurer<AuthenticationManagerBuilder, T> userDetailsService(
180-
T userDetailsService) throws Exception {
179+
T userDetailsService) {
181180
this.defaultUserDetailsService = userDetailsService;
182181
return apply(new DaoAuthenticationConfigurer<>(userDetailsService));
183182
}
@@ -222,7 +221,7 @@ public AuthenticationManagerBuilder authenticationProvider(AuthenticationProvide
222221
}
223222

224223
@Override
225-
protected ProviderManager performBuild() throws Exception {
224+
protected ProviderManager performBuild() {
226225
if (!isConfigured()) {
227226
this.logger.debug("No authenticationProviders and no parentAuthenticationManager defined. Returning null.");
228227
return null;
@@ -277,7 +276,7 @@ public UserDetailsService getDefaultUserDetailsService() {
277276
* @throws Exception if an error occurs
278277
*/
279278
private <C extends UserDetailsAwareConfigurer<AuthenticationManagerBuilder, ? extends UserDetailsService>> C apply(
280-
C configurer) throws Exception {
279+
C configurer) {
281280
this.defaultUserDetailsService = configurer.getUserDetailsService();
282281
with(configurer);
283282
return configurer;

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static InitializeAuthenticationProviderBeanManagerConfigurer initializeAu
107107
return new InitializeAuthenticationProviderBeanManagerConfigurer(context);
108108
}
109109

110-
public AuthenticationManager getAuthenticationManager() throws Exception {
110+
public AuthenticationManager getAuthenticationManager() {
111111
if (this.authenticationManagerInitialized) {
112112
return this.authenticationManager;
113113
}
@@ -274,19 +274,18 @@ static class DefaultPasswordEncoderAuthenticationManagerBuilder extends Authenti
274274
}
275275

276276
@Override
277-
public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication()
278-
throws Exception {
277+
public InMemoryUserDetailsManagerConfigurer<AuthenticationManagerBuilder> inMemoryAuthentication() {
279278
return super.inMemoryAuthentication().passwordEncoder(this.defaultPasswordEncoder);
280279
}
281280

282281
@Override
283-
public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication() throws Exception {
282+
public JdbcUserDetailsManagerConfigurer<AuthenticationManagerBuilder> jdbcAuthentication() {
284283
return super.jdbcAuthentication().passwordEncoder(this.defaultPasswordEncoder);
285284
}
286285

287286
@Override
288287
public <T extends UserDetailsService> DaoAuthenticationConfigurer<AuthenticationManagerBuilder, T> userDetailsService(
289-
T userDetailsService) throws Exception {
288+
T userDetailsService) {
290289
return super.userDetailsService(userDetailsService).passwordEncoder(this.defaultPasswordEncoder);
291290
}
292291

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/GlobalAuthenticationConfigurerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public abstract class GlobalAuthenticationConfigurerAdapter
3535
implements SecurityConfigurer<AuthenticationManager, AuthenticationManagerBuilder> {
3636

3737
@Override
38-
public void init(AuthenticationManagerBuilder auth) throws Exception {
38+
public void init(AuthenticationManagerBuilder auth) {
3939
}
4040

4141
@Override
42-
public void configure(AuthenticationManagerBuilder auth) throws Exception {
42+
public void configure(AuthenticationManagerBuilder auth) {
4343
}
4444

4545
}

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class InitializeAuthenticationProviderBeanManagerConfigurer extends GlobalAuthen
4949
}
5050

5151
@Override
52-
public void init(AuthenticationManagerBuilder auth) throws Exception {
52+
public void init(AuthenticationManagerBuilder auth) {
5353
auth.apply(new InitializeAuthenticationProviderManagerConfigurer());
5454
}
5555

0 commit comments

Comments
 (0)