This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-1.6.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit fd0b26066f3986b16ccd76d1c23f9c7f05ceeaef Author: Stefan Seifert <[email protected]> AuthorDate: Thu Oct 1 22:21:42 2015 +0000 SLING-5086 sling-mock: Add SlingContext.registerAdapter convenience method git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1706326 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/testing/mock/sling/context/SlingContextImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java index 0fe023f..b561325 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java @@ -336,8 +336,10 @@ public class SlingContextImpl extends OsgiContextImpl { * @param adaptableClass Class to adapt from * @param adapterClass Class to adapt to * @param adapter Object which is always returned for this adaption. + * @param <T1> Adaptable type + * @param <T2> Adapter type */ - public <T1, T2> void registerAdapter(final Class<T1> adaptableClass, final Class<T2> adapterClass, + public final <T1, T2> void registerAdapter(final Class<T1> adaptableClass, final Class<T2> adapterClass, final T2 adapter) { registerAdapter(adaptableClass, adapterClass, new Function<T1, T2>() { @Override @@ -353,8 +355,10 @@ public class SlingContextImpl extends OsgiContextImpl { * @param adaptableClass Class to adapt from * @param adapterClass Class to adapt to * @param adaptHandler Function to handle the adaption + * @param <T1> Adaptable type + * @param <T2> Adapter type */ - public <T1, T2> void registerAdapter(final Class<T1> adaptableClass, final Class<T2> adapterClass, + public final <T1, T2> void registerAdapter(final Class<T1> adaptableClass, final Class<T2> adapterClass, final Function<T1,T2> adaptHandler) { AdapterFactory adapterFactory = new AdapterFactory() { @SuppressWarnings("unchecked") @@ -368,7 +372,7 @@ public class SlingContextImpl extends OsgiContextImpl { adaptableClass.getName() }) .put(AdapterFactory.ADAPTER_CLASSES, new String[] { - adapterClass.getName() + adapterClass.getName() }) .build()); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
