[sling-whiteboard] branch master updated: Rename FeatureServiceImpl to FeaturesServiceImpl

[davidb]

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 f098cd7  Rename FeatureServiceImpl to FeaturesServiceImpl
f098cd7 is described below

commit f098cd781e4511bf0c2dc28643bbcb07d2396eb0
Author: David Bosschaert <david.bosscha...@gmail.com>
AuthorDate: Tue Jul 10 15:24:52 2018 +0100

    Rename FeatureServiceImpl to FeaturesServiceImpl
---
 .../main/java/org/apache/sling/feature/service/impl/Activator.java    | 2 +-
 .../impl/{FeatureServiceImpl.java => FeaturesServiceImpl.java}        | 4 ++--
 .../org/apache/sling/feature/service/impl/FeaturesServiceManager.java | 2 +-
 .../org/apache/sling/feature/service/impl/FeatureServiceImplTest.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/Activator.java
 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/Activator.java
index 98c10b1..db65574 100644
--- 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/Activator.java
+++ 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/Activator.java
@@ -30,7 +30,7 @@ public class Activator implements BundleActivator {
     @Override
     public void start(BundleContext context) throws Exception {
         Dictionary<String, Object> props = new Hashtable<>();
-        props.put(Constants.SERVICE_PID, FeatureServiceImpl.class.getName());
+        props.put(Constants.SERVICE_PID, FeaturesServiceImpl.class.getName());
         context.registerService(ManagedService.class,
                 new FeaturesServiceManager(context), props);
     }
diff --git 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeatureServiceImpl.java
 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java
similarity index 92%
rename from 
featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeatureServiceImpl.java
rename to 
featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java
index 03d2064..bae2909 100644
--- 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeatureServiceImpl.java
+++ 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceImpl.java
@@ -28,11 +28,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-class FeatureServiceImpl implements Features {
+class FeaturesServiceImpl implements Features {
     private final Set<String> features;
     private final Map<Map.Entry<String, Version>, String> bundleFeatureMap;
 
-    FeatureServiceImpl(Map<Map.Entry<String, Version>, String> 
bundleIDFeatures) {
+    FeaturesServiceImpl(Map<Map.Entry<String, Version>, String> 
bundleIDFeatures) {
         bundleFeatureMap = Collections.unmodifiableMap(bundleIDFeatures);
 
         Set<String> fs = new HashSet<>(bundleIDFeatures.values());
diff --git 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceManager.java
 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceManager.java
index e4492c9..269528b 100644
--- 
a/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceManager.java
+++ 
b/featuremodel/feature-service/src/main/java/org/apache/sling/feature/service/impl/FeaturesServiceManager.java
@@ -77,7 +77,7 @@ class FeaturesServiceManager implements ManagedService {
             }
         }
 
-        FeatureServiceImpl fs = new FeatureServiceImpl(bundleIDFeatures);
+        FeaturesServiceImpl fs = new FeaturesServiceImpl(bundleIDFeatures);
         reg = bundleContext.registerService(Features.class, fs, props);
     }
 
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 5b9a74a..145aa9b 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
@@ -42,7 +42,7 @@ public class FeatureServiceImplTest {
         String f2 = "gid:aid2:1.0.0";
         bif.put(new AbstractMap.SimpleEntry<String,Version>("mybsn", new 
Version(7,8,9)), f2);
 
-        Features fs = new FeatureServiceImpl(bif);
+        Features fs = new FeaturesServiceImpl(bif);
         assertEquals(2, fs.listFeatures().size());
 
         assertEquals(f1, fs.getFeatureForBundle("mybsn", new Version(1,2,3)));