This is an automated email from the ASF dual-hosted git repository.
radu 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 c8c05f1 SLING-11773 - ResourceTypeHierarchyBasedResourcePicker not
working anymore
c8c05f1 is described below
commit c8c05f1c72d5269b8453c7539d4c33824755f61a
Author: Sagar Miglani <[email protected]>
AuthorDate: Tue Feb 14 15:31:00 2023 +0530
SLING-11773 - ResourceTypeHierarchyBasedResourcePicker not working anymore
---
.../impl/picker/ResourceTypeHierarchyBasedResourcePicker.java | 9 +++++++++
1 file changed, 9 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..a0094d6 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;
@@ -99,6 +100,14 @@ public class ResourceTypeHierarchyBasedResourcePicker
implements MergedResourceP
return resources;
}
+ @Activate
+ protected void activate(final Configuration config) {
+ // Added an empty activate method to populate the component properties
+ // from the component property types methods with defaults
+ // See - SLING-11773 and
+ //
https://docs.osgi.org/specification/osgi.cmpn/8.0.0/service.component.html#service.component-ordering.generated.properties
+ }
+
private void findInheritanceRoot(final Resource target, final
InheritanceRootInfo info) {
String superType = target.getResourceSuperType();
if (superType != null) {
