From bc4945d677da65c176aabc29f936770f47c0bde8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 11 Jun 2020 15:09:05 +0200 Subject: [PATCH] Ensure non-null condition comes 1st in ternary operator See gh-25232 --- .../springframework/util/ConcurrentReferenceHashMapTests.java | 4 ++-- .../client/reactive/HttpComponentsClientHttpResponse.java | 3 +-- .../web/client/DefaultResponseErrorHandler.java | 4 +++- .../org/springframework/web/filter/ForwardedHeaderFilter.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java index d1f7e7a3970..b8ddb11aa0c 100644 --- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -583,7 +583,7 @@ class ConcurrentReferenceHashMapTests { } // For testing we want more control of the hash this.supplementalHash = super.getHash(o); - return (o == null ? 0 : o.hashCode()); + return (o != null ? o.hashCode() : 0); } public int getSupplementalHash() { diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java index 29acc726716..67dccd6e7a0 100644 --- a/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/client/reactive/HttpComponentsClientHttpResponse.java @@ -94,8 +94,7 @@ class HttpComponentsClientHttpResponse implements ClientHttpResponse { private long getMaxAgeSeconds(Cookie cookie) { String maxAgeAttribute = cookie.getAttribute(Cookie.MAX_AGE_ATTR); - - return (maxAgeAttribute == null ? -1 : Long.parseLong(maxAgeAttribute)); + return (maxAgeAttribute != null ? Long.parseLong(maxAgeAttribute) : -1); } @Override diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java index fb15c448516..8200adb1682 100644 --- a/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/DefaultResponseErrorHandler.java @@ -139,7 +139,9 @@ public class DefaultResponseErrorHandler implements ResponseErrorHandler { return preface + "[no body]"; } - charset = (charset == null ? StandardCharsets.UTF_8 : charset); + if (charset == null) { + charset = StandardCharsets.UTF_8; + } int maxChars = 200; if (responseBody.length < maxChars * 2) { diff --git a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java index 9531e9e3fed..f797d064dd4 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/ForwardedHeaderFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -364,7 +364,7 @@ public class ForwardedHeaderFilter extends OncePerRequestFilter { public String getContextPath() { - return (this.forwardedPrefix == null ? this.delegate.get().getContextPath() : this.forwardedPrefix); + return (this.forwardedPrefix != null ? this.forwardedPrefix : this.delegate.get().getContextPath()); } public String getRequestUri() {