feedback: styling

Author: jdaugherty

grails-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy

@@ -44,7 +44,7 @@
 
 /**
  * NOTE: Based on work done by the GSP standalone project (https://gsp.dev.java.net/).
- *
+ * <p>
  * Parsing implementation for GSP files
  *
  * @author Troy Heninger
@@ -699,6 +699,7 @@ private void makeName(String uri) {
 
     /**
      * find the simple name of this gsp
+     *
      * @param filename the fully qualified file name
      */
     private void makeSourceName(String filename) {
@@ -905,6 +906,7 @@ private boolean isModelRecordingModeEnabled() {
 
     /**
      * Determines if the line numbers array should be added to the generated Groovy class.
+     *
      * @return true if they should
      */
     private boolean shouldAddLineNumbers() {
@@ -943,6 +945,7 @@ private void addLineNumbers() {
 
     /**
      * Filters trailing 0s from the line number array
+     *
      * @param lineNumbers the line number array
      * @return a new array that removes all 0s from the end of it
      */

grails-gsp/core/src/main/groovy/org/grails/gsp/compiler/GroovyPageParser.java

@@ -29,6 +29,7 @@ import grails.util.Metadata
 import grails.web.pages.GroovyPagesUriService
 import groovy.transform.CompileStatic
 import groovy.util.logging.Commons
+import groovy.util.logging.Slf4j
 import org.grails.core.artefact.gsp.TagLibArtefactHandler
 import org.grails.gsp.GroovyPageResourceLoader
 import org.grails.gsp.GroovyPagesTemplateEngine
@@ -58,7 +59,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver
  * @author Graeme Rocher
  * @since 1.1
  */
-@Commons
+@Slf4j
 class GroovyPagesGrailsPlugin extends Plugin {
 
     public static final String GSP_RELOAD_INTERVAL = "grails.gsp.reload.interval"
@@ -68,7 +69,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
                             "file:./grails-app/taglib/**/*TagLib.groovy"]
 
     def grailsVersion = "7.0.0-SNAPSHOT > *"
-    def dependsOn = [core: GrailsUtil.getGrailsVersion(), i18n: GrailsUtil.getGrailsVersion()]
+    def dependsOn = [core: GrailsUtil.grailsVersion, i18n: GrailsUtil.grailsVersion]
     def observe = ['controllers']
     def loadAfter = ['filters']
 
@@ -101,10 +102,10 @@ class GroovyPagesGrailsPlugin extends Plugin {
         { ->
             def application = grailsApplication
             Config config = application.config
-            boolean developmentMode = isDevelopmentMode()
+            boolean developmentMode = developmentMode
             Environment env = Environment.current
 
-            boolean enableReload = env.isReloadEnabled() ||
+            boolean enableReload = env.reloadEnabled ||
                     config.getProperty(GroovyPagesTemplateEngine.CONFIG_PROPERTY_GSP_ENABLE_RELOAD, Boolean, false) ||
                     (developmentMode && env == Environment.DEVELOPMENT)
 
@@ -134,7 +135,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
             // as oppose to in WAR deployment where views are loaded from /WEB-INF
 
             if (viewsDir) {
-                log.info "Configuring GSP views directory as '${viewsDir}'"
+                log.info("Configuring GSP views directory as '${}'", viewsDir)
                 customResourceLoader = true
                 groovyPageResourceLoader(GroovyPageResourceLoader) {
                     baseResource = "file:${viewsDir}"
@@ -158,7 +159,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
                 }
             }
 
-            def deployed = !Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
+            def deployed = !Metadata.current.developmentEnvironmentAvailable
             groovyPageLocator(CachingGrailsConventionGroovyPageLocator) { bean ->
                 bean.lazyInit = true
                 if (customResourceLoader) {
@@ -187,15 +188,15 @@ class GroovyPagesGrailsPlugin extends Plugin {
             }
 
             grailsResourceLocator(CachingGroovyPageStaticResourceLocator) { bean ->
-                bean.parent = "abstractGrailsResourceLocator"
+                bean.parent = 'abstractGrailsResourceLocator'
                 if (enableReload) {
                     cacheTimeout = gspCacheTimeout
                 }
             }
 
             // Setup the main templateEngine used to render GSPs
             groovyPagesTemplateEngine(GroovyPagesTemplateEngine) {
-                classLoader = ref("classLoader")
+                classLoader = ref('classLoader')
                 groovyPageLocator = groovyPageLocator
                 if (enableReload) {
                     reloadEnabled = enableReload
@@ -209,7 +210,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
 
             spring.addAlias('groovyTemplateEngine', 'groovyPagesTemplateEngine')
 
-            groovyPageRenderer(PageRenderer, ref("groovyPagesTemplateEngine")) { bean ->
+            groovyPageRenderer(PageRenderer, ref('groovyPagesTemplateEngine')) { bean ->
                 bean.lazyInit = true
                 groovyPageLocator = groovyPageLocator
             }
@@ -227,7 +228,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
             }
 
             boolean jstlPresent = ClassUtils.isPresent(
-                    "jakarta.servlet.jsp.jstl.core.Config", InternalResourceViewResolver.class.getClassLoader())
+                    'jakarta.servlet.jsp.jstl.core.Config', InternalResourceViewResolver.class.classLoader)
 
             abstractViewResolver {
                 prefix = GrailsApplicationAttributes.PATH_TO_VIEWS
@@ -242,7 +243,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
             // Configure a Spring MVC view resolver
             jspViewResolver(GroovyPageViewResolver) { bean ->
                 bean.lazyInit = true
-                bean.parent = "abstractViewResolver"
+                bean.parent = 'abstractViewResolver'
             }
 
             // Now go through tag libraries and configure them in Spring too. With AOP proxies and so on
@@ -262,9 +263,9 @@ class GroovyPagesGrailsPlugin extends Plugin {
             errorsViewStackTracePrinter(ErrorsViewStackTracePrinter, ref('grailsResourceLocator'))
             filteringCodecsByContentTypeSettings(FilteringCodecsByContentTypeSettings, application)
 
-            groovyPagesServlet(ServletRegistrationBean, new GroovyPagesServlet(), "*.gsp") {
-                if (Environment.isDevelopmentMode()) {
-                    initParameters = [showSource: "1"]
+            groovyPagesServlet(ServletRegistrationBean, new GroovyPagesServlet(), '*.gsp') {
+                if (Environment.developmentMode) {
+                    initParameters = [showSource: '1']
                 }
             }
 
@@ -273,7 +274,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
     }
 
     protected boolean isDevelopmentMode() {
-        Metadata.getCurrent().isDevelopmentEnvironmentAvailable()
+        Metadata.current.developmentEnvironmentAvailable
     }
 
     static String transformToValidLocation(String location) {
@@ -298,7 +299,7 @@ class GroovyPagesGrailsPlugin extends Plugin {
                     }
                 }
 
-                // The tag library lookup class caches "tag -> taglib class"
+                // The tag library lookup class caches 'tag -> taglib class'
                 // so we need to update it now.
                 def lookup = applicationContext.getBean('gspTagLibraryLookup', TagLibraryLookup)
                 lookup.registerTagLib(taglibClass)

grails-gsp/plugin/src/main/groovy/org/grails/plugins/web/GroovyPagesGrailsPlugin.groovy

@@ -62,11 +62,11 @@ class RestfulReverseUrlRenderingTests extends Specification implements UrlMappin
 @Artefact('UrlMappings')
 class RestfulReverseUrlMappings {
     static mappings = {
-        "/car" (controller: "restfulCar", action: [GET: "create", POST: "save"])
+        '/car' (controller: 'restfulCar', action: [GET: 'create', POST: 'save'])
     }
 }
 
-@Artefact("Controller")
+@Artefact('Controller')
 class RestfulCarController {
     def create = {}
     def save = {}