From commits-return-5371-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Mon Feb 5 02:04:33 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 2B2DC18064A for ; Mon, 5 Feb 2018 02:04:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1B60C160C59; Mon, 5 Feb 2018 01:04:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 631E6160C41 for ; Mon, 5 Feb 2018 02:04:32 +0100 (CET) Received: (qmail 46922 invoked by uid 500); 5 Feb 2018 01:04:31 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 46913 invoked by uid 99); 5 Feb 2018 01:04:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2018 01:04:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 67CACDFC29; Mon, 5 Feb 2018 01:04:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunlan@apache.org To: commits@groovy.apache.org Message-Id: <9bfbac3c9e0447509aeba4a61871a801@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Trivial refactoring: remove duplicated code Date: Mon, 5 Feb 2018 01:04:29 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/master d8d551e1d -> 6f73fb997 Trivial refactoring: remove duplicated code Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/6f73fb99 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/6f73fb99 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/6f73fb99 Branch: refs/heads/master Commit: 6f73fb99734f3ef722dcc60e0c11072ad9cd8141 Parents: d8d551e Author: sunlan Authored: Mon Feb 5 09:04:23 2018 +0800 Committer: sunlan Committed: Mon Feb 5 09:04:23 2018 +0800 ---------------------------------------------------------------------- .../transform/AbstractASTTransformation.java | 54 ++++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/6f73fb99/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformation.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformation.java index e8ca861..4498e95 100644 --- a/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformation.java @@ -141,18 +141,12 @@ public abstract class AbstractASTTransformation implements Opcodes, ASTTransform return null; } if (expr instanceof ListExpression) { - List list = new ArrayList(); final ListExpression listExpression = (ListExpression) expr; if (isUndefinedMarkerList(listExpression)) { return null; } - for (Expression itemExpr : listExpression.getExpressions()) { - if (itemExpr != null && itemExpr instanceof ConstantExpression) { - Object value = ((ConstantExpression) itemExpr).getValue(); - if (value != null) list.add(value.toString()); - } - } - return list; + + return getValueStringList(listExpression); } return tokenize(getMemberStringValue(anno, name)); } @@ -175,32 +169,32 @@ public abstract class AbstractASTTransformation implements Opcodes, ASTTransform List list; Expression expr = anno.getMember(name); if (expr != null && expr instanceof ListExpression) { - list = new ArrayList(); final ListExpression listExpression = (ListExpression) expr; - for (Expression itemExpr : listExpression.getExpressions()) { - if (itemExpr != null && itemExpr instanceof ConstantExpression) { - Object value = ((ConstantExpression) itemExpr).getValue(); - if (value != null) list.add(value.toString()); - } - } + list = getValueStringList(listExpression); } else { list = tokenize(getMemberStringValue(anno, name)); } return list; } + private static List getValueStringList(ListExpression listExpression) { + List list = new ArrayList(); + for (Expression itemExpr : listExpression.getExpressions()) { + if (itemExpr != null && itemExpr instanceof ConstantExpression) { + Object value = ((ConstantExpression) itemExpr).getValue(); + if (value != null) list.add(value.toString()); + } + } + return list; + } + @Deprecated public List getClassList(AnnotationNode anno, String name) { List list = new ArrayList(); Expression expr = anno.getMember(name); if (expr != null && expr instanceof ListExpression) { final ListExpression listExpression = (ListExpression) expr; - for (Expression itemExpr : listExpression.getExpressions()) { - if (itemExpr != null && itemExpr instanceof ClassExpression) { - ClassNode cn = itemExpr.getType(); - if (cn != null) list.add(cn); - } - } + list = getTypeList(listExpression); } else if (expr != null && expr instanceof ClassExpression) { ClassNode cn = expr.getType(); if (cn != null) list.add(cn); @@ -219,12 +213,7 @@ public abstract class AbstractASTTransformation implements Opcodes, ASTTransform if (isUndefinedMarkerList(listExpression)) { return null; } - for (Expression itemExpr : listExpression.getExpressions()) { - if (itemExpr != null && itemExpr instanceof ClassExpression) { - ClassNode cn = itemExpr.getType(); - if (cn != null) list.add(cn); - } - } + list = getTypeList(listExpression); } else if (expr instanceof ClassExpression) { ClassNode cn = expr.getType(); if (isUndefined(cn)) return null; @@ -233,6 +222,17 @@ public abstract class AbstractASTTransformation implements Opcodes, ASTTransform return list; } + private static List getTypeList(ListExpression listExpression) { + List list = new ArrayList(); + for (Expression itemExpr : listExpression.getExpressions()) { + if (itemExpr != null && itemExpr instanceof ClassExpression) { + ClassNode cn = itemExpr.getType(); + if (cn != null) list.add(cn); + } + } + return list; + } + public void addError(String msg, ASTNode expr) { sourceUnit.getErrorCollector().addErrorAndContinue(new SyntaxErrorMessage( new SyntaxException(msg + '\n', expr.getLineNumber(), expr.getColumnNumber(),