[groovy] branch master updated: minor refactor

[emilles]

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 88d78f5  minor refactor
88d78f5 is described below

commit 88d78f599e5f02c744cfde3b7293167aee2a6f09
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Sat Oct 5 10:31:08 2019 -0500

    minor refactor
---
 .../java/org/codehaus/groovy/ast/MethodNode.java   | 55 ++++++++++++----------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/ast/MethodNode.java 
b/src/main/java/org/codehaus/groovy/ast/MethodNode.java
index 4b8bc36..b05888b 100644
--- a/src/main/java/org/codehaus/groovy/ast/MethodNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/MethodNode.java
@@ -24,12 +24,13 @@ import org.codehaus.groovy.ast.stmt.Statement;
 import org.objectweb.asm.Opcodes;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Represents a method declaration
  */
 public class MethodNode extends AnnotatedNode implements Opcodes {
-    public static final String SCRIPT_BODY_METHOD_KEY = 
"org.codehaus.groovy.ast.MethodNode.isScriptBody";
+
     private final String name;
     private int modifiers;
     private boolean syntheticPublic;
@@ -41,7 +42,6 @@ public class MethodNode extends AnnotatedNode implements 
Opcodes {
     private VariableScope variableScope;
     private final ClassNode[] exceptions;
     private final boolean staticConstructor;
-    private boolean hasDefault; // annotation method value
 
     // type spec for generics
     private GenericsType[] genericsTypes;
@@ -55,7 +55,6 @@ public class MethodNode extends AnnotatedNode implements 
Opcodes {
         this.code = code;
         setReturnType(returnType);
         setParameters(parameters);
-        this.hasDefault = false;
         this.exceptions = exceptions;
         this.staticConstructor = (name != null && name.equals("<clinit>"));
     }
@@ -156,7 +155,8 @@ public class MethodNode extends AnnotatedNode implements 
Opcodes {
     }
 
     public boolean isDefault() {
-        return (modifiers & (ACC_ABSTRACT | ACC_PUBLIC | ACC_STATIC)) == 
ACC_PUBLIC && getDeclaringClass() != null && getDeclaringClass().isInterface();
+        return (modifiers & (ACC_ABSTRACT | ACC_PUBLIC | ACC_STATIC)) == 
ACC_PUBLIC &&
+            
Optional.ofNullable(getDeclaringClass()).filter(ClassNode::isInterface).isPresent();
     }
 
     public boolean isFinal() {
@@ -183,22 +183,6 @@ public class MethodNode extends AnnotatedNode implements 
Opcodes {
         return (modifiers & (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED)) == 0;
     }
 
-    /**
-     * @return {@code true} if this method is the run method from a script
-     */
-    public boolean isScriptBody() {
-        return getNodeMetaData(SCRIPT_BODY_METHOD_KEY) != null;
-    }
-
-    /**
-     * Set the metadata flag for this method to indicate that it is a script 
body implementation.
-     *
-     * @see ModuleNode#createStatementsClass()
-     */
-    public void setIsScriptBody() {
-        setNodeMetaData(SCRIPT_BODY_METHOD_KEY, Boolean.TRUE);
-    }
-
     public ClassNode[] getExceptions() {
         return exceptions;
     }
@@ -226,12 +210,35 @@ public class MethodNode extends AnnotatedNode implements 
Opcodes {
         this.genericsTypes = genericsTypes;
     }
 
-    public void setAnnotationDefault(boolean hasDefault) {
-        this.hasDefault = hasDefault;
+    /**
+     * @return {@code true} if annotation method has a default value
+     */
+    public boolean hasAnnotationDefault() {
+        return 
Boolean.TRUE.equals(getNodeMetaData("org.codehaus.groovy.ast.MethodNode.hasDefaultValue"));
+    }
+
+    public void setAnnotationDefault(boolean hasDefaultValue) {
+        if (hasDefaultValue) {
+            
putNodeMetaData("org.codehaus.groovy.ast.MethodNode.hasDefaultValue", 
Boolean.TRUE);
+        } else {
+            
removeNodeMetaData("org.codehaus.groovy.ast.MethodNode.hasDefaultValue");
+        }
     }
 
-    public boolean hasAnnotationDefault() {
-        return hasDefault;
+    /**
+     * @return {@code true} if this method is the run method from a script
+     */
+    public boolean isScriptBody() {
+        return 
Boolean.TRUE.equals(getNodeMetaData("org.codehaus.groovy.ast.MethodNode.isScriptBody"));
+    }
+
+    /**
+     * Sets the flag for this method to indicate it is a script body 
implementation.
+     *
+     * @see ModuleNode#createStatementsClass()
+     */
+    public void setIsScriptBody() {
+        setNodeMetaData("org.codehaus.groovy.ast.MethodNode.isScriptBody", 
Boolean.TRUE);
     }
 
     public boolean isStaticConstructor() {