Skip to content

Commit 79e7ba7

Browse files
committed
Polishing
1 parent f002ebd commit 79e7ba7

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

spring-core/src/main/java/org/springframework/util/ReflectionUtils.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -801,20 +801,9 @@ public interface FieldFilter {
801801
}
802802

803803

804-
/**
805-
* Pre-built FieldFilter that matches all non-static, non-final fields.
806-
*/
807-
public static final FieldFilter COPYABLE_FIELDS = new FieldFilter() {
808-
809-
@Override
810-
public boolean matches(Field field) {
811-
return !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()));
812-
}
813-
};
814-
815-
816804
/**
817805
* Pre-built MethodFilter that matches all non-bridge methods.
806+
* @since 3.0
818807
*/
819808
public static final MethodFilter NON_BRIDGED_METHODS = new MethodFilter() {
820809

@@ -828,6 +817,7 @@ public boolean matches(Method method) {
828817
/**
829818
* Pre-built MethodFilter that matches all non-bridge methods
830819
* which are not declared on {@code java.lang.Object}.
820+
* @since 3.0.5
831821
*/
832822
public static final MethodFilter USER_DECLARED_METHODS = new MethodFilter() {
833823

@@ -837,4 +827,16 @@ public boolean matches(Method method) {
837827
}
838828
};
839829

830+
831+
/**
832+
* Pre-built FieldFilter that matches all non-static, non-final fields.
833+
*/
834+
public static final FieldFilter COPYABLE_FIELDS = new FieldFilter() {
835+
836+
@Override
837+
public boolean matches(Field field) {
838+
return !(Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers()));
839+
}
840+
};
841+
840842
}

spring-expression/src/main/java/org/springframework/expression/spel/support/StandardEvaluationContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public void setTypeConverter(TypeConverter typeConverter) {
194194
@Override
195195
public TypeConverter getTypeConverter() {
196196
if (this.typeConverter == null) {
197-
this.typeConverter = new StandardTypeConverter();
197+
this.typeConverter = new StandardTypeConverter();
198198
}
199199
return this.typeConverter;
200200
}
@@ -224,7 +224,7 @@ public void setVariable(String name, Object value) {
224224
this.variables.put(name, value);
225225
}
226226

227-
public void setVariables(Map<String,Object> variables) {
227+
public void setVariables(Map<String, Object> variables) {
228228
this.variables.putAll(variables);
229229
}
230230

0 commit comments

Comments
 (0)