[sling-org-apache-sling-feature-apiregions] branch master updated: SLING-10404 Log: 'No Configuration Admin API available' when it is available

[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-org-apache-sling-feature-apiregions.git


The following commit(s) were added to refs/heads/master by this push:
     new 47505a3  SLING-10404 Log: 'No Configuration Admin API available' when 
it is available
     new 8450c73  Merge pull request #14 from bosschaert/SLING-10404
47505a3 is described below

commit 47505a3eb05c23004af3af2264a19431a10ef226
Author: David Bosschaert <bossc...@adobe.com>
AuthorDate: Mon May 24 13:43:49 2021 +0100

    SLING-10404 Log: 'No Configuration Admin API available' when it is available
    
    When the Config Admin API is available don't log this message.
---
 .../java/org/apache/sling/feature/apiregions/impl/Activator.java  | 8 ++++----
 .../org/apache/sling/feature/apiregions/impl/ActivatorTest.java   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java 
b/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
index 7082979..5d0900f 100644
--- a/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
+++ b/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
@@ -153,14 +153,14 @@ public class Activator implements BundleActivator, 
FrameworkListener {
                 return;
             }
 
-            Requirement cmReq = createPackageRequirement();
+            Requirement cmReq = createCMPackageRequirement();
 
             // Reflectively register a Configuration Admin ManagedService, if 
the Config Admin API is available.
             // Because this fragment is a framework extension, we need to use 
the wiring API to find the CM API.
             Collection<BundleCapability> providers = fw.findProviders(cmReq);
             for (BundleCapability cap : providers) {
-                if ( registerManagedService(cap)) {
-                    break;
+                if (registerManagedService(cap)) {
+                    return;
                 }
             }
             LOG.log(Level.INFO, "No Configuration Admin API available");
@@ -296,7 +296,7 @@ public class Activator implements BundleActivator, 
FrameworkListener {
         return null;
     }
 
-    static Requirement createPackageRequirement() {
+    static Requirement createCMPackageRequirement() {
         Requirement cmReq = new Requirement() {
             @Override
             public String getNamespace() {
diff --git 
a/src/test/java/org/apache/sling/feature/apiregions/impl/ActivatorTest.java 
b/src/test/java/org/apache/sling/feature/apiregions/impl/ActivatorTest.java
index c52b0ce..bace3b3 100644
--- a/src/test/java/org/apache/sling/feature/apiregions/impl/ActivatorTest.java
+++ b/src/test/java/org/apache/sling/feature/apiregions/impl/ActivatorTest.java
@@ -275,7 +275,7 @@ public class ActivatorTest {
 
     @Test
     public void testCreatePackageRequirement() {
-        Requirement req = Activator.createPackageRequirement();
+        Requirement req = Activator.createCMPackageRequirement();
         assertEquals(PackageNamespace.PACKAGE_NAMESPACE, req.getNamespace());
         assertEquals(1, req.getDirectives().size());
         String directive = req.getDirectives().get("filter");