Grails Plugin GSP: Fixes circle reference error in GroovyPagesAutoCon…

…figuration * groovyPageLayoutFinder dependent jspViewResolver
graceframework · Jun 28, 2023 · 390aee0 · 390aee0
1 parent d1c8806
commit 390aee0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java b/grails-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java
@@ -37,7 +37,6 @@
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.servlet.ViewResolver;
 
 import grails.config.Config;
 import grails.config.Settings;
@@ -290,7 +289,8 @@ public PageRenderer groovyPageRenderer(CachingGrailsConventionGroovyPageLocator
 
     @Bean
     @ConditionalOnMissingBean
-    public GroovyPageLayoutFinder groovyPageLayoutFinder(ObjectProvider<GrailsApplication> grailsApplication, ObjectProvider<ViewResolver> viewResolver) {
+    public GroovyPageLayoutFinder groovyPageLayoutFinder(ObjectProvider<GrailsApplication> grailsApplication,
+                                                         ObjectProvider<GroovyPageViewResolver> jspViewResolver) {
         Config config = grailsApplication.getIfAvailable().getConfig();
         Environment env = Environment.getCurrent();
         boolean developmentMode = Environment.isDevelopmentEnvironmentAvailable();
@@ -303,7 +303,7 @@ public GroovyPageLayoutFinder groovyPageLayoutFinder(ObjectProvider<GrailsApplic
         groovyPageLayoutFinder.setGspReloadEnabled(enableReload);
         groovyPageLayoutFinder.setDefaultDecoratorName(defaultDecoratorName);
         groovyPageLayoutFinder.setEnableNonGspViews(sitemeshEnableNonGspViews);
-        viewResolver.ifAvailable(groovyPageLayoutFinder::setViewResolver);
+        jspViewResolver.ifAvailable(groovyPageLayoutFinder::setViewResolver);
 
         return groovyPageLayoutFinder;
     }