Avoid inner assignments
Replace code of the form `a = b =c` with distinct statements. Although this results in more lines of code, they are usually easier to understand. Issue gh-8945
This commit is contained in:
parent
9e08b51ed3
commit
418c3d6808
|
@ -73,7 +73,9 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
|
||||||
this.gaGeneralChanges = auths[2];
|
this.gaGeneralChanges = auths[2];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.gaTakeOwnership = this.gaModifyAuditing = this.gaGeneralChanges = auths[0];
|
this.gaTakeOwnership = auths[0];
|
||||||
|
this.gaModifyAuditing = auths[0];
|
||||||
|
this.gaGeneralChanges = auths[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -202,7 +202,8 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar
|
||||||
if (result == null && this.parent != null) {
|
if (result == null && this.parent != null) {
|
||||||
// Allow the parent to try.
|
// Allow the parent to try.
|
||||||
try {
|
try {
|
||||||
result = parentResult = this.parent.authenticate(authentication);
|
parentResult = this.parent.authenticate(authentication);
|
||||||
|
result = parentResult;
|
||||||
}
|
}
|
||||||
catch (ProviderNotFoundException e) {
|
catch (ProviderNotFoundException e) {
|
||||||
// ignore as we will throw below if no other exception occurred prior to
|
// ignore as we will throw below if no other exception occurred prior to
|
||||||
|
@ -211,7 +212,8 @@ public class ProviderManager implements AuthenticationManager, MessageSourceAwar
|
||||||
// handled the request
|
// handled the request
|
||||||
}
|
}
|
||||||
catch (AuthenticationException e) {
|
catch (AuthenticationException e) {
|
||||||
lastException = parentException = e;
|
parentException = e;
|
||||||
|
lastException = e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
|
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
|
||||||
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
|
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
|
||||||
<suppressions>
|
<suppressions>
|
||||||
<suppress files=".*" checks="InnerAssignment" />
|
|
||||||
<suppress files=".*" checks="InnerTypeLast" />
|
<suppress files=".*" checks="InnerTypeLast" />
|
||||||
<suppress files=".*" checks="InterfaceIsType" />
|
<suppress files=".*" checks="InterfaceIsType" />
|
||||||
<suppress files=".*" checks="JavadocMethod" />
|
<suppress files=".*" checks="JavadocMethod" />
|
||||||
|
|
|
@ -83,8 +83,8 @@ public class CustomUserTypesOAuth2UserService implements OAuth2UserService<OAuth
|
||||||
public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
|
public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
|
||||||
Assert.notNull(userRequest, "userRequest cannot be null");
|
Assert.notNull(userRequest, "userRequest cannot be null");
|
||||||
String registrationId = userRequest.getClientRegistration().getRegistrationId();
|
String registrationId = userRequest.getClientRegistration().getRegistrationId();
|
||||||
Class<? extends OAuth2User> customUserType;
|
Class<? extends OAuth2User> customUserType = this.customUserTypes.get(registrationId);
|
||||||
if ((customUserType = this.customUserTypes.get(registrationId)) == null) {
|
if (customUserType == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,8 @@ public class ContextPropagatingRemoteInvocation extends RemoteInvocation {
|
||||||
this.credentials = userCredentials == null ? null : userCredentials.toString();
|
this.credentials = userCredentials == null ? null : userCredentials.toString();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
this.principal = this.credentials = null;
|
this.credentials = null;
|
||||||
|
this.principal = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
|
|
Loading…
Reference in New Issue