You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2022/07/11 16:20:36 UTC
[sling-org-apache-sling-resourceresolver] branch master updated: SLING-11448 : Provide a mode option for resource providers
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/master by this push:
new 3498103 SLING-11448 : Provide a mode option for resource providers
3498103 is described below
commit 34981039b8e6178cf98eb9f38adefcdbf71597fe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jul 11 18:20:29 2022 +0200
SLING-11448 : Provide a mode option for resource providers
---
pom.xml | 4 ++--
.../resourceresolver/impl/providers/ResourceProviderInfo.java | 9 +--------
.../java/org/apache/sling/resourceresolver/impl/Fixture.java | 2 +-
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1991f41..86a48e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.9.1-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<name>Apache Sling Resource Resolver</name>
<description>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.24.0</version>
+ <version>2.26.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
index 495f433..e5653a9 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderInfo.java
@@ -30,13 +30,6 @@ import org.slf4j.LoggerFactory;
*/
public class ResourceProviderInfo implements Comparable<ResourceProviderInfo> {
- /** mode for the resource resolver (should move to api) */
- public static final String PROP_MODE = "provider.mode";
- /** Default mode */
- public static final String MODE_OVERLAY = "overlay";
- /** Passthrough mode */
- public static final String MODE_PASSTHROUGH = "passthrough";
-
public enum Mode {
OVERLAY,
PASSTHROUGH
@@ -83,7 +76,7 @@ public class ResourceProviderInfo implements Comparable<ResourceProviderInfo> {
this.adaptable = PropertiesUtil.toBoolean(ref.getProperty(ResourceProvider.PROPERTY_ADAPTABLE), false);
this.refreshable = PropertiesUtil.toBoolean(ref.getProperty(ResourceProvider.PROPERTY_REFRESHABLE), false);
this.attributable = PropertiesUtil.toBoolean(ref.getProperty(ResourceProvider.PROPERTY_ATTRIBUTABLE), false);
- final String modeValue = PropertiesUtil.toString(ref.getProperty(PROP_MODE), MODE_OVERLAY).toUpperCase();
+ final String modeValue = PropertiesUtil.toString(ref.getProperty(ResourceProvider.PROPERTY_MODE), ResourceProvider.MODE_OVERLAY).toUpperCase();
Mode mode = null;
try {
mode = Mode.valueOf(modeValue);
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/Fixture.java b/src/test/java/org/apache/sling/resourceresolver/impl/Fixture.java
index a7bada6..f959df0 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/Fixture.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/Fixture.java
@@ -64,7 +64,7 @@ public class Fixture {
props.put(Constants.SERVICE_RANKING, serviceRanking);
}
if ( mode != null ) {
- props.put(ResourceProviderInfo.PROP_MODE, mode.name());
+ props.put(ResourceProvider.PROPERTY_MODE, mode.name());
}
ServiceRegistration registration = bc.registerService(ResourceProvider.class.getName(), rp, props);