Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-10-22 18:28:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean Up Generic Typing in Builder

Browse Source 
Issue gh-17997
This commit is contained in:
Josh Cummings 2025-10-17 11:12:50 -06:00
parent 4b810a8971
commit a435175723
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/springframework/security/authorization/AllRequiredFactorsAuthorizationManager.java
View File

@ -166,7 +166,7 @@ public final class AllRequiredFactorsAuthorizationManager<T> implements Authoriz
* @param requiredFactor the {@link Consumer} to invoke. * @param requiredFactor the {@link Consumer} to invoke.
* @return the builder. * @return the builder.
*/ */
public Builder requireFactor(Consumer<RequiredFactor.Builder> requiredFactor) { public Builder<T> requireFactor(Consumer<RequiredFactor.Builder> requiredFactor) {
Assert.notNull(requiredFactor, "requiredFactor cannot be null"); Assert.notNull(requiredFactor, "requiredFactor cannot be null");
RequiredFactor.Builder builder = RequiredFactor.builder(); RequiredFactor.Builder builder = RequiredFactor.builder();
requiredFactor.accept(builder); requiredFactor.accept(builder);
@ -178,7 +178,7 @@ public final class AllRequiredFactorsAuthorizationManager<T> implements Authoriz
* @param requiredFactor the requiredFactor to add. Cannot be null. * @param requiredFactor the requiredFactor to add. Cannot be null.
* @return the builder. * @return the builder.
*/ */
public Builder requireFactor(RequiredFactor requiredFactor) { public Builder<T> requireFactor(RequiredFactor requiredFactor) {
Assert.notNull(requiredFactor, "requiredFactor cannot be null"); Assert.notNull(requiredFactor, "requiredFactor cannot be null");
this.requiredFactors.add(requiredFactor); this.requiredFactors.add(requiredFactor);
return this; return this;
@ -186,10 +186,9 @@ public final class AllRequiredFactorsAuthorizationManager<T> implements Authoriz
/** /**
* Builds the {@link AllRequiredFactorsAuthorizationManager}. * Builds the {@link AllRequiredFactorsAuthorizationManager}.
* @param <T> the type.
* @return the {@link AllRequiredFactorsAuthorizationManager} * @return the {@link AllRequiredFactorsAuthorizationManager}
*/ */
public <T> AllRequiredFactorsAuthorizationManager<T> build() { public AllRequiredFactorsAuthorizationManager<T> build() {
Assert.state(!this.requiredFactors.isEmpty(), "requiredFactors cannot be empty"); Assert.state(!this.requiredFactors.isEmpty(), "requiredFactors cannot be empty");
return new AllRequiredFactorsAuthorizationManager<T>(this.requiredFactors); return new AllRequiredFactorsAuthorizationManager<T>(this.requiredFactors);
} }