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 2016/12/09 14:02:53 UTC
svn commit: r1773399 - in
/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src:
main/java/org/apache/sling/testing/mock/caconfig/
test/java/org/apache/sling/testing/mock/caconfig/
Author: sseifert
Date: Fri Dec 9 14:02:53 2016
New Revision: 1773399
URL: http://svn.apache.org/viewvc?rev=1773399&view=rev
Log:
SLING-6360 simplify method signature
Modified:
sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java
sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java
Modified: sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java?rev=1773399&r1=1773398&r2=1773399&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/main/java/org/apache/sling/testing/mock/caconfig/MockContextAwareConfig.java Fri Dec 9 14:02:53 2016
@@ -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 MockContextAwareConfi
/**
* 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);
}
}
Modified: sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java?rev=1773399&r1=1773398&r2=1773399&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/testing/mocks/caconfig-mock-plugin/src/test/java/org/apache/sling/testing/mock/caconfig/ContextPluginsTest.java Fri Dec 9 14:02:53 2016
@@ -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(