[sling-org-apache-sling-testing-caconfig-mock-plugin] 05/13: SLING-6360 simplify method signature

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.testing.caconfig-mock-plugin-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-caconfig-mock-plugin.git

commit 6e7f2a24164773cc38e855cc2a4b87d5a090c502
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Fri Dec 9 14:02:53 2016 +0000

    SLING-6360 simplify method signature
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin@1773399 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testing/mock/caconfig/MockContextAwareConfig.java      | 14 +++++++-------
 .../sling/testing/mock/caconfig/ContextPluginsTest.java    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java b/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java
index 02acb13..7f75c40 100644
--- a/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java
+++ b/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java
@@ -18,8 +18,8 @@
  */
 package org.apache.sling.testing.mock.caconfig;
 
+import org.apache.sling.testing.mock.sling.context.SlingContextImpl;
 import org.osgi.annotation.versioning.ProviderType;
-import org.osgi.framework.BundleContext;
 
 /**
  * Helps setting up a mock environment for Context-Aware Configuration.
@@ -33,20 +33,20 @@ public final class MockContextAwareConfig {
 
     /**
      * Search classpath for given class names to scan for and register all classes with @Configuration annotation.
-     * @param bundleContext Bundle context
+     * @param context Sling context
      * @param classNames Java class names
      */
-    public static void registerAnnotationClasses(BundleContext bundleContext, String... classNames) {
-        ConfigurationMetadataUtil.registerAnnotationClasses(bundleContext, classNames);
+    public static void registerAnnotationClasses(SlingContextImpl context, String... classNames) {
+        ConfigurationMetadataUtil.registerAnnotationClasses(context.bundleContext(), classNames);
     }
 
     /**
      * Search classpath for given class names to scan for and register all classes with @Configuration annotation.
-     * @param bundleContext Bundle context
+     * @param context Sling context
      * @param classNames Java class names
      */
-    public static void registerAnnotationClasses(BundleContext bundleContext, Class... classes) {
-        ConfigurationMetadataUtil.registerAnnotationClasses(bundleContext, classes);
+    public static void registerAnnotationClasses(SlingContextImpl context, Class... classes) {
+        ConfigurationMetadataUtil.registerAnnotationClasses(context.bundleContext(), classes);
     }
 
 }
diff --git a/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java b/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java
index 7f4c127..cd94d85 100644
--- a/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java
@@ -53,7 +53,7 @@ public class ContextPluginsTest {
         contextResource = context.create().resource("/content/site1/page1");
         
         // register configuration annotation class
-        MockContextAwareConfig.registerAnnotationClasses(context.bundleContext(), SimpleConfig.class);
+        MockContextAwareConfig.registerAnnotationClasses(context, SimpleConfig.class);
 
         // write config
         writeConfig(contextResource, CONFIG_NAME, ImmutableMap.<String, Object>of(

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.