You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2023/02/14 09:53:23 UTC

[sling-org-apache-sling-resourcemerger] 03/03: SLING-11773 - ResourceTypeHierarchyBasedResourcePicker not working anymore

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

radu pushed a commit to branch issue/osgi-registrations
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 2bbea241393a3cd5e98248964400d448603c5d10
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Feb 14 10:50:49 2023 +0100

    SLING-11773 - ResourceTypeHierarchyBasedResourcePicker not working anymore
    
    * added an activate method to correctly generate the default configuration
    values
---
 .../impl/picker/ResourceTypeHierarchyBasedResourcePicker.java      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java b/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
index 4d9251e..f736136 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/picker/ResourceTypeHierarchyBasedResourcePicker.java
@@ -28,6 +28,7 @@ import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.resourcemerger.impl.StubResource;
 import org.apache.sling.resourcemerger.spi.MergedResourcePicker2;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
@@ -52,6 +53,12 @@ public class ResourceTypeHierarchyBasedResourcePicker implements MergedResourceP
         boolean merge_readOnly() default true;
     }
 
+    @Activate
+    private void activate(Configuration configuration) {
+        // empty for now, required to correctly allow OSGi configurations without values to bind to this component,
+        // in order to activate it with default values
+    }
+
     public List<Resource> pickResources(ResourceResolver resolver, String relativePath, Resource relatedResource) {
         // TODO this method can be optimised by leveraging relatedResource (similar to MergingResourcePicker)