grails#11315 Lookup TypedStructuredBindingEditor from mainContext

jprinet · Apr 30, 2019 · 2b207eb · 2b207eb
1 parent 90116b9
commit 2b207eb
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java b/...-databinding/src/main/groovy/org/grails/plugins/databinding/DataBindingConfiguration.java
@@ -4,18 +4,14 @@
 import grails.databinding.TypedStructuredBindingEditor;
 import grails.databinding.converters.FormattedValueConverter;
 import grails.databinding.converters.ValueConverter;
-import grails.web.databinding.DataBindingUtils;
 import grails.web.databinding.GrailsWebDataBinder;
 import io.micronaut.core.util.ArrayUtils;
 import org.grails.databinding.bindingsource.DataBindingSourceCreator;
-import org.grails.databinding.converters.DateConversionHelper;
 import org.grails.web.databinding.bindingsource.*;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.List;
-
 @Configuration
 public class DataBindingConfiguration {
 
@@ -41,6 +37,9 @@ protected GrailsWebDataBinder grailsWebDataBinder(
                 .getBeansOfType(ValueConverter.class).values().toArray(new ValueConverter[0]);
         dataBinder.setValueConverters(ArrayUtils.concat(valueConverters, mainContextConverters));
         dataBinder.setFormattedValueConverters(formattedValueConverters);
+        final TypedStructuredBindingEditor[] mainContextStructuredBindingEditors = mainContext
+                .getBeansOfType(TypedStructuredBindingEditor.class).values().toArray(new TypedStructuredBindingEditor[0]);
+        dataBinder.setStructuredBindingEditors(ArrayUtils.concat(structuredBindingEditors, mainContextStructuredBindingEditors));
         return dataBinder;
     }