date:20170910

groovy git commit: Minor refactoring: Generify GroovydocHolder

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X f7e2c46a0 -> 00768041b


Minor refactoring: Generify GroovydocHolder

(cherry picked from commit e0b787d)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/00768041
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/00768041
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/00768041

Branch: refs/heads/GROOVY_2_6_X
Commit: 00768041b3fe08603a80deb39738c17b2da9deb4
Parents: f7e2c46
Author: sunlan 
Authored: Mon Sep 11 07:53:49 2017 +0800
Committer: sunlan 
Committed: Mon Sep 11 07:54:49 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 16 
 src/main/groovy/lang/groovydoc/GroovydocHolder.java |  8 ++--
 src/main/org/codehaus/groovy/ast/ClassNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/FieldNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/MethodNode.java|  4 ++--
 5 files changed, 22 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
index 7b281ff..d7d4204 100644
--- a/src/main/groovy/lang/groovydoc/Groovydoc.java
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -28,23 +28,23 @@ import java.util.Objects;
 public class Groovydoc {
 private final String content;
 private List tagList;
-private final GroovydocHolder groovydocHolder;
+private final GroovydocHolder holder;
 
 public Groovydoc(String content, GroovydocHolder groovydocHolder) {
 this.content = content;
-this.groovydocHolder = groovydocHolder;
+this.holder = groovydocHolder;
 }
 
 public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
 this.content = content;
-this.groovydocHolder = new GroovydocHolder() {
+this.holder = new GroovydocHolder() {
 @Override
 public Groovydoc getGroovydoc() {
 return Groovydoc.this;
 }
 
 @Override
-public Object getInstance() {
+public AnnotatedElement getInstance() {
 return annotatedElement;
 }
 };
@@ -71,8 +71,8 @@ public class Groovydoc {
  * Get the holder of the groovydoc
  * @return the groovydoc holder
  */
-public GroovydocHolder getGroovydocHolder() {
-return groovydocHolder;
+public GroovydocHolder getHolder() {
+return holder;
 }
 
 @Override
@@ -81,12 +81,12 @@ public class Groovydoc {
 if (o == null || getClass() != o.getClass()) return false;
 Groovydoc groovydoc = (Groovydoc) o;
 return Objects.equals(content, groovydoc.content) &&
-Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+Objects.equals(holder, groovydoc.holder);
 }
 
 @Override
 public int hashCode() {
-return Objects.hash(content, groovydocHolder);
+return Objects.hash(content, holder);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/groovy/lang/groovydoc/GroovydocHolder.java
--
diff --git a/src/main/groovy/lang/groovydoc/GroovydocHolder.java 
b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
index 8db3135..eb41df4 100644
--- a/src/main/groovy/lang/groovydoc/GroovydocHolder.java
+++ b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
@@ -21,7 +21,7 @@ package groovy.lang.groovydoc;
 /**
  * Represents Groovydoc Holder
  */
-public interface GroovydocHolder {
+public interface GroovydocHolder {
 String DOC_COMMENT = "_DOC_COMMENT"; // keys for meta data
 /**
  * Get the groovydoc
@@ -29,5 +29,9 @@ public interface GroovydocHolder {
  */
 Groovydoc getGroovydoc();
 
-Object getInstance();
+/**
+ * Get GroovydocHolder instance
+ * @return GroovydocHolder instance
+ */
+T getInstance();
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java 
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index fcf7cd6..f7ad48d 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -18,13 +18,13 @@
  */
 package org.codehaus.groovy.ast;
 
+import groovy.lang.groovydoc.Groovydoc;
 import groovy.lang.groovydoc.GroovydocHolder;
 import

groovy git commit: Minor refactoring: Generify GroovydocHolder

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/master 43067475c -> e0b787dcf


Minor refactoring: Generify GroovydocHolder


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e0b787dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e0b787dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e0b787dc

Branch: refs/heads/master
Commit: e0b787dcfc50c1084aac7112ba9d8a2cc6aa0cfa
Parents: 4306747
Author: sunlan 
Authored: Mon Sep 11 07:53:49 2017 +0800
Committer: sunlan 
Committed: Mon Sep 11 07:53:49 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 16 
 src/main/groovy/lang/groovydoc/GroovydocHolder.java |  8 ++--
 src/main/org/codehaus/groovy/ast/ClassNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/FieldNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/MethodNode.java|  4 ++--
 5 files changed, 22 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
index 7b281ff..d7d4204 100644
--- a/src/main/groovy/lang/groovydoc/Groovydoc.java
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -28,23 +28,23 @@ import java.util.Objects;
 public class Groovydoc {
 private final String content;
 private List tagList;
-private final GroovydocHolder groovydocHolder;
+private final GroovydocHolder holder;
 
 public Groovydoc(String content, GroovydocHolder groovydocHolder) {
 this.content = content;
-this.groovydocHolder = groovydocHolder;
+this.holder = groovydocHolder;
 }
 
 public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
 this.content = content;
-this.groovydocHolder = new GroovydocHolder() {
+this.holder = new GroovydocHolder() {
 @Override
 public Groovydoc getGroovydoc() {
 return Groovydoc.this;
 }
 
 @Override
-public Object getInstance() {
+public AnnotatedElement getInstance() {
 return annotatedElement;
 }
 };
@@ -71,8 +71,8 @@ public class Groovydoc {
  * Get the holder of the groovydoc
  * @return the groovydoc holder
  */
-public GroovydocHolder getGroovydocHolder() {
-return groovydocHolder;
+public GroovydocHolder getHolder() {
+return holder;
 }
 
 @Override
@@ -81,12 +81,12 @@ public class Groovydoc {
 if (o == null || getClass() != o.getClass()) return false;
 Groovydoc groovydoc = (Groovydoc) o;
 return Objects.equals(content, groovydoc.content) &&
-Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+Objects.equals(holder, groovydoc.holder);
 }
 
 @Override
 public int hashCode() {
-return Objects.hash(content, groovydocHolder);
+return Objects.hash(content, holder);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/groovy/lang/groovydoc/GroovydocHolder.java
--
diff --git a/src/main/groovy/lang/groovydoc/GroovydocHolder.java 
b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
index 8db3135..eb41df4 100644
--- a/src/main/groovy/lang/groovydoc/GroovydocHolder.java
+++ b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
@@ -21,7 +21,7 @@ package groovy.lang.groovydoc;
 /**
  * Represents Groovydoc Holder
  */
-public interface GroovydocHolder {
+public interface GroovydocHolder {
 String DOC_COMMENT = "_DOC_COMMENT"; // keys for meta data
 /**
  * Get the groovydoc
@@ -29,5 +29,9 @@ public interface GroovydocHolder {
  */
 Groovydoc getGroovydoc();
 
-Object getInstance();
+/**
+ * Get GroovydocHolder instance
+ * @return GroovydocHolder instance
+ */
+T getInstance();
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java 
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index fcf7cd6..f7ad48d 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -18,13 +18,13 @@
  */
 package org.codehaus.groovy.ast;
 
+import groovy.lang.groovydoc.Groovydoc;
 import groovy.lang.groovydoc.GroovydocHolder;
 import org.codehaus.groovy.GroovyBugError;
 import

[1/2] groovy git commit: Refine `getGroovydoc` DGMs

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X b1d964dba -> f7e2c46a0


Refine `getGroovydoc` DGMs

(cherry picked from commit 86eb9dd)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ba37b013
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ba37b013
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ba37b013

Branch: refs/heads/GROOVY_2_6_X
Commit: ba37b01388772caf15d948f9c1e914b36952bbab
Parents: b1d964d
Author: sunlan 
Authored: Sun Sep 10 20:42:22 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 22:46:47 2017 +0800

--
 .../groovy/runtime/DefaultGroovyMethods.java| 35 ++--
 1 file changed, 2 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/ba37b013/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 9f99021..b4dae13 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -117,8 +117,8 @@ import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -18884,44 +18884,13 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 return self.remove(o);
 }
 
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Class holder) {
-return holder.getAnnotation(Groovydoc.class).value();
-}
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Method holder) {
-return holder.getAnnotation(Groovydoc.class).value();
-}
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Constructor holder) {
-return ((Groovydoc) 
holder.getAnnotation(Groovydoc.class)).value();
-}
-
 /**
  * Get runtime groovydoc
  * @param holder the groovydoc hold
  * @return runtime groovydoc
  * @since 2.6.0
  */
-public static String getGroovydoc(Field holder) {
+public static String getGroovydoc(AnnotatedElement holder) {
 return holder.getAnnotation(Groovydoc.class).value();
 }
 }

[2/2] groovy git commit: Refine groovydoc support further

2017-09-10 Thread sunlan

Refine groovydoc support further

(cherry picked from commit 4306747)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/f7e2c46a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/f7e2c46a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/f7e2c46a

Branch: refs/heads/GROOVY_2_6_X
Commit: f7e2c46a0b3e3b91247166114067dd7f990efcfb
Parents: ba37b01
Author: sunlan 
Authored: Sun Sep 10 21:16:40 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 22:46:59 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 96 
 .../groovy/lang/groovydoc/GroovydocHolder.java  | 33 +++
 .../groovy/lang/groovydoc/GroovydocTag.java | 68 ++
 src/main/org/codehaus/groovy/ast/ClassNode.java |  9 +-
 src/main/org/codehaus/groovy/ast/FieldNode.java |  9 +-
 .../org/codehaus/groovy/ast/MethodNode.java |  9 +-
 .../groovy/ast/groovydoc/Groovydoc.java | 68 --
 .../groovy/ast/groovydoc/GroovydocHolder.java   | 31 ---
 .../groovy/ast/groovydoc/GroovydocTag.java  | 74 ---
 .../groovy/runtime/DefaultGroovyMethods.java|  4 +-
 .../groovy/parser/antlr4/GroovydocManager.java  |  4 +-
 .../test/resources/core/Groovydoc_01x.groovy| 12 +--
 12 files changed, 228 insertions(+), 189 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/f7e2c46a/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
new file mode 100644
index 000..7b281ff
--- /dev/null
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -0,0 +1,96 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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 groovy.lang.groovydoc;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Represents groovydoc
+ */
+public class Groovydoc {
+private final String content;
+private List tagList;
+private final GroovydocHolder groovydocHolder;
+
+public Groovydoc(String content, GroovydocHolder groovydocHolder) {
+this.content = content;
+this.groovydocHolder = groovydocHolder;
+}
+
+public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
+this.content = content;
+this.groovydocHolder = new GroovydocHolder() {
+@Override
+public Groovydoc getGroovydoc() {
+return Groovydoc.this;
+}
+
+@Override
+public Object getInstance() {
+return annotatedElement;
+}
+};
+}
+
+/**
+ * Get the content of groovydoc
+ * @return the text content
+ */
+public String getContent() {
+return content;
+}
+
+/**
+ * TODO Get list of groovydoc tags
+ * @return a list of tags
+ */
+public List getTagList() {
+throw new UnsupportedOperationException("[TODO]parsing tags will be a 
new features of the next releases");
+//return tagList;
+}
+
+/**
+ * Get the holder of the groovydoc
+ * @return the groovydoc holder
+ */
+public GroovydocHolder getGroovydocHolder() {
+return groovydocHolder;
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+Groovydoc groovydoc = (Groovydoc) o;
+return Objects.equals(content, groovydoc.content) &&
+Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(content, groovydocHolder);
+}
+
+@Override
+public String toString() {
+return this.content;
+}
+}

http://git-wip-us.apache.org/repos/asf/groovy/blob/f7e2c46a/src/main/groovy/lang/groovydoc/GroovydocHolder.java

groovy git commit: Refine groovydoc support further

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/master 86eb9dd7d -> 43067475c


Refine groovydoc support further


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/43067475
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/43067475
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/43067475

Branch: refs/heads/master
Commit: 43067475c75fe175ebb345ce9fb4f75e8cbae419
Parents: 86eb9dd
Author: sunlan 
Authored: Sun Sep 10 21:16:40 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 22:02:14 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 96 
 .../groovy/lang/groovydoc/GroovydocHolder.java  | 33 +++
 .../groovy/lang/groovydoc/GroovydocTag.java | 68 ++
 src/main/org/codehaus/groovy/ast/ClassNode.java |  9 +-
 src/main/org/codehaus/groovy/ast/FieldNode.java |  9 +-
 .../org/codehaus/groovy/ast/MethodNode.java |  9 +-
 .../groovy/ast/groovydoc/Groovydoc.java | 68 --
 .../groovy/ast/groovydoc/GroovydocHolder.java   | 31 ---
 .../groovy/ast/groovydoc/GroovydocTag.java  | 74 ---
 .../groovy/runtime/DefaultGroovyMethods.java|  4 +-
 .../groovy/parser/antlr4/GroovydocManager.java  |  4 +-
 .../test/resources/core/Groovydoc_01x.groovy| 12 +--
 12 files changed, 228 insertions(+), 189 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/43067475/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
new file mode 100644
index 000..7b281ff
--- /dev/null
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -0,0 +1,96 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you 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 groovy.lang.groovydoc;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Represents groovydoc
+ */
+public class Groovydoc {
+private final String content;
+private List tagList;
+private final GroovydocHolder groovydocHolder;
+
+public Groovydoc(String content, GroovydocHolder groovydocHolder) {
+this.content = content;
+this.groovydocHolder = groovydocHolder;
+}
+
+public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
+this.content = content;
+this.groovydocHolder = new GroovydocHolder() {
+@Override
+public Groovydoc getGroovydoc() {
+return Groovydoc.this;
+}
+
+@Override
+public Object getInstance() {
+return annotatedElement;
+}
+};
+}
+
+/**
+ * Get the content of groovydoc
+ * @return the text content
+ */
+public String getContent() {
+return content;
+}
+
+/**
+ * TODO Get list of groovydoc tags
+ * @return a list of tags
+ */
+public List getTagList() {
+throw new UnsupportedOperationException("[TODO]parsing tags will be a 
new features of the next releases");
+//return tagList;
+}
+
+/**
+ * Get the holder of the groovydoc
+ * @return the groovydoc holder
+ */
+public GroovydocHolder getGroovydocHolder() {
+return groovydocHolder;
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;
+Groovydoc groovydoc = (Groovydoc) o;
+return Objects.equals(content, groovydoc.content) &&
+Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+}
+
+@Override
+public int hashCode() {
+return Objects.hash(content, groovydocHolder);
+}
+
+@Override
+public String toString() {
+return this.content;
+}
+}

groovy git commit: Refine `getGroovydoc` DGMs

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/master ec49133c5 -> 86eb9dd7d


Refine `getGroovydoc` DGMs


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/86eb9dd7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/86eb9dd7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/86eb9dd7

Branch: refs/heads/master
Commit: 86eb9dd7d64188ab0847697ea57dede3d2190246
Parents: ec49133
Author: sunlan 
Authored: Sun Sep 10 20:42:22 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 20:42:22 2017 +0800

--
 .../groovy/runtime/DefaultGroovyMethods.java| 35 ++--
 1 file changed, 2 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/86eb9dd7/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 9f99021..b4dae13 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -117,8 +117,8 @@ import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -18884,44 +18884,13 @@ public class DefaultGroovyMethods extends 
DefaultGroovyMethodsSupport {
 return self.remove(o);
 }
 
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Class holder) {
-return holder.getAnnotation(Groovydoc.class).value();
-}
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Method holder) {
-return holder.getAnnotation(Groovydoc.class).value();
-}
-
-/**
- * Get runtime groovydoc
- * @param holder the groovydoc hold
- * @return runtime groovydoc
- * @since 2.6.0
- */
-public static String getGroovydoc(Constructor holder) {
-return ((Groovydoc) 
holder.getAnnotation(Groovydoc.class)).value();
-}
-
 /**
  * Get runtime groovydoc
  * @param holder the groovydoc hold
  * @return runtime groovydoc
  * @since 2.6.0
  */
-public static String getGroovydoc(Field holder) {
+public static String getGroovydoc(AnnotatedElement holder) {
 return holder.getAnnotation(Groovydoc.class).value();
 }
 }

groovy git commit: Add `getGroovydoc` DGMs

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X 711620419 -> b1d964dba


Add `getGroovydoc` DGMs

(cherry picked from commit ec49133)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b1d964db
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b1d964db
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b1d964db

Branch: refs/heads/GROOVY_2_6_X
Commit: b1d964dbad396901f79e7a1901175562e95ecaeb
Parents: 7116204
Author: sunlan 
Authored: Sun Sep 10 14:02:06 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 14:04:02 2017 +0800

--
 .../groovy/runtime/DefaultGroovyMethods.java| 138 ++-
 .../test/resources/core/Groovydoc_01x.groovy|  12 +-
 2 files changed, 139 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/b1d964db/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index dd0ae2c..9f99021 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -20,7 +20,31 @@ package org.codehaus.groovy.runtime;
 
 import groovy.io.FileType;
 import groovy.io.GroovyPrintWriter;
-import groovy.lang.*;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
+import groovy.lang.DelegatingMetaClass;
+import groovy.lang.EmptyRange;
+import groovy.lang.ExpandoMetaClass;
+import groovy.lang.GString;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyRuntimeException;
+import groovy.lang.GroovySystem;
+import groovy.lang.Groovydoc;
+import groovy.lang.IntRange;
+import groovy.lang.ListWithDefault;
+import groovy.lang.MapWithDefault;
+import groovy.lang.MetaClass;
+import groovy.lang.MetaClassImpl;
+import groovy.lang.MetaClassRegistry;
+import groovy.lang.MetaMethod;
+import groovy.lang.MetaProperty;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.ObjectRange;
+import groovy.lang.PropertyValue;
+import groovy.lang.Range;
+import groovy.lang.SpreadMap;
+import groovy.lang.Tuple2;
+import groovy.lang.Writable;
 import groovy.transform.stc.ClosureParams;
 import groovy.transform.stc.FirstParam;
 import groovy.transform.stc.FromString;
@@ -44,7 +68,24 @@ import org.codehaus.groovy.runtime.dgmimpl.NumberNumberDiv;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberMinus;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberMultiply;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberPlus;
-import org.codehaus.groovy.runtime.dgmimpl.arrays.*;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.BooleanArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.BooleanArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ByteArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ByteArrayPutAtMetaMethod;
+import 
org.codehaus.groovy.runtime.dgmimpl.arrays.CharacterArrayGetAtMetaMethod;
+import 
org.codehaus.groovy.runtime.dgmimpl.arrays.CharacterArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.DoubleArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.DoubleArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.FloatArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.FloatArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.LongArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.LongArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ObjectArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ObjectArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ShortArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ShortArrayPutAtMetaMethod;
 import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
 import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
@@ -53,11 +94,31 @@ import org.codehaus.groovy.runtime.typehandling.NumberMath;
 import org.codehaus.groovy.tools.RootLoader;
 import org.codehaus.groovy.transform.trait.Traits;
 import org.codehaus.groovy.util.ArrayIterator;
-import org.codehaus.groovy.util.ListBufferedIterator;
 import org.codehaus.groovy.util.IteratorBufferedIterator;
+import org.codehaus.groovy.util.ListBufferedIterator;
 
-import

groovy git commit: Add `getGroovydoc` DGMs

2017-09-10 Thread sunlan

Repository: groovy
Updated Branches:
  refs/heads/master b364be085 -> ec49133c5


Add `getGroovydoc` DGMs


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ec49133c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ec49133c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ec49133c

Branch: refs/heads/master
Commit: ec49133c5ebdcd3236fccd59718c919f5d840f7f
Parents: b364be0
Author: sunlan 
Authored: Sun Sep 10 14:02:06 2017 +0800
Committer: sunlan 
Committed: Sun Sep 10 14:02:06 2017 +0800

--
 .../groovy/runtime/DefaultGroovyMethods.java| 138 ++-
 .../test/resources/core/Groovydoc_01x.groovy|  12 +-
 2 files changed, 139 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/ec49133c/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
--
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java 
b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index dd0ae2c..9f99021 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -20,7 +20,31 @@ package org.codehaus.groovy.runtime;
 
 import groovy.io.FileType;
 import groovy.io.GroovyPrintWriter;
-import groovy.lang.*;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
+import groovy.lang.DelegatingMetaClass;
+import groovy.lang.EmptyRange;
+import groovy.lang.ExpandoMetaClass;
+import groovy.lang.GString;
+import groovy.lang.GroovyObject;
+import groovy.lang.GroovyRuntimeException;
+import groovy.lang.GroovySystem;
+import groovy.lang.Groovydoc;
+import groovy.lang.IntRange;
+import groovy.lang.ListWithDefault;
+import groovy.lang.MapWithDefault;
+import groovy.lang.MetaClass;
+import groovy.lang.MetaClassImpl;
+import groovy.lang.MetaClassRegistry;
+import groovy.lang.MetaMethod;
+import groovy.lang.MetaProperty;
+import groovy.lang.MissingPropertyException;
+import groovy.lang.ObjectRange;
+import groovy.lang.PropertyValue;
+import groovy.lang.Range;
+import groovy.lang.SpreadMap;
+import groovy.lang.Tuple2;
+import groovy.lang.Writable;
 import groovy.transform.stc.ClosureParams;
 import groovy.transform.stc.FirstParam;
 import groovy.transform.stc.FromString;
@@ -44,7 +68,24 @@ import org.codehaus.groovy.runtime.dgmimpl.NumberNumberDiv;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberMinus;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberMultiply;
 import org.codehaus.groovy.runtime.dgmimpl.NumberNumberPlus;
-import org.codehaus.groovy.runtime.dgmimpl.arrays.*;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.BooleanArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.BooleanArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ByteArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ByteArrayPutAtMetaMethod;
+import 
org.codehaus.groovy.runtime.dgmimpl.arrays.CharacterArrayGetAtMetaMethod;
+import 
org.codehaus.groovy.runtime.dgmimpl.arrays.CharacterArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.DoubleArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.DoubleArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.FloatArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.FloatArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.IntegerArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.LongArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.LongArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ObjectArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ObjectArrayPutAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ShortArrayGetAtMetaMethod;
+import org.codehaus.groovy.runtime.dgmimpl.arrays.ShortArrayPutAtMetaMethod;
 import org.codehaus.groovy.runtime.metaclass.MetaClassRegistryImpl;
 import org.codehaus.groovy.runtime.metaclass.MissingPropertyExceptionNoStack;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
@@ -53,11 +94,31 @@ import org.codehaus.groovy.runtime.typehandling.NumberMath;
 import org.codehaus.groovy.tools.RootLoader;
 import org.codehaus.groovy.transform.trait.Traits;
 import org.codehaus.groovy.util.ArrayIterator;
-import org.codehaus.groovy.util.ListBufferedIterator;
 import org.codehaus.groovy.util.IteratorBufferedIterator;
+import org.codehaus.groovy.util.ListBufferedIterator;
 
-import java.io.*;
+import java.io.BufferedInputStream;

groovy git commit: Minor refactoring: Generify GroovydocHolder

groovy git commit: Minor refactoring: Generify GroovydocHolder

[1/2] groovy git commit: Refine `getGroovydoc` DGMs

[2/2] groovy git commit: Refine groovydoc support further

groovy git commit: Refine groovydoc support further

groovy git commit: Refine `getGroovydoc` DGMs

groovy git commit: Add `getGroovydoc` DGMs

groovy git commit: Add `getGroovydoc` DGMs

8 matches

Site Navigation

Mail list logo

Footer information