root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Wrap ternary operator within parentheses 

See gh-31076
This commit is contained in:
70825 2023-08-19 15:35:33 +09:00 committed by Stephane Nicoll
parent a55b50b512
commit 6712c044b1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java
View File

@ -76,7 +76,7 @@ public class ResourceDecoder extends AbstractDataBufferDecoder<Resource> {
} }
Class<?> clazz = elementType.toClass(); Class<?> clazz = elementType.toClass();
String filename = hints != null ? (String) hints.get(FILENAME_HINT) : null; String filename = (hints != null ? (String) hints.get(FILENAME_HINT) : null);
if (clazz == InputStreamResource.class) { if (clazz == InputStreamResource.class) {
return new InputStreamResource(new ByteArrayInputStream(bytes)) { return new InputStreamResource(new ByteArrayInputStream(bytes)) {
@Override @Override

6
spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
View File

@ -399,7 +399,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
} }
protected String formatMappingName() { protected String formatMappingName() {
return this.beanName != null ? "'" + this.beanName + "'" : getClass().getName(); return (this.beanName != null ? "'" + this.beanName + "'" : getClass().getName());
} }
@ -589,9 +589,9 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
private RequestPath getRequestPath(HttpServletRequest request) { private RequestPath getRequestPath(HttpServletRequest request) {
// Expect pre-parsed path with DispatcherServlet, // Expect pre-parsed path with DispatcherServlet,
// but otherwise parse per handler lookup + cache for handling // but otherwise parse per handler lookup + cache for handling
return request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE) != null ? return (request.getAttribute(DispatcherServlet.WEB_APPLICATION_CONTEXT_ATTRIBUTE) != null ?
ServletRequestPathUtils.getParsedRequestPath(request) : ServletRequestPathUtils.getParsedRequestPath(request) :
ServletRequestPathUtils.parseAndCache(request); ServletRequestPathUtils.parseAndCache(request));
} }
/** /**

2
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
View File

@ -676,7 +676,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
prev = curr; prev = curr;
} }
} }
return sb != null ? sb.toString() : path; return (sb != null ? sb.toString() : path);
} }
private String cleanLeadingSlash(String path) { private String cleanLeadingSlash(String path) {

4
spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
View File

@ -233,8 +233,8 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
} }
} }
String mediaTypeInfo = logger.isDebugEnabled() && requestedMediaTypes != null ? String mediaTypeInfo = (logger.isDebugEnabled() && requestedMediaTypes != null ?
" given " + requestedMediaTypes.toString() : ""; " given " + requestedMediaTypes.toString() : "");
if (this.useNotAcceptableStatusCode) { if (this.useNotAcceptableStatusCode) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {