From ed495d6d23492e494b662bf53b118c85bac97f5d Mon Sep 17 00:00:00 2001
From: Scott Murphy Heiberg <scott@alwaysvip.com>
Date: Wed, 11 Sep 2024 23:31:39 -0700
Subject: [PATCH 1/3] Skip redundant checks

---
 .../ScaffoldingViewResolver.groovy            | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy b/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy
index d4c3a58..e9ea8a7 100644
--- 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 = null
         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

From fd4fbd088e94ea5f5fd0997989dda09e4b93296a Mon Sep 17 00:00:00 2001
From: Scott Murphy Heiberg <scott@alwaysvip.com>
Date: Thu, 12 Sep 2024 00:24:35 -0700
Subject: [PATCH 2/3] remove grava code

---
 .../grails/plugin/scaffolding/ScaffoldingViewResolver.groovy    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy b/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy
index e9ea8a7..823fd65 100644
--- a/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy
+++ b/src/main/groovy/grails/plugin/scaffolding/ScaffoldingViewResolver.groovy
@@ -71,7 +71,7 @@ class ScaffoldingViewResolver extends GroovyPageViewResolver implements Resource
     }
 
     private Resource resolveResource(Class controllerClass, shortViewName) {
-        Resource resource = null
+        Resource resource
         if (Environment.isDevelopmentMode()) {
             resource = new FileSystemResource(new File(BuildSettings.BASE_DIR, "src/main/templates/scaffolding/${shortViewName}.gsp"))
             if (resource.exists()) {

From 35b46bc1f5b0eb06636ee180a341d439d339329e Mon Sep 17 00:00:00 2001
From: Scott Murphy Heiberg <scott@alwaysvip.com>
Date: Thu, 12 Sep 2024 17:16:58 -0700
Subject: [PATCH 3/3] Remove unnecessary coupling to javax.servlet

---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f407405..539312f 100644
--- 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"