You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2017/06/12 19:53:18 UTC

svn commit: r1798518 - in /sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it: DecoratedTest.java services/TestResourceDecorator.java

Author: justin
Date: Mon Jun 12 19:53:18 2017
New Revision: 1798518

URL: http://svn.apache.org/viewvc?rev=1798518&view=rev
Log:
update decorator test to include custom adaptTo method which gets adaptTo to work as expected

Modified:
    sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java
    sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java

Modified: sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java?rev=1798518&r1=1798517&r2=1798518&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/DecoratedTest.java Mon Jun 12 19:53:18 2017
@@ -43,41 +43,50 @@ public class DecoratedTest {
 
     @TestReference
     private ModelFactory modelFactory;
-    
-    private String value;
+
     private ResourceResolver resolver;
-    private Resource resource;
-    private Node createdNode;
+    private Resource resourceWithDefaultWrapperBehavior;
+    private Resource resourceWithCustomAdaptToWrapper;
     
     @Before
     public void setUp() throws Exception {
-        value = RandomStringUtils.randomAlphanumeric(10);
 
         resolver = rrFactory.getAdministrativeResourceResolver(null);
         Session session = resolver.adaptTo(Session.class);
         Node rootNode = session.getRootNode();
-        createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
-        createdNode.setProperty("testProperty", value);
+        Node createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
         createdNode.setProperty("decorate", true);
         session.save();
 
-        resource = resolver.getResource(createdNode.getPath());
+        resourceWithDefaultWrapperBehavior = resolver.getResource(createdNode.getPath());
+
+        createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
+        createdNode.setProperty("decorate", "customAdaptTo");
+        session.save();
+
+        resourceWithCustomAdaptToWrapper = resolver.getResource(createdNode.getPath());
     }
 
     @After
     public void tearDown() throws Exception {
-        if (createdNode != null) {
-            createdNode.remove();
-        }
-        if (resolver != null) {
-            resolver.close();
-        }
+        resolver.delete(resourceWithDefaultWrapperBehavior);
+        resolver.delete(resourceWithCustomAdaptToWrapper);
+        resolver.close();
+    }
+
+    @Test
+    public void testInjectDecoratedResourceUsingCreateModel() {
+        assertTrue("Resource is not wrapped", resourceWithDefaultWrapperBehavior instanceof ResourceWrapper);
+        SelfModel model = modelFactory.createModel(resourceWithDefaultWrapperBehavior, SelfModel.class);
+
+        assertNotNull("Model is null", model);
+        assertTrue("Model is not wrapped", model.getResource() instanceof ResourceWrapper);
     }
 
     @Test
-    public void testInjectDecoratedResource() {
-        SelfModel model = modelFactory.createModel(resource, SelfModel.class);
-        assertTrue("Resource is not wrapped", resource instanceof ResourceWrapper);
+    public void testInjectDecoratedResourceUsingAdaptTo() {
+        assertTrue("Resource is not wrapped", resourceWithCustomAdaptToWrapper instanceof ResourceWrapper);
+        SelfModel model = resourceWithCustomAdaptToWrapper.adaptTo(SelfModel.class);
     
         assertNotNull("Model is null", model);
         assertTrue("Model is not wrapped", model.getResource() instanceof ResourceWrapper);

Modified: sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java?rev=1798518&r1=1798517&r2=1798518&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java (original)
+++ sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java Mon Jun 12 19:53:18 2017
@@ -17,7 +17,9 @@
 package org.apache.sling.models.it.services;
 
 import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.adapter.AdapterManager;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceDecorator;
 import org.apache.sling.api.resource.ResourceWrapper;
@@ -28,11 +30,29 @@ import javax.servlet.http.HttpServletReq
 @Component
 @Service
 public class TestResourceDecorator implements ResourceDecorator {
+
+    @Reference
+    private AdapterManager adapterManager;
+
     @Override
     public Resource decorate(Resource resource) {
         ValueMap map = resource.adaptTo(ValueMap.class);
         if (map != null && map.containsKey("decorate")) {
-            return new ResourceWrapper(resource);
+            if (map.get("decorate", "default").equals("customAdaptTo")) {
+                return new ResourceWrapper(resource) {
+                    @Override
+                    public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
+                        AdapterType adapter = adapterManager.getAdapter(this, type);
+                        if (adapter != null) {
+                            return adapter;
+                        } else {
+                            return super.adaptTo(type);
+                        }
+                    }
+                };
+            } else {
+                return new ResourceWrapper(resource);
+            }
         }
         return null;
     }