This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp-taglib.git
The following commit(s) were added to refs/heads/master by this push:
new a816259 SLING-8274 - Revert changes that broke backwards compatibility
a816259 is described below
commit a816259343f22b9ea119c98dab4e8c0a81ca2b7a
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Feb 12 10:42:07 2019 +0100
SLING-8274 - Revert changes that broke backwards compatibility
- add missing functions
- removed private contructors
---
.../apache/sling/scripting/jsp/taglib/FindResourcesTag.java | 11 ++++++++++-
.../apache/sling/scripting/jsp/taglib/GetResourceTag.java | 12 +++++++++++-
.../apache/sling/scripting/jsp/taglib/SlingFunctions.java | 5 -----
.../sling/scripting/jsp/taglib/helpers/XSSSupport.java | 4 ----
.../sling/scripting/jsp/taglib/helpers/package-info.java | 2 +-
.../org/apache/sling/scripting/jsp/taglib/package-info.java | 2 +-
6 files changed, 23 insertions(+), 13 deletions(-)
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/FindResourcesTag.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/FindResourcesTag.java
index d62dc16..e9edc03 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/FindResourcesTag.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/FindResourcesTag.java
@@ -57,7 +57,7 @@ public class FindResourcesTag extends TagSupport {
log.debug("Finding resources using query: {} of language {}", query,
language);
- ResourceResolver resolver =
SlingFunctions.getResourceResolver(pageContext);
+ ResourceResolver resolver = getResourceResolver();
final Iterator<Resource> resources = resolver.findResources(query,
language);
log.debug("Saving resources to variable {}", var);
@@ -65,6 +65,15 @@ public class FindResourcesTag extends TagSupport {
return EVAL_PAGE;
}
+
+ /**
+ * Method for retrieving the ResourceResolver from the page context.
+ *
+ * @return the resource resolver
+ */
+ protected ResourceResolver getResourceResolver() {
+ return SlingFunctions.getResourceResolver(pageContext);
+ }
/**
* Gets the language.
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/GetResourceTag.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/GetResourceTag.java
index 78f9f22..baeac13 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/GetResourceTag.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/GetResourceTag.java
@@ -48,7 +48,7 @@ public class GetResourceTag extends TagSupport {
public int doEndTag() {
log.trace("doEndTag");
- ResourceResolver resolver =
SlingFunctions.getResourceResolver(pageContext);
+ ResourceResolver resolver = getResourceResolver();
Resource resource = null;
if (path.startsWith("/")) {
log.debug("Retrieving resource at absolute path: {}", path);
@@ -69,6 +69,16 @@ public class GetResourceTag extends TagSupport {
}
/**
+ * Method for retrieving the ResourceResolver from the page context.
+ *
+ * @return the resource resolver
+ */
+ protected ResourceResolver getResourceResolver() {
+ return SlingFunctions.getResourceResolver(pageContext);
+ }
+
+
+ /**
* Gets the base resource.
*
* @return the base resource
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
index 0d0e29d..0f702c9 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/SlingFunctions.java
@@ -305,9 +305,4 @@ public class SlingFunctions {
private static Class<?> loadClass(String className) throws
ClassNotFoundException {
return
Thread.currentThread().getContextClassLoader().loadClass(className);
}
-
- private SlingFunctions() {
- // hide the public constructor since it's a utility class
- }
-
}
\ No newline at end of file
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
index 510df76..6004b8a 100644
---
a/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
+++
b/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/XSSSupport.java
@@ -78,8 +78,4 @@ public class XSSSupport {
public static ENCODING_MODE getEncodingMode(String modeStr) {
return ENCODING_MODE.valueOf(modeStr.toUpperCase());
}
-
- private XSSSupport() {
- // hide the public constructor
- }
}
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
index 03938c9..3b4f496 100644
---
a/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
+++
b/src/main/java/org/apache/sling/scripting/jsp/taglib/helpers/package-info.java
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
[email protected]("3.0.0")
[email protected]("2.2.0")
package org.apache.sling.scripting.jsp.taglib.helpers;
diff --git
a/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
b/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
index 1d6d7b2..84dcca7 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/taglib/package-info.java
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
[email protected]("3.0.0")
[email protected]("2.4.0")
package org.apache.sling.scripting.jsp.taglib;
