From 6712c044b12be0a28649fd8bb80e70a4a016a43d Mon Sep 17 00:00:00 2001 From: 70825 Date: Sat, 19 Aug 2023 15:35:33 +0900 Subject: [PATCH] Wrap ternary operator within parentheses See gh-31076 --- .../org/springframework/core/codec/ResourceDecoder.java | 2 +- .../web/servlet/handler/AbstractHandlerMapping.java | 6 +++--- .../web/servlet/resource/ResourceHttpRequestHandler.java | 2 +- .../web/servlet/view/ContentNegotiatingViewResolver.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java index 87f7ac478a..23e5f5f6e6 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/ResourceDecoder.java @@ -76,7 +76,7 @@ public class ResourceDecoder extends AbstractDataBufferDecoder { } 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) { return new InputStreamResource(new ByteArrayInputStream(bytes)) { @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index e0a56b82a7..8910d46670 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -399,7 +399,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport } 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) { // Expect pre-parsed path with DispatcherServlet, // 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.parseAndCache(request); + ServletRequestPathUtils.parseAndCache(request)); } /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java index 1435c8b8be..aa1598666c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java @@ -676,7 +676,7 @@ public class ResourceHttpRequestHandler extends WebContentGenerator prev = curr; } } - return sb != null ? sb.toString() : path; + return (sb != null ? sb.toString() : path); } private String cleanLeadingSlash(String path) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java index 9f1c2d3b20..f56bf0cd5a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java @@ -233,8 +233,8 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport } } - String mediaTypeInfo = logger.isDebugEnabled() && requestedMediaTypes != null ? - " given " + requestedMediaTypes.toString() : ""; + String mediaTypeInfo = (logger.isDebugEnabled() && requestedMediaTypes != null ? + " given " + requestedMediaTypes.toString() : ""); if (this.useNotAcceptableStatusCode) { if (logger.isDebugEnabled()) {