From commits-return-9650-archive-asf-public=cust-asf.ponee.io@groovy.apache.org Sun Nov 3 15:42:21 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id BCA6E1806C5 for ; Sun, 3 Nov 2019 16:42:19 +0100 (CET) Received: (qmail 89141 invoked by uid 500); 3 Nov 2019 15:42:18 -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 88659 invoked by uid 99); 3 Nov 2019 15:42:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Nov 2019 15:42:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C7DDF80620; Sun, 3 Nov 2019 15:42:16 +0000 (UTC) Date: Sun, 03 Nov 2019 15:42:30 +0000 To: "commits@groovy.apache.org" Subject: [groovy] 14/18: Trivial refactoring: Comparator combinator can be used MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: sunlan@apache.org In-Reply-To: <157279573613.25471.9638114992416249601@gitbox.apache.org> References: <157279573613.25471.9638114992416249601@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: groovy X-Git-Refname: refs/heads/GROOVY_3_0_X X-Git-Reftype: branch X-Git-Rev: aa966b3faf0bc62ad0d3ce649455a445b26e92b5 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191103154216.C7DDF80620@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit aa966b3faf0bc62ad0d3ce649455a445b26e92b5 Author: Daniel Sun AuthorDate: Sun Nov 3 22:57:06 2019 +0800 Trivial refactoring: Comparator combinator can be used (cherry picked from commit 5143bb7f8aa9b2ddd35b20624f0e7e441b35ed95) --- src/main/java/groovy/util/FactoryBuilderSupport.java | 7 +------ .../org/codehaus/groovy/transform/SortableASTTransformation.java | 2 +- .../org/codehaus/groovy/transform/ToStringASTTransformation.java | 2 +- .../groovy/transform/TupleConstructorASTTransformation.java | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/groovy/util/FactoryBuilderSupport.java b/src/main/java/groovy/util/FactoryBuilderSupport.java index be85429..7c9642f 100644 --- a/src/main/java/groovy/util/FactoryBuilderSupport.java +++ b/src/main/java/groovy/util/FactoryBuilderSupport.java @@ -71,12 +71,7 @@ public abstract class FactoryBuilderSupport extends Binding { public static final String CHILD_BUILDER = "_CHILD_BUILDER_"; public static final String SCRIPT_CLASS_NAME = "_SCRIPT_CLASS_NAME_"; private static final Logger LOG = Logger.getLogger(FactoryBuilderSupport.class.getName()); - private static final Comparator METHOD_COMPARATOR = (o1, o2) -> { - int cmp = o1.getName().compareTo(o2.getName()); - if (cmp != 0) return cmp; - cmp = o1.getParameterTypes().length - o2.getParameterTypes().length; - return cmp; - }; + private static final Comparator METHOD_COMPARATOR = Comparator.comparing(Method::getName).thenComparingInt(o -> o.getParameterTypes().length); /** * Throws an exception if value is null. diff --git a/src/main/java/org/codehaus/groovy/transform/SortableASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/SortableASTTransformation.java index 1f8cd4d..c12ff24 100644 --- a/src/main/java/org/codehaus/groovy/transform/SortableASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/SortableASTTransformation.java @@ -235,7 +235,7 @@ public class SortableASTTransformation extends AbstractASTTransformation { checkComparable(pNode); } if (includes != null) { - Comparator includeComparator = (o1, o2) -> Integer.compare(includes.indexOf(o1.getName()), includes.indexOf(o2.getName())); + Comparator includeComparator = Comparator.comparingInt(o -> includes.indexOf(o.getName())); properties.sort(includeComparator); } return properties; diff --git a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java index a8acd42..80871a4 100644 --- a/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ToStringASTTransformation.java @@ -217,7 +217,7 @@ public class ToStringASTTransformation extends AbstractASTTransformation { } if (includes != null) { - Comparator includeComparator = (tse1, tse2) -> Integer.compare(includes.indexOf(tse1.name), includes.indexOf(tse2.name)); + Comparator includeComparator = Comparator.comparingInt(tse -> includes.indexOf(tse.name)); elements.sort(includeComparator); } diff --git a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java index df4be58..4c97c67 100644 --- a/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/TupleConstructorASTTransformation.java @@ -247,7 +247,7 @@ public class TupleConstructorASTTransformation extends AbstractASTTransformation } if (includes != null) { - Comparator includeComparator = (p1, p2) -> Integer.compare(includes.indexOf(p1.getName()), includes.indexOf(p2.getName())); + Comparator includeComparator = Comparator.comparingInt(p -> includes.indexOf(p.getName())); params.sort(includeComparator); }