[sling-org-apache-sling-models-impl] 01/01: SLING-11601 use the LazyBindings

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joerghoh pushed a commit to branch SLING-11601-use-lazybindings
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-impl.git

commit 45048c3044a500a951736f3770806d7c2d116e68
Author: Joerg Hoh <jo...@apache.org>
AuthorDate: Tue Sep 27 12:50:33 2022 +0200

    SLING-11601 use the LazyBindings
---
 pom.xml                                                              | 2 +-
 src/main/java/org/apache/sling/models/impl/ExportServlet.java        | 5 +++--
 .../apache/sling/models/impl/ResourceOverridingRequestWrapper.java   | 5 +++--
 .../org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5ce4e6b..4b7e1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.4.0</version>
+            <version>2.21.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/sling/models/impl/ExportServlet.java b/src/main/java/org/apache/sling/models/impl/ExportServlet.java
index 29c980e..736ba10 100644
--- a/src/main/java/org/apache/sling/models/impl/ExportServlet.java
+++ b/src/main/java/org/apache/sling/models/impl/ExportServlet.java
@@ -32,12 +32,13 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.script.SimpleBindings;
+import javax.script.Bindings;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.scripting.LazyBindings;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.api.scripting.SlingScriptHelper;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
@@ -125,7 +126,7 @@ class ExportServlet extends SlingSafeMethodsServlet {
 
     private void addScriptBindings(SlingScriptHelper scriptHelper, SlingHttpServletRequest request, SlingHttpServletResponse response)
             throws IOException {
-        SimpleBindings bindings = new SimpleBindings();
+        Bindings bindings = new LazyBindings();
         bindings.put(SLING, scriptHelper);
         bindings.put(RESOURCE, request.getResource());
         bindings.put(SlingModelsScriptEngineFactory.RESOLVER, request.getResource().getResourceResolver());
diff --git a/src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java b/src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java
index 803e040..0f8555d 100644
--- a/src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java
+++ b/src/main/java/org/apache/sling/models/impl/ResourceOverridingRequestWrapper.java
@@ -24,11 +24,12 @@ import static org.apache.sling.api.scripting.SlingBindings.RESOURCE;
 import static org.apache.sling.api.scripting.SlingBindings.RESPONSE;
 import static org.apache.sling.api.scripting.SlingBindings.SLING;
 
-import javax.script.SimpleBindings;
+import javax.script.Bindings;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.adapter.AdapterManager;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.scripting.LazyBindings;
 import org.apache.sling.api.scripting.SlingBindings;
 import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
 import org.apache.sling.scripting.api.BindingsValuesProvidersByContext;
@@ -51,7 +52,7 @@ class ResourceOverridingRequestWrapper extends SlingHttpServletRequestWrapper {
 
         SlingBindings existingBindings = (SlingBindings) wrappedRequest.getAttribute(SlingBindings.class.getName());
 
-        SimpleBindings bindings = new SimpleBindings();
+        Bindings bindings = new LazyBindings();
         if (existingBindings != null) {
             bindings.put(SLING, existingBindings.getSling());
             bindings.put(RESPONSE, existingBindings.getResponse());
diff --git a/src/main/java/org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java b/src/main/java/org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java
index 0b81609..bd6d40d 100644
--- a/src/main/java/org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/models/impl/SlingModelsScriptEngineFactory.java
@@ -23,9 +23,9 @@ import org.apache.sling.scripting.core.impl.helper.ProtectedBindings;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 
+import javax.script.Bindings;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
-import javax.script.SimpleBindings;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -74,7 +74,7 @@ class SlingModelsScriptEngineFactory extends AbstractScriptEngineFactory impleme
         return null;
     }
 
-    void invokeBindingsValuesProviders(BindingsValuesProvidersByContext bindingsValuesProvidersByContext, SimpleBindings bindings) {
+    void invokeBindingsValuesProviders(BindingsValuesProvidersByContext bindingsValuesProvidersByContext, Bindings bindings) {
         final Collection<BindingsValuesProvider> bindingsValuesProviders =
                 bindingsValuesProvidersByContext.getBindingsValuesProviders(this, SlingModelsScriptEngineFactory.BINDINGS_CONTEXT);