Ensure non-null condition comes 1st in ternary operator

See gh-25232

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() {

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

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) {

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() {