You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2018/08/16 15:45:59 UTC
[sling-org-apache-sling-api] branch feature/SLING-7792 updated
(8bcb3ec -> 9982a58)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch feature/SLING-7792
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git.
from 8bcb3ec SLING-7792 - Resource Resolver should return more than one resolved path if available
new 68e23e7 Revert "SLING-7792 - Resource Resolver should return more than one resolved path"
add e7cfc30 [maven-release-plugin] prepare release org.apache.sling.api-2.18.2
add fde63ac [maven-release-plugin] prepare for next development iteration
add 1dccffe SLING-7798 : Switch from JSR-305 annotations to Jetbrains Nullable/NotNull Annotations
new e51ac57 Merge remote-tracking branch 'origin/master' into feature/SLING-7792
new 9982a58 SLING-7792 - Resource Resolver should return more than one resolved path if available
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 8 +-
.../apache/sling/api/SlingHttpServletRequest.java | 36 ++++----
.../org/apache/sling/api/adapter/Adaptable.java | 6 +-
.../apache/sling/api/adapter/AdapterFactory.java | 8 +-
.../apache/sling/api/adapter/AdapterManager.java | 8 +-
.../org/apache/sling/api/adapter/package-info.java | 2 +-
.../org/apache/sling/api/auth/Authenticator.java | 6 +-
.../org/apache/sling/api/auth/package-info.java | 2 +-
.../java/org/apache/sling/api/package-info.java | 2 +-
.../apache/sling/api/request/RequestParameter.java | 16 ++--
.../sling/api/request/RequestParameterMap.java | 8 +-
.../apache/sling/api/request/RequestPathInfo.java | 16 ++--
.../sling/api/request/RequestProgressTracker.java | 18 ++--
.../org/apache/sling/api/request/RequestUtil.java | 16 ++--
.../org/apache/sling/api/request/ResponseUtil.java | 4 +-
.../org/apache/sling/api/request/package-info.java | 2 +-
.../api/resource/AbstractResourceVisitor.java | 6 +-
.../sling/api/resource/NonExistingResource.java | 4 +-
.../resource/ParametrizableResourceProvider.java | 10 +-
.../org/apache/sling/api/resource/Resource.java | 26 +++---
.../sling/api/resource/ResourceDecorator.java | 8 +-
.../sling/api/resource/ResourceMetadata.java | 28 +++---
.../sling/api/resource/ResourceProvider.java | 10 +-
.../api/resource/ResourceProviderFactory.java | 6 +-
.../sling/api/resource/ResourceResolver.java | 101 ++++++---------------
.../api/resource/ResourceResolverFactory.java | 14 +--
.../apache/sling/api/resource/ResourceUtil.java | 54 +++++------
.../apache/sling/api/resource/ResourceWrapper.java | 4 +-
.../sling/api/resource/SyntheticResource.java | 10 +-
.../org/apache/sling/api/resource/ValueMap.java | 8 +-
.../sling/api/resource/mapping/ResourceMapper.java | 65 +++++++------
.../api/resource/observation/ResourceChange.java | 24 ++---
.../observation/ResourceChangeListener.java | 4 +-
.../api/resource/observation/package-info.java | 2 +-
.../apache/sling/api/resource/package-info.java | 2 +-
.../org/apache/sling/api/resource/path/Path.java | 6 +-
.../sling/api/resource/path/package-info.java | 2 +-
.../apache/sling/api/scripting/SlingBindings.java | 18 ++--
.../apache/sling/api/scripting/SlingScript.java | 8 +-
.../sling/api/scripting/SlingScriptHelper.java | 38 ++++----
.../sling/api/scripting/SlingScriptResolver.java | 6 +-
.../apache/sling/api/scripting/package-info.java | 2 +-
.../sling/api/security/ResourceAccessSecurity.java | 22 ++---
.../apache/sling/api/security/package-info.java | 2 +-
.../apache/sling/api/servlets/OptingServlet.java | 4 +-
.../apache/sling/api/servlets/ServletResolver.java | 10 +-
.../sling/api/servlets/SlingAllMethodsServlet.java | 22 ++---
.../api/servlets/SlingSafeMethodsServlet.java | 38 ++++----
.../apache/sling/api/servlets/package-info.java | 2 +-
.../api/wrappers/ResourceResolverWrapper.java | 60 ++++++------
.../apache/sling/api/wrappers/package-info.java | 2 +-
.../spi/resource/provider/ObservationReporter.java | 10 +-
.../resource/provider/ObserverConfiguration.java | 10 +-
.../spi/resource/provider/ProviderContext.java | 4 +-
.../resource/provider/QueryLanguageProvider.java | 8 +-
.../spi/resource/provider/ResolveContext.java | 12 +--
.../spi/resource/provider/ResourceContext.java | 4 +-
.../spi/resource/provider/ResourceProvider.java | 60 ++++++------
.../sling/spi/resource/provider/package-info.java | 2 +-
59 files changed, 428 insertions(+), 468 deletions(-)
[sling-org-apache-sling-api] 02/03: Merge remote-tracking branch
'origin/master' into feature/SLING-7792
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7792
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit e51ac578b8e95206ac5ef7c9e0ff8b0c18117b68
Merge: 68e23e7 1dccffe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Aug 16 17:42:48 2018 +0200
Merge remote-tracking branch 'origin/master' into feature/SLING-7792
pom.xml | 8 +--
.../apache/sling/api/SlingHttpServletRequest.java | 36 ++++++-------
.../org/apache/sling/api/adapter/Adaptable.java | 6 +--
.../apache/sling/api/adapter/AdapterFactory.java | 8 +--
.../apache/sling/api/adapter/AdapterManager.java | 8 +--
.../org/apache/sling/api/adapter/package-info.java | 2 +-
.../org/apache/sling/api/auth/Authenticator.java | 6 +--
.../org/apache/sling/api/auth/package-info.java | 2 +-
.../java/org/apache/sling/api/package-info.java | 2 +-
.../apache/sling/api/request/RequestParameter.java | 16 +++---
.../sling/api/request/RequestParameterMap.java | 8 +--
.../apache/sling/api/request/RequestPathInfo.java | 16 +++---
.../sling/api/request/RequestProgressTracker.java | 18 +++----
.../org/apache/sling/api/request/RequestUtil.java | 16 +++---
.../org/apache/sling/api/request/ResponseUtil.java | 4 +-
.../org/apache/sling/api/request/package-info.java | 2 +-
.../api/resource/AbstractResourceVisitor.java | 6 +--
.../sling/api/resource/NonExistingResource.java | 4 +-
.../resource/ParametrizableResourceProvider.java | 10 ++--
.../org/apache/sling/api/resource/Resource.java | 26 +++++-----
.../sling/api/resource/ResourceDecorator.java | 8 +--
.../sling/api/resource/ResourceMetadata.java | 28 +++++-----
.../sling/api/resource/ResourceProvider.java | 10 ++--
.../api/resource/ResourceProviderFactory.java | 6 +--
.../sling/api/resource/ResourceResolver.java | 48 ++++++++---------
.../api/resource/ResourceResolverFactory.java | 14 ++---
.../apache/sling/api/resource/ResourceUtil.java | 54 +++++++++----------
.../apache/sling/api/resource/ResourceWrapper.java | 4 +-
.../sling/api/resource/SyntheticResource.java | 10 ++--
.../org/apache/sling/api/resource/ValueMap.java | 8 +--
.../api/resource/observation/ResourceChange.java | 24 ++++-----
.../observation/ResourceChangeListener.java | 4 +-
.../api/resource/observation/package-info.java | 2 +-
.../apache/sling/api/resource/package-info.java | 2 +-
.../org/apache/sling/api/resource/path/Path.java | 6 +--
.../sling/api/resource/path/package-info.java | 2 +-
.../apache/sling/api/scripting/SlingBindings.java | 18 +++----
.../apache/sling/api/scripting/SlingScript.java | 8 +--
.../sling/api/scripting/SlingScriptHelper.java | 38 +++++++-------
.../sling/api/scripting/SlingScriptResolver.java | 6 +--
.../apache/sling/api/scripting/package-info.java | 2 +-
.../sling/api/security/ResourceAccessSecurity.java | 22 ++++----
.../apache/sling/api/security/package-info.java | 2 +-
.../apache/sling/api/servlets/OptingServlet.java | 4 +-
.../apache/sling/api/servlets/ServletResolver.java | 10 ++--
.../sling/api/servlets/SlingAllMethodsServlet.java | 22 ++++----
.../api/servlets/SlingSafeMethodsServlet.java | 38 +++++++-------
.../apache/sling/api/servlets/package-info.java | 2 +-
.../api/wrappers/ResourceResolverWrapper.java | 60 +++++++++++-----------
.../apache/sling/api/wrappers/package-info.java | 2 +-
.../spi/resource/provider/ObservationReporter.java | 10 ++--
.../resource/provider/ObserverConfiguration.java | 10 ++--
.../spi/resource/provider/ProviderContext.java | 4 +-
.../resource/provider/QueryLanguageProvider.java | 8 +--
.../spi/resource/provider/ResolveContext.java | 12 ++---
.../spi/resource/provider/ResourceContext.java | 4 +-
.../spi/resource/provider/ResourceProvider.java | 60 +++++++++++-----------
.../sling/spi/resource/provider/package-info.java | 2 +-
58 files changed, 390 insertions(+), 388 deletions(-)
diff --cc src/main/java/org/apache/sling/api/resource/ResourceResolver.java
index fb90dd3,2899ea0..0cc9ba7
--- a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
@@@ -255,21 -254,59 +255,21 @@@ public interface ResourceResolver exten
* instead.
*/
@Deprecated
- @Nonnull Resource resolve(@Nonnull HttpServletRequest request);
+ @NotNull Resource resolve(@NotNull HttpServletRequest request);
/**
- * Returns a path mapped from the (resource) path applying the reverse
- * mapping used by the {@link #resolve(String)} such that when the path is
- * given to the {@link #resolve(String)} method the same resource is
- * returned.
- * <p>
- * Note, that technically the <code>resourcePath</code> need not refer to an
- * existing resource. This method just applies the mappings and returns the
- * resulting string. If the <code>resourcePath</code> does not address an
- * existing resource roundtripping may of course not work and calling
- * {@link #resolve(String)} with the path returned may return
- * <code>null</code>.
- * <p>
- * This method is intended as the reverse operation of the
- * {@link #resolve(String)} method.
- *
- * @param resourcePath The path for which to return a mapped path.
- * @return The mapped path.
- * @throws IllegalStateException if this resource resolver has already been
- * {@link #close() closed}.
+ * Returns a path mapped from the (resource) path
+ *
+ * @see {@link ResourceMapper#getMapping(String, HttpServletRequest)}
*/
- @Nonnull String map(@Nonnull String resourcePath);
+ @NotNull String map(@NotNull String resourcePath);
/**
- * Returns an URL mapped from the (resource) path applying the reverse
- * mapping used by the {@link #resolve(HttpServletRequest, String)} such
- * that when the path is given to the
- * {@link #resolve(HttpServletRequest, String)} method the same resource is
- * returned.
- * <p>
- * Note, that technically the <code>resourcePath</code> need not refer to an
- * existing resource. This method just applies the mappings and returns the
- * resulting string. If the <code>resourcePath</code> does not address an
- * existing resource roundtripping may of course not work and calling
- * {@link #resolve(HttpServletRequest, String)} with the path returned may
- * return <code>null</code>.
- * <p>
- * This method is intended as the reverse operation of the
- * {@link #resolve(HttpServletRequest, String)} method. As such the URL
- * returned is expected to be an absolute URL including scheme, host, any
- * servlet context path and the actual path used to resolve the resource.
- *
- * @param request The http servlet request object which may be used to apply
- * more mapping functionality.
- * @param resourcePath The path for which to return a mapped path.
- * @return The mapped URL.
- * @throws IllegalStateException if this resource resolver has already been
- * {@link #close() closed}.
- * @since 2.0.4 (Sling API Bundle 2.0.4)
+ * Returns an URL mapped from the (resource) path
+ *
+ * @see {@link ResourceMapper#getMapping(String, HttpServletRequest)}
*/
- @CheckForNull String map(@Nonnull HttpServletRequest request, @Nonnull String resourcePath);
+ @Nullable String map(@NotNull HttpServletRequest request, @NotNull String resourcePath);
/**
* Returns a {@link Resource} object for data located at the given path.
[sling-org-apache-sling-api] 01/03: Revert "SLING-7792 - Resource
Resolver should return more than one resolved path"
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7792
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit 68e23e784cb1edd7b3dc7fc23b2ed679756a75ba
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Aug 14 15:13:52 2018 +0200
Revert "SLING-7792 - Resource Resolver should return more than one resolved path"
This reverts commit 8bcb3eced71b2a9c7faf37c7f381a8780fa6570f.
---
.../sling/api/resource/ResourceResolver.java | 53 +++------------------
.../sling/api/resource/mapping/ResourceMapper.java | 55 +++++++++++-----------
2 files changed, 33 insertions(+), 75 deletions(-)
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
index 16503d4..fb90dd3 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
@@ -27,6 +27,7 @@ import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
import org.apache.sling.api.adapter.Adaptable;
+import org.apache.sling.api.resource.mapping.ResourceMapper;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -257,58 +258,16 @@ public interface ResourceResolver extends Adaptable, Closeable {
@Nonnull Resource resolve(@Nonnull HttpServletRequest request);
/**
- * Returns a path mapped from the (resource) path applying the reverse
- * mapping used by the {@link #resolve(String)} such that when the path is
- * given to the {@link #resolve(String)} method the same resource is
- * returned.
- * <p>
- * Note, that technically the <code>resourcePath</code> need not refer to an
- * existing resource. This method just applies the mappings and returns the
- * resulting string. If the <code>resourcePath</code> does not address an
- * existing resource roundtripping may of course not work and calling
- * {@link #resolve(String)} with the path returned may return
- * <code>null</code>.
- * <p>
- * This method is intended as the reverse operation of the
- * {@link #resolve(String)} method.
- *
- * @param resourcePath The path for which to return a mapped path.
- * @return The mapped path.
- * @throws IllegalStateException if this resource resolver has already been
- * {@link #close() closed}.
+ * Returns a path mapped from the (resource) path
*
- * @see org.apache.sling.api.resource.mapping.ResourceMapper#getMapping(String, HttpServletRequest)
+ * @see {@link ResourceMapper#getMapping(String, HttpServletRequest)}
*/
@Nonnull String map(@Nonnull String resourcePath);
/**
- * Returns an URL mapped from the (resource) path applying the reverse
- * mapping used by the {@link #resolve(HttpServletRequest, String)} such
- * that when the path is given to the
- * {@link #resolve(HttpServletRequest, String)} method the same resource is
- * returned.
- * <p>
- * Note, that technically the <code>resourcePath</code> need not refer to an
- * existing resource. This method just applies the mappings and returns the
- * resulting string. If the <code>resourcePath</code> does not address an
- * existing resource roundtripping may of course not work and calling
- * {@link #resolve(HttpServletRequest, String)} with the path returned may
- * return <code>null</code>.
- * <p>
- * This method is intended as the reverse operation of the
- * {@link #resolve(HttpServletRequest, String)} method. As such the URL
- * returned is expected to be an absolute URL including scheme, host, any
- * servlet context path and the actual path used to resolve the resource.
- *
- * @param request The http servlet request object which may be used to apply
- * more mapping functionality.
- * @param resourcePath The path for which to return a mapped path.
- * @return The mapped URL.
- * @throws IllegalStateException if this resource resolver has already been
- * {@link #close() closed}.
- * @since 2.0.4 (Sling API Bundle 2.0.4)
- *
- * @see org.apache.sling.api.resource.mapping.ResourceMapper#getMapping(String, HttpServletRequest)
+ * Returns an URL mapped from the (resource) path
+ *
+ * @see {@link ResourceMapper#getMapping(String, HttpServletRequest)}
*/
@CheckForNull String map(@Nonnull HttpServletRequest request, @Nonnull String resourcePath);
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
index 6550d46..b857054 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
@@ -23,67 +23,66 @@ import java.util.Collection;
import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
+import org.apache.sling.api.resource.ResourceResolver;
import org.osgi.annotation.versioning.ProviderType;
/**
* Allows access to resource mappings
*
* <p>This interface superceeds the resource mapping functionality present
- * in the {@link org.apache.sling.api.resource.ResourceResolver}.
- * Although the methods present in that interface will continue to work,
- * the resource mapper will provide better APIs to access the resource mappings.</p>
+ * in the {@link ResourceResolver}. Although the methods present in that
+ * interface will continue to work, the resource mapper will provide better
+ * APIs to access the resource mappings.</p>
*
- * <p>Implementations of this class are obtained by adapting a
- * {@link org.apache.sling.api.resource.ResourceResolver} instance. As such, the
- * mappings returned by its methods reflect the repository permissions of the underyling
- * resolver instance.</p>
+ * <p>Implementations of this class are obtained by adapting a {@link ResourceResolver}
+ * instance. As such, the mappings returned by its methods reflect the repository
+ * permissions of the underyling resolver instance.</p>
*/
@ProviderType
public interface ResourceMapper {
/**
- * Returns a path mapped from the (resource) path applying the reverse mapping
- * used by the {@link org.apache.sling.api.resource.ResourceResolver#resolve(String)}
- * such that when the path is given to the
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(String)} method
- * the same resource is returned.
+ * Returns a path mapped from the (resource) path applying the reverse
+ * mapping used by the {@link ResourceResolver#resolve(String)} such that when the path is
+ * given to the {@link ResourceResolver#resolve(String)} method the same resource is
+ * returned.
* <p>
* Note, that technically the <code>resourcePath</code> need not refer to an
* existing resource. This method just applies the mappings and returns the
* resulting string. If the <code>resourcePath</code> does not address an
* existing resource roundtripping may of course not work and calling
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(String)}
- * with the path returned may return <code>null</code>.
+ * {@link ResourceResolver#resolve(String)} with the path returned may return
+ * <code>null</code>.
* <p>
* This method is intended as the reverse operation of the
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(String)} method.
+ * {@link ResourceResolver#resolve(String)} method.
*
* @param resourcePath The path for which to return a mapped path.
* @return The mapped path.
* @throws IllegalStateException if the underlying resource resolver has already been
- * {@link org.apache.sling.api.resource.ResourceResolver#close() closed}.
+ * {@link ResourceResolver#close() closed}.
*
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
@Nonnull String getMapping(@Nonnull String resourcePath);
/**
- * Returns an URL mapped from the (resource) path applying the reverse mapping
- * used by the {@link org.apache.sling.api.resource.ResourceResolver#resolve(HttpServletRequest, String)}
- * such that when the path is given to the
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(HttpServletRequest, String)}
- * method the same resource is returned.
+ * Returns an URL mapped from the (resource) path applying the reverse
+ * mapping used by the {@link ResourceResolver#resolve(HttpServletRequest, String)} such
+ * that when the path is given to the
+ * {@link ResourceResolver#resolve(HttpServletRequest, String)} method the same resource is
+ * returned.
* <p>
* Note, that technically the <code>resourcePath</code> need not refer to an
* existing resource. This method just applies the mappings and returns the
* resulting string. If the <code>resourcePath</code> does not address an
* existing resource roundtripping may of course not work and calling
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(HttpServletRequest, String)}
- * with the path returned may return <code>null</code>.
+ * {@link ResourceResolver#resolve(HttpServletRequest, String)} with the path returned may
+ * return <code>null</code>.
* <p>
* This method is intended as the reverse operation of the
- * {@link org.apache.sling.api.resource.ResourceResolver#resolve(HttpServletRequest, String)} method.
- * As such the URL returned is expected to be an absolute URL including scheme, host, any
+ * {@link ResourceResolver#resolve(HttpServletRequest, String)} method. As such the URL
+ * returned is expected to be an absolute URL including scheme, host, any
* servlet context path and the actual path used to resolve the resource.
* @param resourcePath The path for which to return a mapped path.
@@ -91,7 +90,7 @@ public interface ResourceMapper {
* more mapping functionality.
* @return The mapped URL.
* @throws IllegalStateException if the underlying resource resolver has already been
- * {@link org.apache.sling.api.resource.ResourceResolver#close() closed}.
+ * {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
@Nonnull String getMapping(@Nonnull String resourcePath, @Nonnull HttpServletRequest request);
@@ -109,7 +108,7 @@ public interface ResourceMapper {
* @param resourcePath The path for which to return a mapped path.
* @return a collection of mapped URLs, in no particular order. May not be null or empty.
* @throws IllegalStateException if the underlying resource resolver has already been
- * {@link org.apache.sling.api.resource.ResourceResolver#close() closed}.
+ * {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
Collection<String> getAllMappings(@Nonnull String resourcePath);
@@ -130,7 +129,7 @@ public interface ResourceMapper {
* @return a collection of mapped URLs, in no particular order. May not be null or empty.
* @throws IllegalStateException if the underlying resource resolver has already been
- * {@link org.apache.sling.api.resource.ResourceResolver#close() closed}.
+ * {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
Collection<String> getAllMappings(@Nonnull String resourcePath, @Nonnull HttpServletRequest request);
[sling-org-apache-sling-api] 03/03: SLING-7792 - Resource Resolver
should return more than one resolved path if available
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7792
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit 9982a58b6c526fa412709a2cb9fc65fc98221e6c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Aug 16 17:44:22 2018 +0200
SLING-7792 - Resource Resolver should return more than one resolved path if available
Use Jetbrains annotations for the new code
---
.../org/apache/sling/api/resource/mapping/ResourceMapper.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
index b857054..53086d5 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
@@ -20,10 +20,10 @@ package org.apache.sling.api.resource.mapping;
import java.util.Collection;
-import javax.annotation.Nonnull;
import javax.servlet.http.HttpServletRequest;
import org.apache.sling.api.resource.ResourceResolver;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -64,7 +64,7 @@ public interface ResourceMapper {
*
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
- @Nonnull String getMapping(@Nonnull String resourcePath);
+ @NotNull String getMapping(@NotNull String resourcePath);
/**
* Returns an URL mapped from the (resource) path applying the reverse
@@ -93,7 +93,7 @@ public interface ResourceMapper {
* {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
- @Nonnull String getMapping(@Nonnull String resourcePath, @Nonnull HttpServletRequest request);
+ @NotNull String getMapping(@NotNull String resourcePath, @NotNull HttpServletRequest request);
/**
* Retuns all possible mappings for a given <tt>resourcePath</tt> as paths.
@@ -111,7 +111,7 @@ public interface ResourceMapper {
* {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
- Collection<String> getAllMappings(@Nonnull String resourcePath);
+ Collection<String> getAllMappings(@NotNull String resourcePath);
/**
* Retuns all possible mappings for a given <tt>resourcePath</tt> as URLs.
@@ -132,5 +132,5 @@ public interface ResourceMapper {
* {@link ResourceResolver#close() closed}.
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
- Collection<String> getAllMappings(@Nonnull String resourcePath, @Nonnull HttpServletRequest request);
+ Collection<String> getAllMappings(@NotNull String resourcePath, @NotNull HttpServletRequest request);
}