You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by jo...@apache.org on 2021/05/11 21:06:08 UTC
[sling-org-apache-sling-api] branch master updated: Revert
"SLING-8759 use computeIfAbsent to reduce code size (#26)" (#30)
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
The following commit(s) were added to refs/heads/master by this push:
new 7bced42 Revert "SLING-8759 use computeIfAbsent to reduce code size (#26)" (#30)
7bced42 is described below
commit 7bced42b62930068045bb9752f0fb1a1aa619064
Author: Jörg Hoh <jo...@users.noreply.github.com>
AuthorDate: Tue May 11 23:05:59 2021 +0200
Revert "SLING-8759 use computeIfAbsent to reduce code size (#26)" (#30)
* Revert "SLING-8759 use computeIfAbsent to reduce code size (#26)" This reverts commit eeb8f84f92a2f1bbfad236ba9dca9c15c2e837f3.
* add a test case to illustrate nested invocation
---
.../apache/sling/api/adapter/SlingAdaptable.java | 19 +++++--
.../sling/api/adapter/SlingAdaptableTest.java | 66 +++++++++++++++++-----
2 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java b/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
index 7ecf5fd..5adf0ce 100644
--- a/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
+++ b/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
@@ -94,15 +94,22 @@ public abstract class SlingAdaptable implements Adaptable {
*/
@SuppressWarnings("unchecked")
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+ AdapterType result = null;
synchronized ( this ) {
- if (ADAPTER_MANAGER == null) {
- return null;
+ if ( adaptersCache != null ) {
+ result = (AdapterType) adaptersCache.get(type);
}
- if (adaptersCache == null) {
- adaptersCache = new HashMap<Class<?>, Object>();
+ if ( result == null ) {
+ final AdapterManager mgr = ADAPTER_MANAGER;
+ result = (mgr == null ? null : mgr.getAdapter(this, type));
+ if ( result != null ) {
+ if ( adaptersCache == null ) {
+ adaptersCache = new HashMap<Class<?>, Object>();
+ }
+ adaptersCache.put(type, result);
+ }
}
- return (AdapterType) adaptersCache.computeIfAbsent(type,
- klazz -> ADAPTER_MANAGER.getAdapter(this, type));
}
+ return result;
}
}
diff --git a/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java b/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
index 3e56ddc..9f0d247 100644
--- a/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
+++ b/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
@@ -26,6 +26,9 @@ import org.junit.Test;
import static org.mockito.Mockito.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
public class SlingAdaptableTest {
private SlingAdaptable sut;
@@ -39,31 +42,64 @@ public class SlingAdaptableTest {
@Test
public void testAdaptTo() {
- assertNull(sut.adaptTo(AdapterType.class));
+ assertNull(sut.adaptTo(TestAdapterType.class));
SlingAdaptable.setAdapterManager(adapterMgr);
- assertNull(sut.adaptTo(AdapterType.class));
+ assertNull(sut.adaptTo(TestAdapterType.class));
}
@Test
public void testAdaptToWithCache() {
SlingAdaptable.setAdapterManager(adapterMgr);
- when (adapterMgr.getAdapter(any(), eq(AdapterType.class))).thenReturn(new AdapterType());
- assertNotNull(sut.adaptTo(AdapterType.class));
- verify(adapterMgr,times(1)).getAdapter(any(), eq(AdapterType.class));
+ when (adapterMgr.getAdapter(any(), eq(TestAdapterType.class))).thenReturn(new TestAdapterType());
+ assertNotNull(sut.adaptTo(TestAdapterType.class));
+ verify(adapterMgr,times(1)).getAdapter(any(), eq(TestAdapterType.class));
// the 2nd time it has to come out of the cache
- assertNotNull(sut.adaptTo(AdapterType.class));
- verify(adapterMgr,times(1)).getAdapter(any(), eq(AdapterType.class));
+ assertNotNull(sut.adaptTo(TestAdapterType.class));
+ verify(adapterMgr,times(1)).getAdapter(any(), eq(TestAdapterType.class));
+
+ assertNull(sut.adaptTo(TestAdapterType2.class));
+ when (adapterMgr.getAdapter(any(), eq(TestAdapterType2.class))).thenReturn(new TestAdapterType2());
+ assertNotNull(sut.adaptTo(TestAdapterType2.class));
+ assertNotNull(sut.adaptTo(TestAdapterType.class));
+ }
+
+ // SLING-10371
+ @Test()
+ public void testNestedAdaptTo() {
+ SlingAdaptable.setAdapterManager(adapterMgr);
+ SuperTypeCallingAdaptable adaptable = new SuperTypeCallingAdaptable();
+ when(adapterMgr.getAdapter(eq(adaptable),eq(TestAdapterType.class)))
+ .thenAnswer(invocation -> {
+ SlingAdaptable a = (SlingAdaptable) invocation.getArgument(0);
+ a.adaptTo(String.class); // trigger nested invocation
+ return new TestAdapterType();
+ });
+ when(adapterMgr.getAdapter(eq(adaptable),eq(String.class)))
+ .thenAnswer(invocation -> {
+ return "someValue";
+ });
+ assertNotNull(adaptable.adaptTo(TestAdapterType.class));
+ }
+
- assertNull(sut.adaptTo(AdapterType2.class));
- when (adapterMgr.getAdapter(any(), eq(AdapterType2.class))).thenReturn(new AdapterType2());
- assertNotNull(sut.adaptTo(AdapterType2.class));
- assertNotNull(sut.adaptTo(AdapterType.class));
+ public class SuperTypeCallingAdaptable extends SlingAdaptable {
+ @Override
+ public <AdapterType> @Nullable AdapterType adaptTo(@NotNull Class<AdapterType> type) {
+ // always fallback to the supertype implementation
+ if (type == TestAdapterType.class) {
+ return (@Nullable AdapterType) super.adaptTo(TestAdapterType.class);
+ }
+ if (type == String.class) {
+ return (@Nullable AdapterType) super.adaptTo(String.class);
+ }
+ return null;
+ }
}
- // pseudo adaptable
- public class AdapterType {}
+ // test adaptables
+ public class TestAdapterType {}
// pseudo adaptable
- public class AdapterType2 {}
-}
+ public class TestAdapterType2 {}
+}
\ No newline at end of file