Skip to content

Remove redundant branches from SessionManagementConfigurer #7879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove redundant branches from SessionManagementConfigurer #7879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions ...ringframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,17 +557,13 @@ InvalidSessionStrategy getInvalidSessionStrategy() {
if (this.invalidSessionStrategy != null) {
return this.invalidSessionStrategy;
}
if (this.invalidSessionUrl != null) {
this.invalidSessionStrategy = new SimpleRedirectInvalidSessionStrategy(
this.invalidSessionUrl);
}

if (this.invalidSessionUrl == null) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OrangeDog Thanks for looking into this.

Taking a look at getExpiredSessionStrategy below, it looks like there may be an opportunity for cleanup there as well.

What would you think of making these two methods look the same, something like:

if (strategy != null) {
    return strategy;
}

if (url == null) {
    return null;
}

strategy = // get the default strategy
return strategy;

I believe this would get rid of the dead branches as well as keep each if statement simple.

return null;
}
if (this.invalidSessionStrategy == null) {
this.invalidSessionStrategy = new SimpleRedirectInvalidSessionStrategy(

this.invalidSessionStrategy = new SimpleRedirectInvalidSessionStrategy(
this.invalidSessionUrl);
}
return this.invalidSessionStrategy;
}

Expand All @@ -580,10 +576,8 @@ SessionInformationExpiredStrategy getExpiredSessionStrategy() {
return null;
}

if (this.expiredSessionStrategy == null) {
this.expiredSessionStrategy = new SimpleRedirectSessionInformationExpiredStrategy(
this.expiredUrl);
}
this.expiredSessionStrategy = new SimpleRedirectSessionInformationExpiredStrategy(
this.expiredUrl);
return this.expiredSessionStrategy;
}

Expand All @@ -596,10 +590,8 @@ AuthenticationFailureHandler getSessionAuthenticationFailureHandler() {
return null;
}

if (this.sessionAuthenticationFailureHandler == null) {
this.sessionAuthenticationFailureHandler = new SimpleUrlAuthenticationFailureHandler(
this.sessionAuthenticationErrorUrl);
}
this.sessionAuthenticationFailureHandler = new SimpleUrlAuthenticationFailureHandler(
this.sessionAuthenticationErrorUrl);
return this.sessionAuthenticationFailureHandler;
}

Expand Down