GRAILS-11513 improve previous fix: use optimized way for writing CharSequences to Writer

Author: lhotari

grails-core/src/test/groovy/org/codehaus/groovy/grails/support/encoding/CharSequencesSpec.groovy

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.codehaus.groovy.grails.support.encoding;
+
+import spock.lang.Specification
+
+class CharSequencesSpec extends Specification {
+    def "should support writing String instance to writer"() {
+        given:
+            StringWriter writer=new StringWriter()
+        when:
+            CharSequences.writeCharSequence(writer, input)
+        then:
+            writer.toString()==input
+        where:
+            input << ['Hello world','','1','12','123']
+    }
+
+    def "should support writing StringBuilder instance to writer"() {
+        given:
+            StringWriter writer=new StringWriter()
+        when:
+            StringBuilder sb=new StringBuilder()
+            sb.append(input)
+            CharSequences.writeCharSequence(writer, sb)
+        then:
+            writer.toString()==input
+        where:
+            input << ['Hello world','','1','12','123']
+    }
+
+    def "should support writing StringBuffer instance to writer"() {
+        given:
+            StringWriter writer=new StringWriter()
+        when:
+            StringBuffer sb=new StringBuffer()
+            sb.append(input)
+            CharSequences.writeCharSequence(writer, sb)
+        then:
+            writer.toString()==input
+        where:
+            input << ['Hello world','','1','12','123']
+    }
+    
+    def "should support writing CharArrayAccessible instance to writer"() {
+        given:
+            StringWriter writer=new StringWriter()
+        when:
+            CharArrayAccessible charArrayAccessible = new CharArrayCharSequence(input.toCharArray(), 0, input.length())
+            CharSequences.writeCharSequence(writer, charArrayAccessible)
+        then:
+            writer.toString()==input
+        where:
+            input << ['Hello world','','1','12','123']
+    }
+    
+    def "should support writing CharSequence instance to writer"() {
+        given:
+            StringWriter writer=new StringWriter()
+        when:
+            CharSequence charSequence = new CustomCharSequence(input)
+            CharSequences.writeCharSequence(writer, charSequence)
+        then:
+            writer.toString()==input
+        where:
+            input << ['Hello world','','1','12','123']
+    }
+    
+    class CustomCharSequence implements CharSequence {
+        String source
+        
+        CustomCharSequence(String source) {
+            this.source = source
+        }
+        
+        
+        @Override
+        public int length() {
+            return source.length();
+        }
+
+        @Override
+        public char charAt(int index) {
+            return source.charAt(index);
+        }
+
+        @Override
+        public CharSequence subSequence(int start, int end) {
+            return source.subSequence(start, end);
+        }
+    }
+}

grails-plugin-codecs/src/main/groovy/org/codehaus/groovy/grails/plugins/codecs/AbstractCharReplacementEncoder.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.io.Writer;
 
+import org.codehaus.groovy.grails.support.encoding.CharSequences;
 import org.codehaus.groovy.grails.support.encoding.CodecIdentifier;
 import org.codehaus.groovy.grails.support.encoding.EncodedAppender;
 import org.codehaus.groovy.grails.support.encoding.Encoder;
@@ -142,7 +143,7 @@ public void encodeToWriter(CharSequence str, int off, int len, Writer writer, En
             String escaped = escapeCharacter(ch, prevChar);
             if (escaped != null) {
                 if (i - startPos > 0) {
-                    writer.append(str, startPos, i);
+                    CharSequences.writeCharSequence(writer, str, startPos, i);
                 }
                 if (escaped.length() > 0) {
                     writer.write(escaped);
@@ -152,7 +153,7 @@ public void encodeToWriter(CharSequence str, int off, int len, Writer writer, En
             prevChar = ch;
         }
         if (startPos > -1 && i - startPos > 0) {
-            writer.append(str, startPos, i);
+            CharSequences.writeCharSequence(writer, str, startPos, i);
         }
     }