From issues-return-151444-archive-asf-public=cust-asf.ponee.io@maven.apache.org Sun Jun 30 12:13:20 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 7E0A7180645 for ; Sun, 30 Jun 2019 14:13:20 +0200 (CEST) Received: (qmail 78733 invoked by uid 500); 30 Jun 2019 12:13:19 -0000 Mailing-List: contact issues-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list issues@maven.apache.org Received: (qmail 78722 invoked by uid 99); 30 Jun 2019 12:13:19 -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, 30 Jun 2019 12:13:19 +0000 From: GitBox To: issues@maven.apache.org Subject: [GitHub] [maven] gnodet commented on a change in pull request #262: Improve speed in collection merging Message-ID: <156189679967.5471.17463915561102933448.gitbox@gitbox.apache.org> Date: Sun, 30 Jun 2019 12:13:19 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit gnodet commented on a change in pull request #262: Improve speed in collection merging URL: https://github.com/apache/maven/pull/262#discussion_r298831343 ########## File path: maven-model/src/main/java/org/apache/maven/model/merge/ModelMerger.java ########## @@ -3018,4 +2618,298 @@ protected Object getExclusionKey( Exclusion exclusion ) return exclusion; } + interface KeyComputer + { + Object key( T t ); + } + + class DependencyKeyComputer implements KeyComputer + { + @Override + public Object key( Dependency dependency ) + { + return getDependencyKey( dependency ); + } + } + + class LicenseKeyComputer implements KeyComputer + { + @Override + public Object key( License license ) + { + return getLicenseKey( license ); + } + } + + class MailingListKeyComputer implements KeyComputer + { + @Override + public Object key( MailingList mailingList ) + { + return getMailingListKey( mailingList ); + } + } + + class DeveloperKeyComputer implements KeyComputer + { + @Override + public Object key( Developer developer ) + { + return getDeveloperKey( developer ); + } + } + + class ContributorKeyComputer implements KeyComputer + { + @Override + public Object key( Contributor contributor ) + { + return getContributorKey( contributor ); + } + } + + class ProfileKeyComputer implements KeyComputer + { + @Override + public Object key( Profile profile ) + { + return getProfileKey( profile ); + } + } + + class RepositoryKeyComputer implements KeyComputer + { + @Override + public Object key( Repository repository ) + { + return getRepositoryKey( repository ); + } + } + + class ReportPluginKeyComputer implements KeyComputer + { + @Override + public Object key( ReportPlugin plugin ) + { + return getReportPluginKey( plugin ); + } + } + + class PluginKeyComputer implements KeyComputer + { + @Override + public Object key( Plugin plugin ) + { + return getPluginKey( plugin ); + } + } + + class ReportSetKeyComputer implements KeyComputer + { + @Override + public Object key( ReportSet reportSet ) + { + return getReportSetKey( reportSet ); + } + } + + class NotifierKeyComputer implements KeyComputer + { + @Override + public Object key( Notifier notifier ) + { + return getNotifierKey( notifier ); + } + } + + class ExtensionKeyComputer implements KeyComputer + { + @Override + public Object key( Extension extension ) + { + return getExtensionKey( extension ); + } + } + + class ResourceKeyComputer implements KeyComputer + { + @Override + public Object key( Resource resource ) + { + return getResourceKey( resource ); + } + } + + class ExecutionKeyComputer implements KeyComputer + { + @Override + public Object key( PluginExecution pluginExecution ) + { + return getPluginExecutionKey( pluginExecution ); + } + } + + class ExclusionKeyComputer implements KeyComputer + { + @Override + public Object key( Exclusion exclusion ) + { + return getExclusionKey( exclusion ); + } + } + + static List merge( List tgt, List src, boolean sourceDominant, KeyComputer computer ) + { + if ( src.isEmpty() ) + { + return tgt; + } + + MergingList list; + if ( tgt instanceof MergingList ) + { + list = (MergingList) tgt; + } + else + { + list = new MergingList<>( computer, src.size() + tgt.size() ); + list.mergeAll( tgt, true ); + } + + list.mergeAll( src, sourceDominant ); + return list; + } + + /** + * Merging list + * @param + */ + public static class MergingList extends AbstractList + { + private final KeyComputer keyComputer; + private Map map; + private List list; Review comment: I think the `MergingList` class would be better as private, which may help removing some of the problems. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services