commit aad5f74e8db9d4656d1ed9f0c203d88d20a98da5
author Oliver Lietz <olli@apache.org> Sat Dec 19 20:42:19 2020 +0100
committer Oliver Lietz <olli@apache.org> Sat Dec 19 20:42:19 2020 +0100
tree 799a8685c5a21debc4bbc0aaa965bcea359e0917
parent 69db894e4c91a092d262a885609f2331b8818eb5

SLING-10013 Use ServiceUserMapped to ensure presence of service user mapping

pom.xml

diff --git a/pom.xml b/pom.xml
index 8213caa..4733a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.serviceusermapper</artifactId>
+            <version>1.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.paxexam</artifactId>
             <version>3.1.0</version>
             <scope>test</scope>

src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java

diff --git a/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java b/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
index e1df6c6..6b6a0aa 100644
--- a/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
+++ b/src/main/java/org/apache/sling/rewriter/impl/ProcessorManagerImpl.java
@@ -42,6 +42,7 @@
 import org.apache.sling.rewriter.Processor;
 import org.apache.sling.rewriter.ProcessorConfiguration;
 import org.apache.sling.rewriter.ProcessorManager;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
@@ -50,6 +51,8 @@
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicy;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,6 +81,12 @@
     @Reference
     private ResourceResolverFactory resourceResolverFactory;
 
+    @Reference(
+        policy = ReferencePolicy.DYNAMIC,
+        policyOption = ReferencePolicyOption.GREEDY
+    )
+    private volatile ServiceUserMapped serviceUserMapped;
+
     /** loaded processor configurations */
     private final Map<String, ConfigEntry[]> processors = new HashMap<>();