diff --git a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java index a43d016b08..ab1c4a306d 100644 --- a/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ReflectionUtils.java @@ -801,20 +801,9 @@ public abstract class ReflectionUtils { } - /** - * Pre-built FieldFilter that matches all non-static, non-final fields. - */ - public static final FieldFilter COPYABLE_FIELDS = new FieldFilter() { - - @Override - public boolean matches(Field field) { - return !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())); - } - }; - - /** * Pre-built MethodFilter that matches all non-bridge methods. + * @since 3.0 */ public static final MethodFilter NON_BRIDGED_METHODS = new MethodFilter() { @@ -828,6 +817,7 @@ public abstract class ReflectionUtils { /** * Pre-built MethodFilter that matches all non-bridge methods * which are not declared on {@code java.lang.Object}. + * @since 3.0.5 */ public static final MethodFilter USER_DECLARED_METHODS = new MethodFilter() { @@ -837,4 +827,16 @@ public abstract class ReflectionUtils { } }; + + /** + * Pre-built FieldFilter that matches all non-static, non-final fields. + */ + public static final FieldFilter COPYABLE_FIELDS = new FieldFilter() { + + @Override + public boolean matches(Field field) { + return !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())); + } + }; + } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java index 78a7e91f95..8dfa206c50 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java @@ -194,7 +194,7 @@ public class StandardEvaluationContext implements EvaluationContext { @Override public TypeConverter getTypeConverter() { if (this.typeConverter == null) { - this.typeConverter = new StandardTypeConverter(); + this.typeConverter = new StandardTypeConverter(); } return this.typeConverter; } @@ -224,7 +224,7 @@ public class StandardEvaluationContext implements EvaluationContext { this.variables.put(name, value); } - public void setVariables(Map variables) { + public void setVariables(Map variables) { this.variables.putAll(variables); }