You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/22 22:38:44 UTC

[sling-org-apache-sling-testing-caconfig-mock-plugin] branch master updated: SLING-11033 caconfig-mock-plugin: Support Sling Models injector for CAConfig

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-caconfig-mock-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 45a8c79  SLING-11033 caconfig-mock-plugin: Support Sling Models injector for CAConfig
45a8c79 is described below

commit 45a8c79621877a4c7e399c6e96626f1e6b1e1dcd
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Dec 22 23:27:06 2021 +0100

    SLING-11033 caconfig-mock-plugin: Support Sling Models injector for CAConfig
---
 .../org/apache/sling/testing/mock/caconfig/ContextPlugins.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
index 5565d36..d5df0c0 100644
--- a/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
+++ b/src/main/java/org/apache/sling/testing/mock/caconfig/ContextPlugins.java
@@ -53,6 +53,7 @@ public final class ContextPlugins {
             registerConfigurationResourceResolver(context);
             registerConfigurationResolver(context);
             registerConfigurationManagement(context);
+            registerModelsInjector(context);
             registerConfigurationResourceResolverDefaultImpl(context);
             registerConfigurationResolverDefaultImpl(context);
 
@@ -70,6 +71,7 @@ public final class ContextPlugins {
             registerConfigurationResourceResolver(context);
             registerConfigurationResolver(context);
             registerConfigurationManagement(context);
+            registerModelsInjector(context);
         }
     };
 
@@ -154,6 +156,11 @@ public final class ContextPlugins {
         registerByClassName(context, "org.apache.sling.caconfig.impl.ConfigurationInjectResourceDetectionStrategyMultiplexerImpl");
     }
 
+    private static void registerModelsInjector(SlingContextImpl context) {
+        // required for impl 1.6
+        registerByClassName(context, "org.apache.sling.models.caconfig.impl.injectors.ContextAwareConfigurationInjector");
+    }
+
     @SuppressWarnings("null")
     private static boolean registerByClassName(SlingContextImpl context, String className) {
         try {