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:46:02 UTC
[sling-org-apache-sling-api] 03/03: SLING-7792 - Resource Resolver
should return more than one resolved path if available
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);
}