Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use consistent ternary expression style

Browse Source 
Update all ternary expressions so that the condition is always in
parentheses and "not equals" is used in the test. This helps to bring
consistency across the codebase which makes ternary expression easier
to scan.

For example: `a = (a != null) ? a : b`

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-30 00:31:13 -07:00
committed by Rob Winch
parent 8d3f039f76
commit 834dcf5bcf
131 changed files with 277 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java
View File

@@ -237,7 +237,7 @@ public class OAuth2ClientConfigurationTests {
@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 @@ public class OAuth2ClientConfigurationTests {
@GetMapping("/authorized-client")
String authorizedClient(
@RegisteredOAuth2AuthorizedClient("client1") OAuth2AuthorizedClient authorizedClient) {
return authorizedClient != null ? "resolved" : "not-resolved";
return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}

2
config/src/test/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserTests.java
View File

@@ -229,7 +229,7 @@ public class OAuth2ClientBeanDefinitionParserTests {
@GetMapping("/authorized-client")
String authorizedClient(Model model,
@RegisteredOAuth2AuthorizedClient("google") OAuth2AuthorizedClient authorizedClient) {
return authorizedClient != null ? "resolved" : "not-resolved";
return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}

2
config/src/test/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParserTests.java
View File

@@ -523,7 +523,7 @@ public class OAuth2LoginBeanDefinitionParserTests {
@GetMapping("/authorized-client")
String authorizedClient(Model model,
@RegisteredOAuth2AuthorizedClient("google") OAuth2AuthorizedClient authorizedClient) {
return authorizedClient != null ? "resolved" : "not-resolved";
return (authorizedClient != null) ? "resolved" : "not-resolved";
}
}

2
config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java
View File

@@ -93,7 +93,7 @@ final class HtmlUnitWebTestClient {
contentType = encodingType.getName();
}
}
MediaType mediaType = contentType == null ? MediaType.ALL : MediaType.parseMediaType(contentType);
MediaType mediaType = (contentType != null) ? MediaType.parseMediaType(contentType) : MediaType.ALL;
request.contentType(mediaType);
}