[sling-org-apache-sling-resourcemerger] branch master updated: SLING-12091 Use constructor injection to ensure bundleContext is set (#12)

[kwin]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git


The following commit(s) were added to refs/heads/master by this push:
     new 3057e88  SLING-12091 Use constructor injection to ensure bundleContext 
is set (#12)
3057e88 is described below

commit 3057e880fc9ebebec487fa02ef173c5b5a7b9037
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Mon Oct 23 18:04:22 2023 +0200

    SLING-12091 Use constructor injection to ensure bundleContext is set (#12)
    
    once bind methods are called
---
 .../sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
index 1a007ac..ed97583 100644
--- 
a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
+++ 
b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java
@@ -27,6 +27,7 @@ import org.apache.sling.commons.osgi.PropertiesUtil;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
 import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.jetbrains.annotations.NotNull;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
@@ -44,12 +45,12 @@ import 
org.osgi.service.component.annotations.ReferencePolicy;
 @Component
 public class MergedResourcePickerWhiteboard {
 
-    private BundleContext bundleContext;
+    private final @NotNull BundleContext bundleContext;
 
     private final Map<Long, ServiceRegistration<ResourceProvider<Void>>> 
resourceProvidersPerPickerServiceId = new ConcurrentHashMap<>();
 
     @Activate
-    protected void activate(final BundleContext bundleContext) {
+    public MergedResourcePickerWhiteboard(final @NotNull BundleContext 
bundleContext) {
         this.bundleContext = bundleContext;
     }