[sling-org-apache-sling-testing-sling-mock] branch master updated: SLING-9021 sling-mock: Respect context request when resolving sling binding properties

[ss...@apache.org]

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

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git


The following commit(s) were added to refs/heads/master by this push:
     new fca63d1  SLING-9021 sling-mock: Respect context request when resolving sling binding properties
fca63d1 is described below

commit fca63d1b43ac09f3b3ffab0c4da508bb63f5f148
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Wed Jan 22 23:59:28 2020 +0100

    SLING-9021 sling-mock: Respect context request when resolving sling binding properties
---
 .../sling/testing/mock/sling/context/MockSlingBindings.java |  2 +-
 .../sling/testing/mock/sling/context/SlingContextImpl.java  | 13 +++++++++++++
 .../sling/testing/mock/sling/context/package-info.java      |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
index 95cabd2..0f6f464 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/context/MockSlingBindings.java
@@ -47,7 +47,7 @@ class MockSlingBindings extends SlingBindings {
     @Override
     public Object get(Object key) {
         if (key instanceof String) {
-            Object result = context.resolveSlingBindingProperty((String)key);
+            Object result = context.resolveSlingBindingProperty((String)key, context.request());
             if (result != null) {
                 return result;
             }
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
index cae5416..a565015 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
@@ -24,6 +24,7 @@ import java.util.Set;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.adapter.AdapterFactory;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.Resource;
@@ -286,8 +287,20 @@ public class SlingContextImpl extends OsgiContextImpl {
     /**
      * Dynamically resolve property request for current request {@link SlingBindings}.
      * @param property Property key
+     * @param request Context request
      * @return Resolved object or null if no result found
      */
+    protected @Nullable Object resolveSlingBindingProperty(@NotNull String property, @NotNull SlingHttpServletRequest request) {
+        return MockSlingBindings.resolveSlingBindingProperty(this, property);
+    }
+
+    /**
+     * Dynamically resolve property request for current request {@link SlingBindings}.
+     * @param property Property key
+     * @return Resolved object or null if no result found
+     * @deprecated Please use {@link #resolveSlingBindingProperty(String, SlingHttpServletRequest)}
+     */
+    @Deprecated
     protected @Nullable Object resolveSlingBindingProperty(@NotNull String property) {
         return MockSlingBindings.resolveSlingBindingProperty(this, property);
     }
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java b/core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
index 35c2f9c..ac777cf 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/context/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Sling context implementation for unit tests.
  */
-@org.osgi.annotation.versioning.Version("3.7.0")
+@org.osgi.annotation.versioning.Version("3.8.0")
 package org.apache.sling.testing.mock.sling.context;