Repository: groovy Updated Branches: refs/heads/master ce8a61ca7 -> 9b6f86c8f
Fix "Refine compile-time and runtime groovydoc" Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9b6f86c8 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9b6f86c8 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9b6f86c8 Branch: refs/heads/master Commit: 9b6f86c8f1e6c3890d96f4aaac9676cefdb1d747 Parents: ce8a61c Author: sunlan <[email protected]> Authored: Tue Mar 20 15:35:44 2018 +0800 Committer: sunlan <[email protected]> Committed: Tue Mar 20 15:36:04 2018 +0800 ---------------------------------------------------------------------- src/main/groovy/groovy/lang/groovydoc/Groovydoc.java | 4 ++-- .../groovy/parser/antlr4/GroovyParserTest.groovy | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/9b6f86c8/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java ---------------------------------------------------------------------- diff --git a/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java b/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java index 8b10050..93f33d4 100644 --- a/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java +++ b/src/main/groovy/groovy/lang/groovydoc/Groovydoc.java @@ -19,7 +19,7 @@ package groovy.lang.groovydoc; import java.lang.reflect.AnnotatedElement; -import java.util.LinkedList; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -28,7 +28,7 @@ import java.util.Objects; */ public class Groovydoc { private final String content; - private List<GroovydocTag> tagList = new LinkedList<>(); + private List<GroovydocTag> tagList = Collections.emptyList(); private final GroovydocHolder holder; public static final Groovydoc EMPTY_GROOVYDOC = new Groovydoc("", (GroovydocHolder) null); http://git-wip-us.apache.org/repos/asf/groovy/blob/9b6f86c8/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy index ce30d9a..6638941 100644 --- a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy +++ b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/GroovyParserTest.groovy @@ -53,11 +53,11 @@ class GroovyParserTest extends GroovyTestCase { assert classes[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test class Comments */' assert classes[0].fields[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test Comments.SOME_VAR */' assert classes[0].fields[1].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test Comments.SOME_VAR2 */' - assert classes[0].fields[2].groovydoc == null - assert classes[0].fields[3].groovydoc == null + assert classes[0].fields[2].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC + assert classes[0].fields[3].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC assert classes[0].declaredConstructors[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test Comments.constructor1 */' assert classes[0].methods[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test Comments.m1 */' - assert classes[0].methods[1].groovydoc == null + assert classes[0].methods[1].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC assert classes[0].methods[2].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test Comments.m3 */' assert classes[1].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test class InnerClazz */' @@ -70,14 +70,14 @@ class GroovyParserTest extends GroovyTestCase { assert classes[2].fields[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * InnerEnum.NEW */' assert classes[2].fields[1].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * InnerEnum.OLD */' - assert classes[3].groovydoc == null + assert classes[3].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC - assert classes[4].fields[0].groovydoc == null + assert classes[4].fields[0].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC - assert classes[5].groovydoc == null + assert classes[5].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC assert methods[0].groovydoc.content.replaceAll(/\r?\n/, '') == '/** * test someScriptMethod1 */' - assert methods[1].groovydoc == null + assert methods[1].groovydoc == groovy.lang.groovydoc.Groovydoc.EMPTY_GROOVYDOC } void "test groovy core - PackageDeclaration"() {
