diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
index 98dcc1e874f..e58d3d5562c 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java
@@ -125,7 +125,7 @@ public boolean equals(Object arg0) {
@Override
public int hashCode() {
int result = this.permission.hashCode();
- result = 31 * result + (this.id != null ? this.id.hashCode() : 0);
+ result = 31 * result + ((this.id != null) ? this.id.hashCode() : 0);
result = 31 * result + (this.sid.hashCode());
result = 31 * result + (this.auditFailure ? 1 : 0);
result = 31 * result + (this.auditSuccess ? 1 : 0);
diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
index 3ef40c7b47a..bbba414e961 100644
--- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
+++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
@@ -307,15 +307,15 @@ public boolean equals(Object obj) {
@Override
public int hashCode() {
- int result = this.parentAcl != null ? this.parentAcl.hashCode() : 0;
+ int result = (this.parentAcl != null) ? this.parentAcl.hashCode() : 0;
result = 31 * result + this.aclAuthorizationStrategy.hashCode();
result = 31 * result
- + (this.permissionGrantingStrategy != null ? this.permissionGrantingStrategy.hashCode() : 0);
- result = 31 * result + (this.aces != null ? this.aces.hashCode() : 0);
+ + ((this.permissionGrantingStrategy != null) ? this.permissionGrantingStrategy.hashCode() : 0);
+ result = 31 * result + ((this.aces != null) ? this.aces.hashCode() : 0);
result = 31 * result + this.objectIdentity.hashCode();
result = 31 * result + this.id.hashCode();
- result = 31 * result + (this.owner != null ? this.owner.hashCode() : 0);
- result = 31 * result + (this.loadedSids != null ? this.loadedSids.hashCode() : 0);
+ result = 31 * result + ((this.owner != null) ? this.owner.hashCode() : 0);
+ result = 31 * result + ((this.loadedSids != null) ? this.loadedSids.hashCode() : 0);
result = 31 * result + (this.entriesInheriting ? 1 : 0);
return result;
}
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
index f44403e8298..1b35db4a77e 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAuthenticationToken.java
@@ -26,6 +26,7 @@
import org.springframework.security.core.SpringSecurityCoreVersion;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
/**
* Represents a successful CAS Authentication
.
@@ -141,7 +142,7 @@ public int hashCode() {
result = 31 * result + this.principal.hashCode();
result = 31 * result + this.userDetails.hashCode();
result = 31 * result + this.keyHash;
- result = 31 * result + (this.assertion != null ? this.assertion.hashCode() : 0);
+ result = 31 * result + ObjectUtils.nullSafeHashCode(this.assertion);
return result;
}
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
index 4d54de1aedf..68fcd3caaf9 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/EhCacheBasedTicketCache.java
@@ -49,7 +49,7 @@ public CasAuthenticationToken getByTicketId(final String serviceTicket) {
logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket);
}
- return element == null ? null : (CasAuthenticationToken) element.getValue();
+ return (element != null) ? (CasAuthenticationToken) element.getValue() : null;
}
public Ehcache getCache() {
diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
index 35eb7b084e3..33d3ce49a63 100644
--- a/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
+++ b/cas/src/main/java/org/springframework/security/cas/authentication/SpringCacheBasedTicketCache.java
@@ -42,13 +42,13 @@ public SpringCacheBasedTicketCache(Cache cache) {
@Override
public CasAuthenticationToken getByTicketId(final String serviceTicket) {
- final Cache.ValueWrapper element = serviceTicket != null ? this.cache.get(serviceTicket) : null;
+ final Cache.ValueWrapper element = (serviceTicket != null) ? this.cache.get(serviceTicket) : null;
if (logger.isDebugEnabled()) {
logger.debug("Cache hit: " + (element != null) + "; service ticket: " + serviceTicket);
}
- return element == null ? null : (CasAuthenticationToken) element.get();
+ return (element != null) ? (CasAuthenticationToken) element.get() : null;
}
@Override
diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
index 6bce596593c..9273bee2afe 100644
--- a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
+++ b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java
@@ -151,7 +151,7 @@ public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition,
private void reportUnsupportedNodeType(String name, ParserContext pc, Node node) {
pc.getReaderContext().fatal("Security namespace does not support decoration of "
- + (node instanceof Element ? "element" : "attribute") + " [" + name + "]", node);
+ + ((node instanceof Element) ? "element" : "attribute") + " [" + name + "]", node);
}
private void reportMissingWebClasses(String nodeName, ParserContext pc, Node node) {
diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
index 54a97b4d677..389a39eda60 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java
@@ -187,8 +187,8 @@ protected GrantedAuthoritiesMapper getAuthoritiesMapper() throws Exception {
* @return the {@link LdapAuthenticator} to use
*/
private LdapAuthenticator createLdapAuthenticator(BaseLdapPathContextSource contextSource) {
- AbstractLdapAuthenticator ldapAuthenticator = this.passwordEncoder == null
- ? createBindAuthenticator(contextSource) : createPasswordCompareAuthenticator(contextSource);
+ AbstractLdapAuthenticator ldapAuthenticator = (this.passwordEncoder != null)
+ ? createPasswordCompareAuthenticator(contextSource) : createBindAuthenticator(contextSource);
LdapUserSearch userSearch = createUserSearch();
if (userSearch != null) {
ldapAuthenticator.setUserSearch(userSearch);
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
index 92871d5519f..054896575c1 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
@@ -247,7 +247,7 @@ private RequestMatchers() {
* @return a {@link List} of {@link AntPathRequestMatcher} instances
*/
static List antMatchers(HttpMethod httpMethod, String... antPatterns) {
- String method = httpMethod == null ? null : httpMethod.toString();
+ String method = (httpMethod != null) ? httpMethod.toString() : null;
List matchers = new ArrayList<>();
for (String pattern : antPatterns) {
matchers.add(new AntPathRequestMatcher(pattern, method));
@@ -275,7 +275,7 @@ static List antMatchers(String... antPatterns) {
* @return a {@link List} of {@link RegexRequestMatcher} instances
*/
static List regexMatchers(HttpMethod httpMethod, String... regexPatterns) {
- String method = httpMethod == null ? null : httpMethod.toString();
+ String method = (httpMethod != null) ? httpMethod.toString() : null;
List matchers = new ArrayList<>();
for (String pattern : regexPatterns) {
matchers.add(new RegexRequestMatcher(pattern, method));
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
index 0acebe06fdb..5ff35ec68fc 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java
@@ -242,8 +242,8 @@ public WebInvocationPrivilegeEvaluator getPrivilegeEvaluator() {
if (this.privilegeEvaluator != null) {
return this.privilegeEvaluator;
}
- return this.filterSecurityInterceptor == null ? null
- : new DefaultWebInvocationPrivilegeEvaluator(this.filterSecurityInterceptor);
+ return (this.filterSecurityInterceptor != null)
+ ? new DefaultWebInvocationPrivilegeEvaluator(this.filterSecurityInterceptor) : null;
}
/**
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
index be2b1d22c7b..2294bdc25df 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
@@ -227,7 +227,7 @@ private static int lookupOrder(Object obj) {
return ((Ordered) obj).getOrder();
}
if (obj != null) {
- Class> clazz = (obj instanceof Class ? (Class>) obj : obj.getClass());
+ Class> clazz = ((obj instanceof Class) ? (Class>) obj : obj.getClass());
Order order = AnnotationUtils.findAnnotation(clazz, Order.class);
if (order != null) {
return order.value();
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
index 0cf5b512243..078adc18b0f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
@@ -230,7 +230,7 @@ private J2eePreAuthenticatedProcessingFilter getFilter(AuthenticationManager aut
* @return the {@link AuthenticationUserDetailsService} to use
*/
private AuthenticationUserDetailsService getUserDetailsService() {
- return this.authenticationUserDetailsService == null
+ return (this.authenticationUserDetailsService != null)
? new PreAuthenticatedGrantedAuthoritiesUserDetailsService() : this.authenticationUserDetailsService;
}
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
index f710b7a7a48..1c54f5e440f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java
@@ -369,8 +369,8 @@ private RememberMeServices getRememberMeServices(H http, String key) throws Exce
* @return the {@link RememberMeServices} to use
*/
private AbstractRememberMeServices createRememberMeServices(H http, String key) {
- return this.tokenRepository == null ? createTokenBasedRememberMeServices(http, key)
- : createPersistentRememberMeServices(http, key);
+ return (this.tokenRepository != null) ? createPersistentRememberMeServices(http, key)
+ : createTokenBasedRememberMeServices(http, key);
}
/**
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
index 07dba220375..acd06c1221f 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java
@@ -90,8 +90,8 @@ public void configure(H http) {
SecurityContextPersistenceFilter securityContextFilter = new SecurityContextPersistenceFilter(
securityContextRepository);
SessionManagementConfigurer> sessionManagement = http.getConfigurer(SessionManagementConfigurer.class);
- SessionCreationPolicy sessionCreationPolicy = sessionManagement == null ? null
- : sessionManagement.getSessionCreationPolicy();
+ SessionCreationPolicy sessionCreationPolicy = (sessionManagement != null)
+ ? sessionManagement.getSessionCreationPolicy() : null;
if (SessionCreationPolicy.ALWAYS == sessionCreationPolicy) {
securityContextFilter.setForceEagerSessionCreation(true);
}
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
index 3a3373d6342..5959d9d08e8 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java
@@ -80,11 +80,11 @@ public ServletApiConfigurer rolePrefix(String rolePrefix) {
public void configure(H http) {
this.securityContextRequestFilter.setAuthenticationManager(http.getSharedObject(AuthenticationManager.class));
ExceptionHandlingConfigurer exceptionConf = http.getConfigurer(ExceptionHandlingConfigurer.class);
- AuthenticationEntryPoint authenticationEntryPoint = exceptionConf == null ? null
- : exceptionConf.getAuthenticationEntryPoint(http);
+ AuthenticationEntryPoint authenticationEntryPoint = (exceptionConf != null)
+ ? exceptionConf.getAuthenticationEntryPoint(http) : null;
this.securityContextRequestFilter.setAuthenticationEntryPoint(authenticationEntryPoint);
LogoutConfigurer logoutConf = http.getConfigurer(LogoutConfigurer.class);
- List logoutHandlers = logoutConf == null ? null : logoutConf.getLogoutHandlers();
+ List logoutHandlers = (logoutConf != null) ? logoutConf.getLogoutHandlers() : null;
this.securityContextRequestFilter.setLogoutHandlers(logoutHandlers);
AuthenticationTrustResolver trustResolver = http.getSharedObject(AuthenticationTrustResolver.class);
if (trustResolver != null) {
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
index c2484701e8f..59146667e4b 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java
@@ -451,7 +451,7 @@ SessionCreationPolicy getSessionCreationPolicy() {
}
SessionCreationPolicy sessionPolicy = getBuilder().getSharedObject(SessionCreationPolicy.class);
- return sessionPolicy == null ? SessionCreationPolicy.IF_REQUIRED : sessionPolicy;
+ return (sessionPolicy != null) ? sessionPolicy : SessionCreationPolicy.IF_REQUIRED;
}
/**
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java
index 9fd1e1ead2e..51d151c9eda 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/ImplicitGrantConfigurer.java
@@ -98,7 +98,7 @@ public void configure(B http) {
}
private String getAuthorizationRequestBaseUri() {
- return this.authorizationRequestBaseUri != null ? this.authorizationRequestBaseUri
+ return (this.authorizationRequestBaseUri != null) ? this.authorizationRequestBaseUri
: OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI;
}
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java
index 1d111b866af..bab025eff03 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java
@@ -500,7 +500,7 @@ private Map getLoginLinks() {
return Collections.emptyMap();
}
- String authorizationRequestBaseUri = this.authorizationEndpointConfig.authorizationRequestBaseUri != null
+ String authorizationRequestBaseUri = (this.authorizationEndpointConfig.authorizationRequestBaseUri != null)
? this.authorizationEndpointConfig.authorizationRequestBaseUri
: OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI;
Map loginUrlToClientName = new HashMap<>();
diff --git a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
index 6dad4e1ca02..f0dc1257781 100644
--- a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java
@@ -107,8 +107,8 @@ static RootBeanDefinition createSecurityMetadataSource(List interceptUr
if (useExpressions) {
Element expressionHandlerElt = DomUtils.getChildElementByTagName(httpElt, Elements.EXPRESSION_HANDLER);
- String expressionHandlerRef = expressionHandlerElt == null ? null
- : expressionHandlerElt.getAttribute("ref");
+ String expressionHandlerRef = (expressionHandlerElt != null) ? expressionHandlerElt.getAttribute("ref")
+ : null;
if (StringUtils.hasText(expressionHandlerRef)) {
logger.info(
diff --git a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
index bb3d74138b4..c39c6a303ab 100644
--- a/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java
@@ -168,7 +168,7 @@ public BeanDefinition parse(Element elt, ParserContext pc) {
BeanDefinitionBuilder entryPointBuilder = BeanDefinitionBuilder
.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class);
entryPointBuilder.getRawBeanDefinition().setSource(source);
- entryPointBuilder.addConstructorArgValue(this.loginPage != null ? this.loginPage : DEF_LOGIN_PAGE);
+ entryPointBuilder.addConstructorArgValue((this.loginPage != null) ? this.loginPage : DEF_LOGIN_PAGE);
entryPointBuilder.addPropertyValue("portMapper", this.portMapper);
entryPointBuilder.addPropertyValue("portResolver", this.portResolver);
this.entryPointBean = (RootBeanDefinition) entryPointBuilder.getBeanDefinition();
diff --git a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
index d1a4d4c5526..c4f96eba3a8 100644
--- a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
@@ -177,8 +177,8 @@ private String resolveAttribute(ParserContext pc, Element element, String attrib
}
private void parseCacheControlElement(boolean addIfNotPresent, Element element) {
- Element cacheControlElement = element == null ? null
- : DomUtils.getChildElementByTagName(element, CACHE_CONTROL_ELEMENT);
+ Element cacheControlElement = (element != null)
+ ? DomUtils.getChildElementByTagName(element, CACHE_CONTROL_ELEMENT) : null;
boolean disabled = "true".equals(getAttribute(cacheControlElement, ATT_DISABLED, "false"));
if (disabled) {
return;
@@ -195,7 +195,7 @@ private void addCacheControl() {
}
private void parseHstsElement(boolean addIfNotPresent, Element element, ParserContext context) {
- Element hstsElement = element == null ? null : DomUtils.getChildElementByTagName(element, HSTS_ELEMENT);
+ Element hstsElement = (element != null) ? DomUtils.getChildElementByTagName(element, HSTS_ELEMENT) : null;
if (addIfNotPresent || hstsElement != null) {
addHsts(addIfNotPresent, hstsElement, context);
}
@@ -244,7 +244,7 @@ private void addHsts(boolean addIfNotPresent, Element hstsElement, ParserContext
}
private void parseHpkpElement(boolean addIfNotPresent, Element element, ParserContext context) {
- Element hpkpElement = element == null ? null : DomUtils.getChildElementByTagName(element, HPKP_ELEMENT);
+ Element hpkpElement = (element != null) ? DomUtils.getChildElementByTagName(element, HPKP_ELEMENT) : null;
if (addIfNotPresent || hpkpElement != null) {
addHpkp(addIfNotPresent, hpkpElement, context);
}
@@ -342,8 +342,8 @@ private void addContentSecurityPolicy(Element contentSecurityPolicyElement, Pars
}
private void parseReferrerPolicyElement(Element element, ParserContext context) {
- Element referrerPolicyElement = (element == null) ? null
- : DomUtils.getChildElementByTagName(element, REFERRER_POLICY_ELEMENT);
+ Element referrerPolicyElement = (element != null)
+ ? DomUtils.getChildElementByTagName(element, REFERRER_POLICY_ELEMENT) : null;
if (referrerPolicyElement != null) {
addReferrerPolicy(referrerPolicyElement, context);
}
@@ -361,8 +361,8 @@ private void addReferrerPolicy(Element referrerPolicyElement, ParserContext cont
}
private void parseFeaturePolicyElement(Element element, ParserContext context) {
- Element featurePolicyElement = (element == null) ? null
- : DomUtils.getChildElementByTagName(element, FEATURE_POLICY_ELEMENT);
+ Element featurePolicyElement = (element != null)
+ ? DomUtils.getChildElementByTagName(element, FEATURE_POLICY_ELEMENT) : null;
if (featurePolicyElement != null) {
addFeaturePolicy(featurePolicyElement, context);
}
@@ -390,8 +390,8 @@ private void attrNotAllowed(ParserContext context, String attrName, String other
}
private void parseHeaderElements(Element element) {
- List headerElts = element == null ? Collections.emptyList()
- : DomUtils.getChildElementsByTagName(element, GENERIC_HEADER_ELEMENT);
+ List headerElts = (element != null)
+ ? DomUtils.getChildElementsByTagName(element, GENERIC_HEADER_ELEMENT) : Collections.emptyList();
for (Element headerElt : headerElts) {
String headerFactoryRef = headerElt.getAttribute(ATT_REF);
if (StringUtils.hasText(headerFactoryRef)) {
@@ -407,8 +407,8 @@ private void parseHeaderElements(Element element) {
}
private void parseContentTypeOptionsElement(boolean addIfNotPresent, Element element) {
- Element contentTypeElt = element == null ? null
- : DomUtils.getChildElementByTagName(element, CONTENT_TYPE_ELEMENT);
+ Element contentTypeElt = (element != null) ? DomUtils.getChildElementByTagName(element, CONTENT_TYPE_ELEMENT)
+ : null;
boolean disabled = "true".equals(getAttribute(contentTypeElt, ATT_DISABLED, "false"));
if (disabled) {
return;
@@ -504,7 +504,7 @@ private BeanDefinitionBuilder getAllowFromStrategy(String strategy, String value
}
private void parseXssElement(boolean addIfNotPresent, Element element, ParserContext parserContext) {
- Element xssElt = element == null ? null : DomUtils.getChildElementByTagName(element, XSS_ELEMENT);
+ Element xssElt = (element != null) ? DomUtils.getChildElementByTagName(element, XSS_ELEMENT) : null;
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(XXssProtectionHeaderWriter.class);
if (xssElt != null) {
boolean disabled = "true".equals(getAttribute(xssElt, ATT_DISABLED, "false"));
diff --git a/config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java
index 4807a4bb6a3..9122d286910 100644
--- a/config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java
@@ -83,7 +83,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
BeanDefinitionBuilder authorizationRequestRedirectFilterBuilder = BeanDefinitionBuilder
.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
- String authorizationRequestResolverRef = authorizationCodeGrantElt != null
+ String authorizationRequestResolverRef = (authorizationCodeGrantElt != null)
? authorizationCodeGrantElt.getAttribute(ATT_AUTHORIZATION_REQUEST_RESOLVER_REF) : null;
if (!StringUtils.isEmpty(authorizationRequestResolverRef)) {
authorizationRequestRedirectFilterBuilder.addConstructorArgReference(authorizationRequestResolverRef);
@@ -112,7 +112,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
private BeanMetadataElement getAuthorizationRequestRepository(Element element) {
BeanMetadataElement authorizationRequestRepository;
- String authorizationRequestRepositoryRef = element != null
+ String authorizationRequestRepositoryRef = (element != null)
? element.getAttribute(ATT_AUTHORIZATION_REQUEST_REPOSITORY_REF) : null;
if (!StringUtils.isEmpty(authorizationRequestRepositoryRef)) {
authorizationRequestRepository = new RuntimeBeanReference(authorizationRequestRepositoryRef);
@@ -127,7 +127,7 @@ private BeanMetadataElement getAuthorizationRequestRepository(Element element) {
private BeanMetadataElement getAccessTokenResponseClient(Element element) {
BeanMetadataElement accessTokenResponseClient;
- String accessTokenResponseClientRef = element != null
+ String accessTokenResponseClientRef = (element != null)
? element.getAttribute(ATT_ACCESS_TOKEN_RESPONSE_CLIENT_REF) : null;
if (!StringUtils.isEmpty(accessTokenResponseClientRef)) {
accessTokenResponseClient = new RuntimeBeanReference(accessTokenResponseClientRef);
diff --git a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
index 62b0ed52868..fde8ab1571b 100644
--- a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java
@@ -178,8 +178,8 @@ public BeanDefinition parse(Element element, ParserContext pc) {
}
else {
// The default expression-based system
- String expressionHandlerRef = expressionHandlerElt == null ? null
- : expressionHandlerElt.getAttribute("ref");
+ String expressionHandlerRef = (expressionHandlerElt != null) ? expressionHandlerElt.getAttribute("ref")
+ : null;
if (StringUtils.hasText(expressionHandlerRef)) {
this.logger.info(
diff --git a/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java
index a8c3ff9473d..8b0a0011f2b 100644
--- a/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/oauth2/client/ClientRegistrationsBeanDefinitionParser.java
@@ -168,7 +168,7 @@ private Map> getProviders(Element element) {
private static ClientRegistration.Builder getBuilderFromIssuerIfPossible(String registrationId,
String configuredProviderId, Map> providers) {
- String providerId = configuredProviderId != null ? configuredProviderId : registrationId;
+ String providerId = (configuredProviderId != null) ? configuredProviderId : registrationId;
if (providers.containsKey(providerId)) {
Map provider = providers.get(providerId);
String issuer = provider.get(ATT_ISSUER_URI);
@@ -188,7 +188,7 @@ private static ClientRegistration.Builder getBuilder(String registrationId, Stri
if (provider == null && !providers.containsKey(providerId)) {
return null;
}
- ClientRegistration.Builder builder = provider != null ? provider.getBuilder(registrationId)
+ ClientRegistration.Builder builder = (provider != null) ? provider.getBuilder(registrationId)
: ClientRegistration.withRegistrationId(registrationId);
if (providers.containsKey(providerId)) {
return getBuilder(builder, providers.get(providerId));
@@ -251,7 +251,7 @@ private static String getCanonicalName(String name) {
}
private static String getErrorMessage(String configuredProviderId, String registrationId) {
- return configuredProviderId != null ? "Unknown provider ID '" + configuredProviderId + "'"
+ return (configuredProviderId != null) ? "Unknown provider ID '" + configuredProviderId + "'"
: "Provider ID must be specified for client registration '" + registrationId + "'";
}
diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
index f9247744c6a..507be8e9605 100644
--- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
@@ -1467,8 +1467,8 @@ public static ServerHttpSecurity http() {
}
private WebFilter securityContextRepositoryWebFilter() {
- ServerSecurityContextRepository repository = this.securityContextRepository == null
- ? new WebSessionServerSecurityContextRepository() : this.securityContextRepository;
+ ServerSecurityContextRepository repository = (this.securityContextRepository != null)
+ ? this.securityContextRepository : new WebSessionServerSecurityContextRepository();
WebFilter result = new ReactorContextWebFilter(repository);
return new OrderedWebFilter(result, SecurityWebFiltersOrder.REACTOR_CONTEXT.getOrder());
}
diff --git a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
index 7d7426ecbcf..a5316adec50 100644
--- a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
@@ -121,7 +121,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
String id = element.getAttribute(ID_ATTR);
Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, Elements.EXPRESSION_HANDLER);
- String expressionHandlerRef = expressionHandlerElt == null ? null : expressionHandlerElt.getAttribute("ref");
+ String expressionHandlerRef = (expressionHandlerElt != null) ? expressionHandlerElt.getAttribute("ref") : null;
boolean expressionHandlerDefined = StringUtils.hasText(expressionHandlerRef);
boolean sameOriginDisabled = Boolean.parseBoolean(element.getAttribute(DISABLED_ATTR));
@@ -252,7 +252,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
if (!registry.containsBeanDefinition(PATH_MATCHER_BEAN_NAME)) {
PropertyValue pathMatcherProp = bd.getPropertyValues().getPropertyValue("pathMatcher");
- Object pathMatcher = pathMatcherProp == null ? null : pathMatcherProp.getValue();
+ Object pathMatcher = (pathMatcherProp != null) ? pathMatcherProp.getValue() : null;
if (pathMatcher instanceof BeanReference) {
registry.registerAlias(((BeanReference) pathMatcher).getBeanName(), PATH_MATCHER_BEAN_NAME);
}
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
index 1b6955367d4..bd872e58e47 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
@@ -237,7 +237,7 @@ class Controller {
@GetMapping("/authorized-client")
String authorizedClient(
@RegisteredOAuth2AuthorizedClient("client1") OAuth2AuthorizedClient authorizedClient) {
- return authorizedClient != null ? "resolved" : "not-resolved";
+ return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}
@@ -405,7 +405,7 @@ class Controller {
@GetMapping("/authorized-client")
String authorizedClient(
@RegisteredOAuth2AuthorizedClient("client1") OAuth2AuthorizedClient authorizedClient) {
- return authorizedClient != null ? "resolved" : "not-resolved";
+ return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}
diff --git a/config/src/test/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests.java
index 5d4a3568d42..0b0842641d2 100644
--- a/config/src/test/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests.java
@@ -229,7 +229,7 @@ static class AuthorizedClientController {
@GetMapping("/authorized-client")
String authorizedClient(Model model,
@RegisteredOAuth2AuthorizedClient("google") OAuth2AuthorizedClient authorizedClient) {
- return authorizedClient != null ? "resolved" : "not-resolved";
+ return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}
diff --git a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java
index 343c4d64698..190fd7e7049 100644
--- a/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java
@@ -523,7 +523,7 @@ static class AuthorizedClientController {
@GetMapping("/authorized-client")
String authorizedClient(Model model,
@RegisteredOAuth2AuthorizedClient("google") OAuth2AuthorizedClient authorizedClient) {
- return authorizedClient != null ? "resolved" : "not-resolved";
+ return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}
diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java
index 53c2b869134..4f673aa2efe 100644
--- a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java
+++ b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java
@@ -93,7 +93,7 @@ private void contentType(WebTestClient.RequestBodySpec request, WebRequest webRe
contentType = encodingType.getName();
}
}
- MediaType mediaType = contentType == null ? MediaType.ALL : MediaType.parseMediaType(contentType);
+ MediaType mediaType = (contentType != null) ? MediaType.parseMediaType(contentType) : MediaType.ALL;
request.contentType(mediaType);
}
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
index a81fee098f8..722505f22ac 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/AbstractExpressionBasedMethodConfigAttribute.java
@@ -47,16 +47,16 @@ abstract class AbstractExpressionBasedMethodConfigAttribute implements ConfigAtt
Assert.isTrue(filterExpression != null || authorizeExpression != null,
"Filter and authorization Expressions cannot both be null");
SpelExpressionParser parser = new SpelExpressionParser();
- this.filterExpression = filterExpression == null ? null : parser.parseExpression(filterExpression);
- this.authorizeExpression = authorizeExpression == null ? null : parser.parseExpression(authorizeExpression);
+ this.filterExpression = (filterExpression != null) ? parser.parseExpression(filterExpression) : null;
+ this.authorizeExpression = (authorizeExpression != null) ? parser.parseExpression(authorizeExpression) : null;
}
AbstractExpressionBasedMethodConfigAttribute(Expression filterExpression, Expression authorizeExpression)
throws ParseException {
Assert.isTrue(filterExpression != null || authorizeExpression != null,
"Filter and authorization Expressions cannot both be null");
- this.filterExpression = filterExpression == null ? null : filterExpression;
- this.authorizeExpression = authorizeExpression == null ? null : authorizeExpression;
+ this.filterExpression = (filterExpression != null) ? filterExpression : null;
+ this.authorizeExpression = (authorizeExpression != null) ? authorizeExpression : null;
}
Expression getFilterExpression() {
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
index 56c61f1f589..d6fb7619665 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/ExpressionBasedAnnotationAttributeFactory.java
@@ -49,10 +49,10 @@ public PreInvocationAttribute createPreInvocationAttribute(String preFilterAttri
try {
// TODO: Optimization of permitAll
ExpressionParser parser = getParser();
- Expression preAuthorizeExpression = preAuthorizeAttribute == null ? parser.parseExpression("permitAll")
- : parser.parseExpression(preAuthorizeAttribute);
- Expression preFilterExpression = preFilterAttribute == null ? null
- : parser.parseExpression(preFilterAttribute);
+ Expression preAuthorizeExpression = (preAuthorizeAttribute != null)
+ ? parser.parseExpression(preAuthorizeAttribute) : parser.parseExpression("permitAll");
+ Expression preFilterExpression = (preFilterAttribute != null) ? parser.parseExpression(preFilterAttribute)
+ : null;
return new PreInvocationExpressionAttribute(preFilterExpression, filterObject, preAuthorizeExpression);
}
catch (ParseException ex) {
@@ -65,11 +65,10 @@ public PostInvocationAttribute createPostInvocationAttribute(String postFilterAt
String postAuthorizeAttribute) {
try {
ExpressionParser parser = getParser();
- Expression postAuthorizeExpression = postAuthorizeAttribute == null ? null
- : parser.parseExpression(postAuthorizeAttribute);
- Expression postFilterExpression = postFilterAttribute == null ? null
- : parser.parseExpression(postFilterAttribute);
-
+ Expression postAuthorizeExpression = (postAuthorizeAttribute != null)
+ ? parser.parseExpression(postAuthorizeAttribute) : null;
+ Expression postFilterExpression = (postFilterAttribute != null)
+ ? parser.parseExpression(postFilterAttribute) : null;
if (postFilterExpression != null || postAuthorizeExpression != null) {
return new PostInvocationExpressionAttribute(postFilterExpression, postAuthorizeExpression);
}
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
index d85c22b21a6..08d9c6f2b89 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/PostInvocationExpressionAttribute.java
@@ -41,8 +41,8 @@ public String toString() {
StringBuilder sb = new StringBuilder();
Expression authorize = getAuthorizeExpression();
Expression filter = getFilterExpression();
- sb.append("[authorize: '").append(authorize == null ? "null" : authorize.getExpressionString());
- sb.append("', filter: '").append(filter == null ? "null" : filter.getExpressionString()).append("']");
+ sb.append("[authorize: '").append((authorize != null) ? authorize.getExpressionString() : "null");
+ sb.append("', filter: '").append((filter != null) ? filter.getExpressionString() : "null").append("']");
return sb.toString();
}
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
index fdaeb4bf219..5f5ffc56cd1 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/PreInvocationExpressionAttribute.java
@@ -57,8 +57,8 @@ public String toString() {
StringBuilder sb = new StringBuilder();
Expression authorize = getAuthorizeExpression();
Expression filter = getFilterExpression();
- sb.append("[authorize: '").append(authorize == null ? "null" : authorize.getExpressionString());
- sb.append("', filter: '").append(filter == null ? "null" : filter.getExpressionString());
+ sb.append("[authorize: '").append((authorize != null) ? authorize.getExpressionString() : "null");
+ sb.append("', filter: '").append((filter != null) ? filter.getExpressionString() : "null");
sb.append("', filterTarget: '").append(this.filterTarget).append("']");
return sb.toString();
}
diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
index ecd683b892c..31b145f84c3 100644
--- a/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
+++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsUserToken.java
@@ -73,7 +73,7 @@ public Object getPrincipal() {
@Override
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
- String className = this.originalAuthentication == null ? null : this.originalAuthentication.getName();
+ String className = (this.originalAuthentication != null) ? this.originalAuthentication.getName() : null;
sb.append("; Original Class: ").append(className);
return sb.toString();
diff --git a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
index 3b3a9809b4b..9fc07758255 100644
--- a/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java
@@ -44,7 +44,7 @@ public final Collection getAttributes(Object object) {
Class> targetClass = null;
if (target != null) {
- targetClass = target instanceof Class> ? (Class>) target
+ targetClass = (target instanceof Class>) ? (Class>) target
: AopProxyUtils.ultimateTargetClass(target);
}
Collection attrs = getAttributes(mi.getMethod(), targetClass);
diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
index 247f325ff95..583d140b31d 100644
--- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java
@@ -122,12 +122,12 @@ public boolean equals(Object other) {
@Override
public int hashCode() {
- return this.method.hashCode() * 21 + (this.targetClass != null ? this.targetClass.hashCode() : 0);
+ return this.method.hashCode() * 21 + ((this.targetClass != null) ? this.targetClass.hashCode() : 0);
}
@Override
public String toString() {
- return "CacheKey[" + (this.targetClass == null ? "-" : this.targetClass.getName()) + "; " + this.method
+ return "CacheKey[" + ((this.targetClass != null) ? this.targetClass.getName() : "-") + "; " + this.method
+ "]";
}
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java
index 9bd9efd2038..0fc6e502a27 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostAdviceReactiveMethodInterceptor.java
@@ -93,17 +93,17 @@ public Object invoke(final MethodInvocation invocation) {
if (Mono.class.isAssignableFrom(returnType)) {
return toInvoke.flatMap((auth) -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation)
- .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r)));
+ .map((r) -> (attr != null) ? this.postAdvice.after(auth, invocation, attr, r) : r));
}
if (Flux.class.isAssignableFrom(returnType)) {
return toInvoke.flatMapMany((auth) -> PrePostAdviceReactiveMethodInterceptor.>proceed(invocation)
- .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r)));
+ .map((r) -> (attr != null) ? this.postAdvice.after(auth, invocation, attr, r) : r));
}
return toInvoke.flatMapMany(
(auth) -> Flux.from(PrePostAdviceReactiveMethodInterceptor.>proceed(invocation))
- .map((r) -> attr == null ? r : this.postAdvice.after(auth, invocation, attr, r)));
+ .map((r) -> (attr != null) ? this.postAdvice.after(auth, invocation, attr, r) : r));
}
private static > T proceed(final MethodInvocation invocation) {
diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
index 02dfcee0317..ff12befce0f 100644
--- a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
+++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java
@@ -76,11 +76,11 @@ public Collection getAttributes(Method method, Class> targetC
return Collections.emptyList();
}
- String preFilterAttribute = preFilter == null ? null : preFilter.value();
- String filterObject = preFilter == null ? null : preFilter.filterTarget();
- String preAuthorizeAttribute = preAuthorize == null ? null : preAuthorize.value();
- String postFilterAttribute = postFilter == null ? null : postFilter.value();
- String postAuthorizeAttribute = postAuthorize == null ? null : postAuthorize.value();
+ String preFilterAttribute = (preFilter != null) ? preFilter.value() : null;
+ String filterObject = (preFilter != null) ? preFilter.filterTarget() : null;
+ String preAuthorizeAttribute = (preAuthorize != null) ? preAuthorize.value() : null;
+ String postFilterAttribute = (postFilter != null) ? postFilter.value() : null;
+ String postAuthorizeAttribute = (postAuthorize != null) ? postAuthorize.value() : null;
ArrayList attrs = new ArrayList<>(2);
diff --git a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
index 23a6dd5f255..6e9049f7be0 100644
--- a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
+++ b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java
@@ -129,7 +129,7 @@ public void publishAuthenticationFailure(AuthenticationException exception, Auth
private Constructor extends AbstractAuthenticationEvent> getEventConstructor(AuthenticationException exception) {
Constructor extends AbstractAuthenticationEvent> eventConstructor = this.exceptionMappings
.get(exception.getClass().getName());
- return (eventConstructor == null ? this.defaultAuthenticationFailureEventConstructor : eventConstructor);
+ return (eventConstructor != null) ? eventConstructor : this.defaultAuthenticationFailureEventConstructor;
}
@Override
diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
index 9ea78bfd909..8aa767aaa76 100644
--- a/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
+++ b/core/src/main/java/org/springframework/security/authentication/jaas/memory/InMemoryConfiguration.java
@@ -80,7 +80,7 @@ public InMemoryConfiguration(Map mappedConfigur
@Override
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
AppConfigurationEntry[] mappedResult = this.mappedConfigurations.get(name);
- return mappedResult == null ? this.defaultConfiguration : mappedResult;
+ return (mappedResult != null) ? mappedResult : this.defaultConfiguration;
}
/**
diff --git a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
index c7ea764196e..d68867bc7a6 100644
--- a/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
+++ b/core/src/main/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProvider.java
@@ -63,7 +63,7 @@ public void afterPropertiesSet() {
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
String username = authentication.getPrincipal().toString();
Object credentials = authentication.getCredentials();
- String password = credentials == null ? null : credentials.toString();
+ String password = (credentials != null) ? credentials.toString() : null;
Collection extends GrantedAuthority> authorities = this.remoteAuthenticationManager
.attemptAuthentication(username, password);
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
index 977f1fb735b..ea7a1a98496 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java
@@ -113,8 +113,8 @@ public String toString() {
* @return
*/
public static Callable create(Callable delegate, SecurityContext securityContext) {
- return securityContext == null ? new DelegatingSecurityContextCallable<>(delegate)
- : new DelegatingSecurityContextCallable<>(delegate, securityContext);
+ return (securityContext != null) ? new DelegatingSecurityContextCallable<>(delegate, securityContext)
+ : new DelegatingSecurityContextCallable<>(delegate);
}
}
diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
index 6a4182dc3fb..80def0d9cf7 100644
--- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
+++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java
@@ -111,8 +111,8 @@ public String toString() {
*/
public static Runnable create(Runnable delegate, SecurityContext securityContext) {
Assert.notNull(delegate, "delegate cannot be null");
- return securityContext == null ? new DelegatingSecurityContextRunnable(delegate)
- : new DelegatingSecurityContextRunnable(delegate, securityContext);
+ return (securityContext != null) ? new DelegatingSecurityContextRunnable(delegate, securityContext)
+ : new DelegatingSecurityContextRunnable(delegate);
}
}
diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
index 0fa679be955..d8c6fadf927 100644
--- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
+++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java
@@ -55,7 +55,7 @@ private SpringSecurityCoreVersion() {
public static String getVersion() {
Package pkg = SpringSecurityCoreVersion.class.getPackage();
- return (pkg != null ? pkg.getImplementationVersion() : null);
+ return (pkg != null) ? pkg.getImplementationVersion() : null;
}
/**
diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
index 770e0e6d8f7..c07137bb8fc 100755
--- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
+++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java
@@ -109,7 +109,7 @@ public void setConvertAttributeToUpperCase(boolean b) {
}
private String getAttributePrefix() {
- return this.attributePrefix == null ? "" : this.attributePrefix;
+ return (this.attributePrefix != null) ? this.attributePrefix : "";
}
public void setAttributePrefix(String string) {
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java
index 6d543134bb5..2b465afda5b 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java
@@ -67,7 +67,7 @@ public MapReactiveUserDetailsService(Collection users) {
public Mono findByUsername(String username) {
String key = getKey(username);
UserDetails result = this.users.get(key);
- return result == null ? Mono.empty() : Mono.just(User.withUserDetails(result).build());
+ return (result != null) ? Mono.just(User.withUserDetails(result).build()) : Mono.empty();
}
@Override
diff --git a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
index 6b4bdbdfd5d..50f4b46464d 100644
--- a/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
+++ b/core/src/main/java/org/springframework/security/core/userdetails/cache/SpringCacheBasedUserCache.java
@@ -43,7 +43,7 @@ public SpringCacheBasedUserCache(Cache cache) {
@Override
public UserDetails getUserFromCache(String username) {
- Cache.ValueWrapper element = username != null ? this.cache.get(username) : null;
+ Cache.ValueWrapper element = (username != null) ? this.cache.get(username) : null;
if (logger.isDebugEnabled()) {
logger.debug("Cache hit: " + (element != null) + "; username: " + username);
diff --git a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
index 5a890f4dd97..37977d38817 100644
--- a/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
+++ b/core/src/main/java/org/springframework/security/util/SimpleMethodInvocation.java
@@ -37,7 +37,7 @@ public class SimpleMethodInvocation implements MethodInvocation {
public SimpleMethodInvocation(Object targetObject, Method method, Object... arguments) {
this.targetObject = targetObject;
this.method = method;
- this.arguments = arguments == null ? new Object[0] : arguments;
+ this.arguments = (arguments != null) ? arguments : new Object[0];
}
public SimpleMethodInvocation() {
diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
index a60b2a89a75..43311f6f038 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
@@ -97,7 +97,7 @@ public BCryptPasswordEncoder(BCryptVersion version, int strength, SecureRandom r
throw new IllegalArgumentException("Bad strength");
}
this.version = version;
- this.strength = strength == -1 ? 10 : strength;
+ this.strength = (strength == -1) ? 10 : strength;
this.random = random;
}
diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java b/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
index 234882ceaba..998b4df10e9 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/codec/Base64.java
@@ -333,9 +333,9 @@ private static byte[] encode3to4(byte[] source, int srcOffset, int numSigBytes,
// significant bytes passed in the array.
// We have to shift left 24 in order to flush out the 1's that appear
// when Java treats a value as negative that is cast from a byte to an int.
- int inBuff = (numSigBytes > 0 ? ((source[srcOffset] << 24) >>> 8) : 0)
- | (numSigBytes > 1 ? ((source[srcOffset + 1] << 24) >>> 16) : 0)
- | (numSigBytes > 2 ? ((source[srcOffset + 2] << 24) >>> 24) : 0);
+ int inBuff = ((numSigBytes > 0) ? ((source[srcOffset] << 24) >>> 8) : 0)
+ | ((numSigBytes > 1) ? ((source[srcOffset + 1] << 24) >>> 16) : 0)
+ | ((numSigBytes > 2) ? ((source[srcOffset + 2] << 24) >>> 24) : 0);
switch (numSigBytes) {
case 3:
@@ -404,8 +404,10 @@ private static byte[] encodeBytesToBytes(byte[] source, int off, int len, int op
// Try to determine more precisely how big the array needs to be.
// If we get it right, we don't have to do an array copy, and
// we save a bunch of memory.
- int encLen = (len / 3) * 4 + (len % 3 > 0 ? 4 : 0); // Bytes needed for actual
- // encoding
+
+ // Bytes needed for actual encoding
+ int encLen = (len / 3) * 4 + ((len % 3 > 0) ? 4 : 0);
+
if (breakLines) {
encLen += encLen / MAX_LINE_LENGTH; // Plus extra newline characters
}
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
index bf7506bddfe..bed724b6afd 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
@@ -71,7 +71,7 @@ public String toString() {
}
public AlgorithmParameterSpec getParameterSpec(byte[] iv) {
- return this == CBC ? new IvParameterSpec(iv) : new GCMParameterSpec(128, iv);
+ return (this != CBC) ? new GCMParameterSpec(128, iv) : new IvParameterSpec(iv);
}
public Cipher createCipher() {
@@ -110,7 +110,7 @@ public AesBytesEncryptor(SecretKey secretKey, BytesKeyGenerator ivGenerator, Cip
this.alg = alg;
this.encryptor = alg.createCipher();
this.decryptor = alg.createCipher();
- this.ivGenerator = ivGenerator != null ? ivGenerator : alg.defaultIvGenerator();
+ this.ivGenerator = (ivGenerator != null) ? ivGenerator : alg.defaultIvGenerator();
}
@Override
@@ -119,7 +119,7 @@ public byte[] encrypt(byte[] bytes) {
byte[] iv = this.ivGenerator.generateKey();
CipherUtils.initCipher(this.encryptor, Cipher.ENCRYPT_MODE, this.secretKey, this.alg.getParameterSpec(iv));
byte[] encrypted = CipherUtils.doFinal(this.encryptor, bytes);
- return this.ivGenerator != NULL_IV_GENERATOR ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
+ return (this.ivGenerator != NULL_IV_GENERATOR) ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
}
}
@@ -129,12 +129,12 @@ public byte[] decrypt(byte[] encryptedBytes) {
byte[] iv = iv(encryptedBytes);
CipherUtils.initCipher(this.decryptor, Cipher.DECRYPT_MODE, this.secretKey, this.alg.getParameterSpec(iv));
return CipherUtils.doFinal(this.decryptor,
- this.ivGenerator != NULL_IV_GENERATOR ? encrypted(encryptedBytes, iv.length) : encryptedBytes);
+ (this.ivGenerator != NULL_IV_GENERATOR) ? encrypted(encryptedBytes, iv.length) : encryptedBytes);
}
}
private byte[] iv(byte[] encrypted) {
- return this.ivGenerator != NULL_IV_GENERATOR
+ return (this.ivGenerator != NULL_IV_GENERATOR)
? EncodingUtils.subArray(encrypted, 0, this.ivGenerator.getKeyLength())
: NULL_IV_GENERATOR.generateKey();
}
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java
index 26b0f310a5d..84181d885ba 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesCbcBytesEncryptor.java
@@ -54,7 +54,7 @@ public byte[] encrypt(byte[] bytes) {
new CBCBlockCipher(new org.bouncycastle.crypto.engines.AESFastEngine()), new PKCS7Padding());
blockCipher.init(true, new ParametersWithIV(this.secretKey, iv));
byte[] encrypted = process(blockCipher, bytes);
- return iv != null ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
+ return (iv != null) ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
}
@Override
diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java
index b9d954691ce..044d6a2a77d 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/BouncyCastleAesGcmBytesEncryptor.java
@@ -52,7 +52,7 @@ public byte[] encrypt(byte[] bytes) {
blockCipher.init(true, new AEADParameters(this.secretKey, 128, iv, null));
byte[] encrypted = process(blockCipher, bytes);
- return iv != null ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
+ return (iv != null) ? EncodingUtils.concatenate(iv, encrypted) : encrypted;
}
@Override
diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java
index 8e0a7ec7de8..808e908c055 100644
--- a/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java
+++ b/crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java
@@ -146,7 +146,7 @@ private byte[] extractSalt(String encPass) {
*/
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
- return matches(rawPassword == null ? null : rawPassword.toString(), encodedPassword);
+ return matches((rawPassword != null) ? rawPassword.toString() : null, encodedPassword);
}
private boolean matches(String rawPassword, String encodedPassword) {
diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml
index 1a11e02cca4..ec81d6574e0 100644
--- a/etc/checkstyle/checkstyle-suppressions.xml
+++ b/etc/checkstyle/checkstyle-suppressions.xml
@@ -3,7 +3,6 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
-
diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
index 782668e3072..eb0f7602538 100644
--- a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
+++ b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
@@ -128,7 +128,7 @@ public void fullStackInvocation() throws Exception {
public void provideDataOnScalingWithNumberOfAuthoritiesUserHas() throws Exception {
StopWatch sw = new StopWatch("Scaling with nAuthorities");
for (int user = 0; user < N_AUTHORITIES / 10; user++) {
- int nAuthorities = user == 0 ? 1 : user * 10;
+ int nAuthorities = (user != 0) ? user * 10 : 1;
SecurityContextHolder.getContext().setAuthentication(
new UsernamePasswordAuthenticationToken("bob", "bobspassword", createRoles(nAuthorities)));
this.session.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
index 7c21ead4372..ce0b69e61b8 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java
@@ -214,7 +214,7 @@ public Set