Merge pull request #122 from codeconsole/5.1.x-refactor-resolver

Skip redundant checks
grails · Sep 13, 2024 · d50a87e · d50a87e
2 parents e960525 + 35b46bc
commit d50a87e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,6 @@ dependencyManagement {
 dependencies {
  api "org.grails:grails-dependencies"
  api "org.grails:grails-web-boot"
- api 'javax.servlet:javax.servlet-api'
 
  api "io.github.gpc:fields:$fieldsVersion"
 

diff --git a/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy b/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy
@@ -71,23 +71,28 @@ class ScaffoldingViewResolver extends GroovyPageViewResolver implements Resource
  }
 
  private Resource resolveResource(Class controllerClass, shortViewName) {
- Resource res = null
+ Resource resource
  if (Environment.isDevelopmentMode()) {
- res = new FileSystemResource(new File(BuildSettings.BASE_DIR, "src/main/templates/scaffolding/${shortViewName}.gsp"))
+ resource = new FileSystemResource(new File(BuildSettings.BASE_DIR, "src/main/templates/scaffolding/${shortViewName}.gsp"))
+ if (resource.exists()) {
+ return resource
+ }
  }
 
- if (!res?.exists()) {
- def url = IOUtils.findResourceRelativeToClass(controllerClass, "/META-INF/templates/scaffolding/${shortViewName}.gsp")
- res = url? new UrlResource(url) : null
- if (templateOverridePluginDescriptor && !res?.exists()) {
- url = IOUtils.findResourceRelativeToClass(templateOverridePluginDescriptor, "/META-INF/templates/scaffolding/${shortViewName}.gsp")
- res = url ? new UrlResource(url) : null
- }
- if (!res?.exists()) {
- res = resourceLoader.getResource("classpath:META-INF/templates/scaffolding/${shortViewName}.gsp")
+ def url = IOUtils.findResourceRelativeToClass(controllerClass, "/META-INF/templates/scaffolding/${shortViewName}.gsp")
+ resource = url? new UrlResource(url) : null
+ if (resource?.exists()) {
+ return resource
+ }
+
+ if (templateOverridePluginDescriptor) {
+ url = IOUtils.findResourceRelativeToClass(templateOverridePluginDescriptor, "/META-INF/templates/scaffolding/${shortViewName}.gsp")
+ resource = url? new UrlResource(url) : null
+ if (resource?.exists()) {
+ return resource
  }
  }
- res
+ resourceLoader.getResource("classpath:META-INF/templates/scaffolding/${shortViewName}.gsp")
  }
 
  @Override