commit 3057e880fc9ebebec487fa02ef173c5b5a7b9037
author Konrad Windszus <kwin@apache.org> Mon Oct 23 18:04:22 2023 +0200
committer GitHub <noreply@github.com> Mon Oct 23 18:04:22 2023 +0200
tree 37db6ee2ce12a258eb2687d13e3c11385f24b4b9
parent b23f89149b995e119c839030e0862be0d9b18ef5

SLING-12091 Use constructor injection to ensure bundleContext is set (#12)

once bind methods are called

src/main/java/org/apache/sling/resourcemerger/impl/MergedResourcePickerWhiteboard.java

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.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 @@
 @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;
     }