#3457 allow disabling the ContentPolicyValueInjector (#3549)

* #3457 allow disabling the COntentPolicyValueInjector

Author: joerghoh

bundle/pom.xml

@@ -560,6 +560,12 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+            <version>5.2.0</version>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>

bundle/src/main/java/com/adobe/acs/commons/models/injectors/impl/ContentPolicyValueInjector.java

@@ -34,7 +34,11 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,9 +53,21 @@
                 Constants.SERVICE_RANKING + ":Integer=5500"
         },
         service = Injector.class
-)
+        )
+@Designate(ocd=ContentPolicyValueInjector.Configuration.class)
 public class ContentPolicyValueInjector  implements Injector {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ContentPolicyValueInjector.class);
+
+    Configuration config;
+
+    @Activate
+    public void activate(Configuration c) {
+        this.config = c;
+        LOG.info("ContentPolicyValueInjector {}", config.enabled() ? "enabled": "disabled");
+    }
+
+
     @NotNull
     @Override
     public String getName() {
@@ -61,15 +77,25 @@ public String getName() {
     @Nullable
     @Override
     public Object getValue(Object adaptable, String name, Type declaredType, AnnotatedElement element,
-                           DisposalCallbackRegistry callbackRegistry) {
-        ContentPolicy policy = getContentPolicy(adaptable);
+            DisposalCallbackRegistry callbackRegistry) {
+        if (!config.enabled()) {
+            return null;
+        }
 
+        ContentPolicy policy = getContentPolicy(adaptable);
         if(policy != null){
             return convertValueMapValue(policy.getProperties(), name, declaredType);
         }
-
         return null;
     }
 
 
+    @ObjectClassDefinition(name="ACS AEM Commons ContentPolicyValueInjector")
+    public @interface Configuration {
+
+        @AttributeDefinition(name="enabled")
+        public boolean enabled() default true;
+
+    }
+
 }

bundle/src/test/java/com/adobe/acs/commons/models/injectors/impl/ContentPolicyValueInjectorTest.java

@@ -0,0 +1,54 @@
+/*-
+ * #%L
+ * ACS AEM Commons Bundle
+ * %%
+ * Copyright (C) 2013 - 2025 Adobe
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package com.adobe.acs.commons.models.injectors.impl;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.junit.Rule;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+
+public class ContentPolicyValueInjectorTest {
+
+    @Rule
+    private OsgiContext context = new OsgiContext();
+
+
+    @Test
+    public void testDisabledInjector() {
+        ContentPolicyValueInjector injector = new ContentPolicyValueInjector();
+        Map<String,String> props = new HashMap<>();
+        props.put("enabled", "false");
+        context.registerInjectActivateService(injector, props);
+
+        try (MockedStatic<InjectorUtils> injectorUtils = Mockito.mockStatic(InjectorUtils.class)) {
+            injectorUtils.when(() -> InjectorUtils.getContentPolicy(any()))
+                .thenReturn(null);
+            injectorUtils.verify(() -> InjectorUtils.getContentPolicy(any()),never());
+        }
+    }
+
+}