workaround duplicate findViewConfigPropertyDescriptor"

See: #194
grails · Dec 11, 2018 · 9bc0bbb · 9bc0bbb
1 parent 9e4d13e
commit 9bc0bbb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/core/src/main/groovy/grails/views/GenericViewConfiguration.groovy b/core/src/main/groovy/grails/views/GenericViewConfiguration.groovy
@@ -103,7 +103,7 @@ trait GenericViewConfiguration implements ViewConfiguration, GrailsApplicationAw
         String moduleName = viewModuleName
         GroovyObject configObject = (GroovyObject)this
         if (config != null) {
-            def descriptors = findViewConfigPropertyDescriptor()
+            PropertyDescriptor[] descriptors =  BeanUtils.getPropertyDescriptors(GenericViewConfiguration)
             for (PropertyDescriptor desc in descriptors) {
                 if (desc.writeMethod != null) {
                     String propertyName = desc.name
@@ -131,8 +131,4 @@ trait GenericViewConfiguration implements ViewConfiguration, GrailsApplicationAw
         }
         packages as String[]
     }
-
-    PropertyDescriptor[] findViewConfigPropertyDescriptor() {
-        BeanUtils.getPropertyDescriptors(GenericViewConfiguration)
-    }
 }
diff --git a/core/src/test/groovy/grails/views/GenericViewConfigurationSpec.groovy b/core/src/test/groovy/grails/views/GenericViewConfigurationSpec.groovy
@@ -3,6 +3,8 @@ package grails.views
 import grails.util.GrailsUtil
 import org.grails.config.CodeGenConfig
 import spock.lang.IgnoreIf
+import org.springframework.beans.BeanUtils
+import java.beans.PropertyDescriptor
 import spock.lang.Specification
 
 //Fixed in 3.2.5
@@ -34,4 +36,8 @@ class TestClass implements GenericViewConfiguration {
     String getViewModuleName() {
         "json"
     }
+
+    PropertyDescriptor[] findViewConfigPropertyDescriptor() {
+        BeanUtils.getPropertyDescriptors(GenericViewConfiguration)
+    }
 }
diff --git a/json/src/main/groovy/grails/plugin/json/view/JsonViewConfiguration.groovy b/json/src/main/groovy/grails/plugin/json/view/JsonViewConfiguration.groovy
@@ -2,8 +2,11 @@ package grails.plugin.json.view
 
 import grails.views.GenericViewConfiguration
 import grails.web.mime.MimeType
+import org.springframework.beans.BeanUtils
 import org.springframework.boot.context.properties.ConfigurationProperties
 
+import java.beans.PropertyDescriptor
+
 /**
  * Default configuration for JSON views
  *
@@ -29,4 +32,9 @@ class JsonViewConfiguration implements GenericViewConfiguration {
     String getViewModuleName() {
          MODULE_NAME
     }
+
+    PropertyDescriptor[] findViewConfigPropertyDescriptor() {
+        BeanUtils.getPropertyDescriptors(GenericViewConfiguration)
+    }
+
 }
diff --git a/markup/src/main/groovy/grails/plugin/markup/view/MarkupViewConfiguration.groovy b/markup/src/main/groovy/grails/plugin/markup/view/MarkupViewConfiguration.groovy
@@ -57,15 +57,10 @@ class MarkupViewConfiguration extends TemplateConfiguration implements GenericVi
         MODULE_NAME
     }
 
-    @Override
     PropertyDescriptor[] findViewConfigPropertyDescriptor() {
-        def allDescriptors = []
-        allDescriptors.addAll(
-            GenericViewConfiguration.super.findViewConfigPropertyDescriptor()
-        )
-        allDescriptors.addAll(
-            BeanUtils.getPropertyDescriptors(TemplateConfiguration)
-        )
+        List<PropertyDescriptor> allDescriptors = []
+        allDescriptors.addAll(BeanUtils.getPropertyDescriptors(GenericViewConfiguration))
+        allDescriptors.addAll(BeanUtils.getPropertyDescriptors(TemplateConfiguration))
         return allDescriptors as PropertyDescriptor[]
     }
 }