This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push: new 0121d80 Remove Features.listFeatures() as it is not used at this time 0121d80 is described below commit 0121d805a1d7b81171bd1920a56c4e6ee44cd2ed Author: David Bosschaert <david.bosscha...@gmail.com> AuthorDate: Thu Jul 12 10:42:10 2018 +0200 Remove Features.listFeatures() as it is not used at this time --- .../main/java/org/apache/sling/feature/service/Features.java | 3 --- .../sling/feature/service/impl/FeaturesServiceImpl.java | 12 ------------ .../sling/feature/service/impl/FeatureServiceImplTest.java | 1 - 3 files changed, 16 deletions(-) diff --git a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java index 46dd595..afc3886 100644 --- a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java +++ b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/Features.java @@ -20,9 +20,6 @@ package org.apache.sling.feature.service; import org.osgi.framework.Version; -import java.util.Collection; - public interface Features { - Collection<String> listFeatures(); String getFeatureForBundle(String bsn, Version ver); } diff --git a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java index bae2909..c9e17b3 100644 --- a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java +++ b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java @@ -22,26 +22,14 @@ import org.apache.sling.feature.service.Features; import org.osgi.framework.Version; import java.util.AbstractMap; -import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Map; -import java.util.Set; class FeaturesServiceImpl implements Features { - private final Set<String> features; private final Map<Map.Entry<String, Version>, String> bundleFeatureMap; FeaturesServiceImpl(Map<Map.Entry<String, Version>, String> bundleIDFeatures) { bundleFeatureMap = Collections.unmodifiableMap(bundleIDFeatures); - - Set<String> fs = new HashSet<>(bundleIDFeatures.values()); - features = Collections.unmodifiableSet(fs); - } - - @Override - public Collection<String> listFeatures() { - return features; } @Override diff --git a/featuremodel/feature-service/src/test/java/org/apache/sling/feature/service/impl/FeatureServiceImplTest.java b/featuremodel/feature-service/src/test/java/org/apache/sling/feature/service/impl/FeatureServiceImplTest.java index 145aa9b..32a1859 100644 --- a/featuremodel/feature-service/src/test/java/org/apache/sling/feature/service/impl/FeatureServiceImplTest.java +++ b/featuremodel/feature-service/src/test/java/org/apache/sling/feature/service/impl/FeatureServiceImplTest.java @@ -43,7 +43,6 @@ public class FeatureServiceImplTest { bif.put(new AbstractMap.SimpleEntry<String,Version>("mybsn", new Version(7,8,9)), f2); Features fs = new FeaturesServiceImpl(bif); - assertEquals(2, fs.listFeatures().size()); assertEquals(f1, fs.getFeatureForBundle("mybsn", new Version(1,2,3))); assertEquals(f1, fs.getFeatureForBundle("mybsn2", new Version(4,5,6)));