GRAILS-11506 optimize performance of leftShift calls in taglibs compiled with @CompileStatic

Author: lhotari

grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/FormTagLib.groovy

@@ -22,9 +22,12 @@ import java.text.DateFormat
 import java.text.DateFormatSymbols
 
 import org.codehaus.groovy.grails.commons.DomainClassArtefactHandler
+import org.codehaus.groovy.grails.support.encoding.CodecLookup
+import org.codehaus.groovy.grails.support.encoding.Encoder
 import org.codehaus.groovy.grails.web.mapping.LinkGenerator
 import org.codehaus.groovy.grails.web.pages.FastStringWriter
 import org.codehaus.groovy.grails.web.servlet.mvc.SynchronizerTokensHolder
+import org.codehaus.groovy.grails.web.util.GrailsPrintWriter
 import org.codehaus.groovy.runtime.InvokerHelper
 import org.springframework.beans.factory.InitializingBean
 import org.springframework.context.ApplicationContext
@@ -50,7 +53,9 @@ class FormTagLib implements ApplicationContextAware, InitializingBean {
     ApplicationContext applicationContext
     RequestDataValueProcessor requestDataValueProcessor
     ConversionService conversionService
-
+    
+    CodecLookup codecLookup
+    
     void afterPropertiesSet() {
         if (applicationContext.containsBean('requestDataValueProcessor')) {
             requestDataValueProcessor = applicationContext.getBean('requestDataValueProcessor', RequestDataValueProcessor)
@@ -133,7 +138,7 @@ class FormTagLib implements ApplicationContextAware, InitializingBean {
     }
 
     @CompileStatic
-    def fieldImpl(Writer out, Map attrs) {
+    def fieldImpl(GrailsPrintWriter out, Map attrs) {
         resolveAttributes(attrs)
 
         attrs.value = processFormFieldValueIfNecessary(attrs.name, attrs.value, attrs.type)
@@ -144,10 +149,11 @@ class FormTagLib implements ApplicationContextAware, InitializingBean {
     }
 
     @CompileStatic
-    private void outputNameAsIdIfIdDoesNotExist(Map attrs, Writer out) {
+    private void outputNameAsIdIfIdDoesNotExist(Map attrs, GrailsPrintWriter out) {
         if (!attrs.containsKey('id') && attrs.containsKey('name')) {
+            Encoder htmlEncoder = codecLookup?.lookupEncoder('HTML')
             out << 'id="'
-            out << InvokerHelper.invokeMethod(String.valueOf(attrs.name), "encodeAsHTML", null)
+            out << (htmlEncoder != null ? htmlEncoder.encode(attrs.name) : attrs.name)
             out << '" '
         }
     }
@@ -312,11 +318,15 @@ class FormTagLib implements ApplicationContextAware, InitializingBean {
      * Dump out attributes in HTML compliant fashion.
      */
     @CompileStatic
-    void outputAttributes(Map attrs, Writer writer, boolean useNameAsIdIfIdDoesNotExist = false) {
+    void outputAttributes(Map attrs, GrailsPrintWriter writer, boolean useNameAsIdIfIdDoesNotExist = false) {
         attrs.remove('tagName') // Just in case one is left
+        Encoder htmlEncoder = codecLookup?.lookupEncoder('HTML')
         attrs.each { k, v ->
             if (v != null) {
-                writer << "$k=\"${InvokerHelper.invokeMethod(v.toString(), "encodeAsHTML", null)}\" "
+                writer << k
+                writer << '="'
+                writer << (htmlEncoder != null ? htmlEncoder.encode(v) : v) 
+                writer << '" '
             }
         }
         if (useNameAsIdIfIdDoesNotExist) {

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/FormTagLibTests.groovy

@@ -3,7 +3,7 @@ package org.codehaus.groovy.grails.web.taglib
 import grails.util.MockRequestDataValueProcessor
 
 import org.codehaus.groovy.grails.plugins.web.taglib.FormTagLib
-import org.codehaus.groovy.grails.support.MockApplicationContext
+import org.codehaus.groovy.grails.web.pages.FastStringWriter
 
 /**
  * Tests for the FormTagLib.groovy file which contains tags to help with the                                         l
@@ -323,7 +323,7 @@ class FormTagLibTests extends AbstractGrailsTagTests {
     void testFieldImplDoesNotApplyAttributesFromPreviousInvocation() {
         // GRAILS-8250
         def attrs = [:]
-        def out = new StringWriter()
+        def out = new FastStringWriter()
         attrs.name = 'A'
         attrs.type = 'text'
         attrs.tagName = 'textField'
@@ -332,7 +332,7 @@ class FormTagLibTests extends AbstractGrailsTagTests {
         tag.fieldImpl out, attrs
         assert '<input type="text" name="A" value="" id="A" />' == out.toString()
 
-        out = new StringWriter()
+        out = new FastStringWriter()
         attrs.name = 'B'
         attrs.type = 'text'
         attrs.tagName = 'textField'

grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/api/TagLibraryApi.java

@@ -38,6 +38,7 @@
 import org.codehaus.groovy.grails.web.servlet.GrailsApplicationAttributes;
 import org.codehaus.groovy.grails.web.servlet.mvc.GrailsWebRequest;
 import org.codehaus.groovy.grails.web.taglib.exceptions.GrailsTagException;
+import org.codehaus.groovy.grails.web.util.GrailsPrintWriter;
 import org.codehaus.groovy.grails.web.util.TagLibraryMetaUtils;
 import org.codehaus.groovy.grails.web.util.WithCodecHelper;
 import org.codehaus.groovy.runtime.InvokerHelper;
@@ -99,7 +100,7 @@ public GroovyPageBinding getPageScope(Object instance) {
      * @param instance The tag library instance
      * @return The writer to use
      */
-    public Writer getOut(Object instance) {
+    public GrailsPrintWriter getOut(Object instance) {
         return GroovyPageOutputStack.currentStack().getTaglibWriter();
     }
 

grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/SitemeshTagLib.groovy

@@ -23,8 +23,8 @@ import org.codehaus.groovy.grails.support.encoding.Encoder
 import org.codehaus.groovy.grails.web.pages.FastStringWriter
 import org.codehaus.groovy.grails.web.pages.SitemeshPreprocessor
 import org.codehaus.groovy.grails.web.sitemesh.GSPSitemeshPage
+import org.codehaus.groovy.grails.web.util.GrailsPrintWriter
 import org.codehaus.groovy.grails.web.util.StreamCharBuffer
-import org.codehaus.groovy.runtime.InvokerHelper
 
 import com.opensymphony.module.sitemesh.RequestConstants
 
@@ -42,7 +42,7 @@ class SitemeshTagLib implements RequestConstants {
     static namespace = 'sitemesh'
     CodecLookup codecLookup
 
-    def captureTagContent(Writer writer, String tagname, Map attrs, Object body, boolean noEndTagForEmpty=false) {
+    def captureTagContent(GrailsPrintWriter writer, String tagname, Map attrs, Object body, boolean noEndTagForEmpty=false) {
         def content = null
         if (body != null) {
             if (body instanceof Closure) {