Author: kwin
Date: Thu Mar 17 13:42:54 2016
New Revision: 1735425
URL: http://svn.apache.org/viewvc?rev=1735425&view=rev
Log:
SLING-5617 fix JSR305 annotations for ResourceProvider
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java?rev=1735425&r1=1735424&r2=1735425&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
Thu Mar 17 13:42:54 2016
@@ -262,7 +262,7 @@ public abstract class ResourceProvider<T
* @return The provider context or {@code null} if the provider is
currently
* not used in the resource tree.
*/
- protected ProviderContext getProviderContext() {
+ protected @CheckForNull ProviderContext getProviderContext() {
return this.ctx;
}
@@ -313,7 +313,7 @@ public abstract class ResourceProvider<T
*
href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html">Service
* Authentication</a>
*/
- @Nonnull public T authenticate(final @Nonnull Map<String, Object>
authenticationInfo)
+ public @CheckForNull T authenticate(final @Nonnull Map<String, Object>
authenticationInfo)
throws LoginException {
return null;
}
@@ -455,7 +455,7 @@ public abstract class ResourceProvider<T
* @throws IllegalStateException if this resource provider has already been
* closed.
*/
- public Collection<String> getAttributeNames(final @Nonnull
ResolveContext<T> ctx) {
+ public @CheckForNull Collection<String> getAttributeNames(final @Nonnull
ResolveContext<T> ctx) {
return null;
}
@@ -474,7 +474,7 @@ public abstract class ResourceProvider<T
* @throws IllegalStateException
* if this resource provider has already been closed.
*/
- public Object getAttribute(final @Nonnull ResolveContext<T> ctx, final
@Nonnull String name) {
+ public @CheckForNull Object getAttribute(final @Nonnull ResolveContext<T>
ctx, final @Nonnull String name) {
return null;
}
@@ -496,7 +496,7 @@ public abstract class ResourceProvider<T
*
* @throws PersistenceException If anything fails
*/
- public Resource create(final @Nonnull ResolveContext<T> ctx, final String
path, final Map<String, Object> properties)
+ public @Nonnull Resource create(final @Nonnull ResolveContext<T> ctx,
final String path, final Map<String, Object> properties)
throws PersistenceException {
throw new PersistenceException("create is not supported.");
}
@@ -618,8 +618,8 @@ public abstract class ResourceProvider<T
* @return {@code true} if the provider can perform the copy
*/
public boolean copy(final @Nonnull ResolveContext<T> ctx,
- final String srcAbsPath,
- final String destAbsPath) throws PersistenceException {
+ final @Nonnull String srcAbsPath,
+ final @Nonnull String destAbsPath) throws PersistenceException {
return false;
}
@@ -646,8 +646,8 @@ public abstract class ResourceProvider<T
* @return {@code true} if the provider can perform the move
*/
public boolean move(final @Nonnull ResolveContext<T> ctx,
- final String srcAbsPath,
- final String destAbsPath) throws PersistenceException {
+ final @Nonnull String srcAbsPath,
+ final @Nonnull String destAbsPath) throws PersistenceException {
return false;
}
}