diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java index c3ae8c1847..46491e0d2b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -86,11 +86,11 @@ public class PropertyBatchUpdateException extends BeansException { @Override public String getMessage() { - StringJoiner sb = new StringJoiner("; ", "Failed properties: ", ""); + StringJoiner stringJoiner = new StringJoiner("; ", "Failed properties: ", ""); for (PropertyAccessException exception : this.propertyAccessExceptions) { - sb.add(exception.getMessage()); + stringJoiner.add(exception.getMessage()); } - return sb.toString(); + return stringJoiner.toString(); } @Override diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index 279c1ee10a..079ccfac3a 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -1521,11 +1521,11 @@ public class ResolvableType implements Serializable { public String getTypeName() { String typeName = this.rawType.getTypeName(); if (this.typeArguments.length > 0) { - StringJoiner result = new StringJoiner(", ", "<", ">"); + StringJoiner stringJoiner = new StringJoiner(", ", "<", ">"); for (Type argument : this.typeArguments) { - result.add(argument.getTypeName()); + stringJoiner.add(argument.getTypeName()); } - return typeName + result.toString(); + return typeName + stringJoiner; } return typeName; } diff --git a/spring-core/src/main/java/org/springframework/util/ClassUtils.java b/spring-core/src/main/java/org/springframework/util/ClassUtils.java index 5ee9fd66b7..11197d2b55 100644 --- a/spring-core/src/main/java/org/springframework/util/ClassUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ClassUtils.java @@ -657,11 +657,11 @@ public abstract class ClassUtils { if (CollectionUtils.isEmpty(classes)) { return "[]"; } - StringJoiner sj = new StringJoiner(", ", "[", "]"); + StringJoiner stringJoiner = new StringJoiner(", ", "[", "]"); for (Class clazz : classes) { - sj.add(clazz.getName()); + stringJoiner.add(clazz.getName()); } - return sj.toString(); + return stringJoiner.toString(); } /** diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index 4638a4a7c3..e4a81f4293 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -421,6 +421,7 @@ public class PathPattern implements Comparable { return this.parser.parse(file2 + (firstExtensionWild ? secondExtension : firstExtension)); } + @Override public boolean equals(@Nullable Object other) { if (!(other instanceof PathPattern)) { return false; @@ -431,10 +432,12 @@ public class PathPattern implements Comparable { this.caseSensitive == otherPattern.caseSensitive); } + @Override public int hashCode() { return (this.patternString.hashCode() + this.separator) * 17 + (this.caseSensitive ? 1 : 0); } + @Override public String toString() { return this.patternString; } @@ -466,13 +469,13 @@ public class PathPattern implements Comparable { } String toChainString() { - StringJoiner buf = new StringJoiner(" "); + StringJoiner stringJoiner = new StringJoiner(" "); PathElement pe = this.head; while (pe != null) { - buf.add(pe.toString()); + stringJoiner.add(pe.toString()); pe = pe.next; } - return buf.toString(); + return stringJoiner.toString(); } /**