Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Defer decision on BindingResult type until access

Browse Source 
Closes gh-24347
This commit is contained in:
Rossen Stoyanchev
2020-05-13 17:24:31 +01:00
parent fe3b36af68
commit 6403a9f10e
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-context/src/main/java/org/springframework/validation/DataBinder.java
View File

@@ -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.
@@ -129,6 +129,8 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
@Nullable
private AbstractPropertyBindingResult bindingResult;
private boolean directFieldAccess = false;
@Nullable
private SimpleTypeConverter typeConverter;
@@ -249,7 +251,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
public void initBeanPropertyAccess() {
Assert.state(this.bindingResult == null,
"DataBinder is already initialized - call initBeanPropertyAccess before other configuration methods");
this.bindingResult = createBeanPropertyBindingResult();
this.directFieldAccess = false;
}
/**
@@ -280,7 +282,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
public void initDirectFieldAccess() {
Assert.state(this.bindingResult == null,
"DataBinder is already initialized - call initDirectFieldAccess before other configuration methods");
this.bindingResult = createDirectFieldBindingResult();
this.directFieldAccess = true;
}
/**
@@ -308,7 +310,8 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter {
*/
protected AbstractPropertyBindingResult getInternalBindingResult() {
if (this.bindingResult == null) {
initBeanPropertyAccess();
this.bindingResult = (this.directFieldAccess ?
createDirectFieldBindingResult(): createBeanPropertyBindingResult());
}
return this.bindingResult;
}

11
spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
View File

@@ -2050,9 +2050,18 @@ public class DataBinderTests {
assertThatIllegalStateException().isThrownBy(() ->
binder.setMessageCodesResolver(new DefaultMessageCodesResolver()))
.withMessageContaining("DataBinder is already initialized with MessageCodesResolver");
}
@Test // gh-24347
public void overrideBindingResultType() {
TestBean testBean = new TestBean();
DataBinder binder = new DataBinder(testBean, "testBean");
binder.initDirectFieldAccess();
binder.initBeanPropertyAccess();
assertThat(binder.getBindingResult()).isInstanceOf(BeanPropertyBindingResult.class);
}
@SuppressWarnings("unused")
private static class BeanWithIntegerList {