Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 97AEF200CB0 for ; Mon, 15 May 2017 15:12:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 966BA160BC2; Mon, 15 May 2017 13:12:03 +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 83F80160BD7 for ; Mon, 15 May 2017 15:12:02 +0200 (CEST) Received: (qmail 40966 invoked by uid 500); 15 May 2017 13:12:01 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 40624 invoked by uid 99); 15 May 2017 13:12:01 -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, 15 May 2017 13:12:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4AE32E00EF; Mon, 15 May 2017 13:12:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gnodet@apache.org To: commits@karaf.apache.org Date: Mon, 15 May 2017 13:12:06 -0000 Message-Id: <0e5683ee67c849fa94ad780c79106354@git.apache.org> In-Reply-To: <768545f3f8354b969724fa4c18da6beb@git.apache.org> References: <768545f3f8354b969724fa4c18da6beb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/11] karaf git commit: Remove some calls to getFeatures() so not we only call it once for a given method archived-at: Mon, 15 May 2017 13:12:03 -0000 Remove some calls to getFeatures() so not we only call it once for a given method Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6abe1379 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6abe1379 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6abe1379 Branch: refs/heads/master Commit: 6abe1379bc7f89174c07d6e585a37089e5b92288 Parents: 66d85a7 Author: Guillaume Nodet Authored: Mon May 15 14:32:52 2017 +0200 Committer: Guillaume Nodet Committed: Mon May 15 14:32:52 2017 +0200 ---------------------------------------------------------------------- .../internal/service/FeaturesServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6abe1379/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java ---------------------------------------------------------------------- diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java index ce318ac..b22ae3c 100644 --- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java +++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java @@ -627,7 +627,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall @Override public Feature getFeature(String name) throws Exception { - Feature[] features = this.getFeatures(name); + Feature[] features = getFeatures(name); if (features.length < 1) { return null; } else { @@ -637,7 +637,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall @Override public Feature getFeature(String name, String version) throws Exception { - Feature[] features = this.getFeatures(name, version); + Feature[] features = getFeatures(name, version); if (features.length < 1) { return null; } else { @@ -657,10 +657,11 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall public Feature[] getFeatures(String name, String version) throws Exception { List features = new ArrayList<>(); Pattern pattern = Pattern.compile(name); - for (String featureName : getFeatures().keySet()) { + Map> allFeatures = getFeatures(); + for (String featureName : allFeatures.keySet()) { Matcher matcher = pattern.matcher(featureName); if (matcher.matches()) { - Map versions = getFeatures().get(featureName); + Map versions = allFeatures.get(featureName); Feature matchingFeature = getFeatureMatching(versions, version); if (matchingFeature != null) { features.add(matchingFeature); @@ -923,6 +924,7 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall region = ROOT_REGION; } Set fl = required.computeIfAbsent(region, k -> new HashSet<>()); + Map> allFeatures = getFeatures(); List featuresToAdd = new ArrayList<>(); List featuresToRemove = new ArrayList<>(); for (String feature : features) { @@ -931,10 +933,10 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall String version = feature.substring(feature.indexOf(VERSION_SEPARATOR) + 1); Pattern pattern = Pattern.compile(name); boolean matched = false; - for (String fKey : getFeatures().keySet()) { + for (String fKey : allFeatures.keySet()) { Matcher matcher = pattern.matcher(fKey); if (matcher.matches()) { - Feature f = getFeatureMatching(getFeatures().get(fKey), version); + Feature f = getFeatureMatching(allFeatures.get(fKey), version); if (f != null) { String req = getFeatureRequirement(f); featuresToAdd.add(req);