SLING-12011 - Using LazyBindings

apache · Aug 26, 2023 · c07f26c · c07f26c
1 parent c0f38e9
commit c07f26c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 19 deletions.
diff --git a/.../src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java b/.../src/main/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProvider.java
@@ -22,6 +22,7 @@
 import javax.servlet.ServletRequest;
 
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.scripting.LazyBindings;
 import org.apache.sling.cms.CMSConstants;
 import org.apache.sling.cms.CMSUtils;
 import org.apache.sling.cms.ComponentConfiguration;
@@ -34,29 +35,57 @@
 public class DefaultScriptBindingsValueProvider implements BindingsValuesProvider {
 
     public static final String PN_CURRENT_PAGE = "currentPage";
+    public static final String PN_CURRENT_PAGE_EVALUATED = "org.apache.sling.cms.core.internal.DefaultScriptBindingsValueProvider_"
+            + PN_CURRENT_PAGE + "_evaluated";
 
     @Override
     public void addBindings(Bindings bindings) {
         Resource resource = (Resource) bindings.get("resource");
+        bindLazy((LazyBindings) bindings, resource);
+    }
+
+    private void bindLazy(LazyBindings bindings, Resource resource) {
+        bindings.put("properties", new LazyBindings.Supplier() {
+            @Override
+            public Object get() {
+                return resource.getValueMap();
+            }
+        });
+
+        bindings.put("componentConfiguration", new LazyBindings.Supplier() {
+            @Override
+            public Object get() {
+                return Optional.ofNullable(resource.adaptTo(ComponentConfiguration.class))
+                        .map(ComponentConfiguration::getProperties).orElse(null);
+            }
+        });
 
-        bindings.put("properties", resource.getValueMap());
-
-        Optional.ofNullable(resource.adaptTo(ComponentConfiguration.class)).map(ComponentConfiguration::getProperties)
-                .ifPresent(p -> bindings.put("componentConfiguration", p));
-
-        Resource publishableParent = CMSUtils.findPublishableParent(resource);
-        if (publishableParent != null && CMSConstants.NT_PAGE.equals(publishableParent.getResourceType())) {
-            Optional.of(publishableParent.adaptTo(Page.class)).ifPresent(p -> {
-                bindings.put("page", p);
-                ServletRequest request = (ServletRequest) bindings.get("request");
-                if (request.getAttribute(PN_CURRENT_PAGE) == null) {
-                    request.setAttribute(PN_CURRENT_PAGE, p);
-                    bindings.put(PN_CURRENT_PAGE, p);
-                } else {
-                    bindings.put(PN_CURRENT_PAGE, request.getAttribute(PN_CURRENT_PAGE));
+        bindings.put("page", new LazyBindings.Supplier() {
+            @Override
+            public Object get() {
+                Resource publishableParent = CMSUtils.findPublishableParent(resource);
+                if (publishableParent != null && CMSConstants.NT_PAGE.equals(publishableParent.getResourceType())) {
+                    return publishableParent.adaptTo(Page.class);
                 }
-            });
+                return null;
+            }
+        });
+        ServletRequest request = (ServletRequest) bindings.get("request");
+        if (request.getAttribute(PN_CURRENT_PAGE_EVALUATED) == null) {
+            Resource publishableParent = CMSUtils.findPublishableParent(resource);
+            if (publishableParent != null && CMSConstants.NT_PAGE.equals(publishableParent.getResourceType())) {
+                Optional.of(publishableParent.adaptTo(Page.class)).ifPresent(p -> {
+                    bindings.put("page", p);
+                    if (request.getAttribute(PN_CURRENT_PAGE) == null) {
+                        request.setAttribute(PN_CURRENT_PAGE, p);
+                        bindings.put(PN_CURRENT_PAGE, p);
+                    } else {
+                        bindings.put(PN_CURRENT_PAGE, request.getAttribute(PN_CURRENT_PAGE));
+                    }
+                });
+            }
+            request.setAttribute(PN_CURRENT_PAGE_EVALUATED, true);
         }
-
     }
+
 }
diff --git a/.../test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java b/.../test/java/org/apache/sling/cms/core/internal/DefaultScriptBindingsValueProviderTest.java
@@ -24,6 +24,7 @@
 import javax.script.Bindings;
 
 import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.cms.Page;
 import org.apache.sling.cms.core.helpers.SlingCMSTestHelper;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
@@ -43,7 +44,7 @@ public void init() {
 
     @Test
     public void testPageBinding() {
-        Bindings bindings = new MockBindings();
+        Bindings bindings = new SlingBindings();
         context.currentResource("/content/apache/sling-apache-org/index");
         bindings.put("resource", context.currentResource());
         bindings.put("request", context.request());
@@ -66,7 +67,7 @@ public void testPageBinding() {
 
     @Test
     public void testSiteBinding() {
-        Bindings bindings = new MockBindings();
+        Bindings bindings = new SlingBindings();
         context.currentResource("/content/apache/sling-apache-org");
         bindings.put("resource", context.currentResource());
         bindings.put("request", context.request());