GRAILS-10838 - refactor AbstractStructuredBindingEditor to simplify s…

…ubclasses
grails · Nov 26, 2013 · 3b3c9b6 · 3b3c9b6
1 parent 9fbc2c5
commit 3b3c9b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...est/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBindingStructuredEditorSpec.groovy b/...est/groovy/org/codehaus/groovy/grails/orm/GrailsWebDataBindingStructuredEditorSpec.groovy
@@ -44,11 +44,10 @@ class Employee {
 class StucturedEmployeeEditor extends AbstractStructuredBindingEditor<Employee> {
 
     @Override
-    public Employee getPropertyValue(Object obj, String propertyName, DataBindingSource bindingSource) {
-        def propertyMap = getPropertyValuesMap(propertyName, bindingSource)
+    public Employee getPropertyValue(Map values) {
         def employee = new Employee()
-        employee.firstName = propertyMap.firstName
-        employee.lastName = propertyMap.lastName
+        employee.firstName = values.firstName
+        employee.lastName = values.lastName
         employee
     }
 

diff --git a/.../src/main/groovy/org/grails/databinding/converters/AbstractStructuredBindingEditor.groovy b/.../src/main/groovy/org/grails/databinding/converters/AbstractStructuredBindingEditor.groovy
@@ -32,6 +32,14 @@ import org.grails.databinding.StructuredBindingEditor
 @CompileStatic
 abstract class AbstractStructuredBindingEditor<T> implements StructuredBindingEditor<T> {
     abstract Class<? extends T> getTargetType()
+
+    @Override
+    public T getPropertyValue(Object obj, String propertyName, DataBindingSource bindingSource) {
+        def propertyMap = getPropertyValuesMap(propertyName, bindingSource)
+        getPropertyValue propertyMap
+    }
+
+    abstract T getPropertyValue(Map values)
 
     /**
      * A convenience method for extracting structured values from a DataBindingSource.