Author: kwin
Date: Thu Dec 24 11:27:24 2015
New Revision: 1721611
URL: http://svn.apache.org/viewvc?rev=1721611&view=rev
Log:
SLING-5395 - correctly set provider type or consumer type on all interfaces of
the API
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationFailure.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationResult.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationService.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ChildResource.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ParameterizedValidator.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ResourceProperty.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelCache.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelProvider.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationFailure.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationFailure.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationFailure.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationFailure.java
Thu Dec 24 11:27:24 2015
@@ -20,6 +20,9 @@ package org.apache.sling.validation;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ProviderType;
+
+@ProviderType
public interface ValidationFailure {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationResult.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationResult.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationResult.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationResult.java
Thu Dec 24 11:27:24 2015
@@ -19,15 +19,17 @@
package org.apache.sling.validation;
import java.util.List;
-import java.util.Map;
import javax.annotation.Nonnull;
import org.apache.sling.validation.spi.Validator;
+import aQute.bnd.annotation.ProviderType;
+
/**
* A {@code ValidationResult} contains validation information either from a
single {@link Validator} or from multiple Validator invocations.
*/
+@ProviderType
public interface ValidationResult {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationService.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationService.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/ValidationService.java
Thu Dec 24 11:27:24 2015
@@ -28,9 +28,12 @@ import org.apache.sling.api.resource.Val
import org.apache.sling.validation.exceptions.SlingValidationException;
import org.apache.sling.validation.model.ValidationModel;
+import aQute.bnd.annotation.ProviderType;
+
/**
* The {@code ValidationService} provides methods for finding {@link
ValidationModel} services.
*/
+@ProviderType
public interface ValidationService {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java
Thu Dec 24 11:27:24 2015
@@ -19,7 +19,7 @@
package org.apache.sling.validation.exceptions;
/**
- * Exception that is thrown for Validator inconsistencies.
+ * Exception that is thrown for Validator inconsistencies, e.g. if a mandatory
parameter for a validator is missing.
*/
public class SlingValidationException extends RuntimeException {
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ChildResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ChildResource.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ChildResource.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ChildResource.java
Thu Dec 24 11:27:24 2015
@@ -24,10 +24,13 @@ import java.util.regex.Pattern;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Defines the validation rules for a child resource, allowing {@link
ValidationModel}s to be applied to {@link
* org.apache.sling.api.resource.Resource} trees.
*/
+@ProviderType
public interface ChildResource {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ParameterizedValidator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ParameterizedValidator.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ParameterizedValidator.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ParameterizedValidator.java
Thu Dec 24 11:27:24 2015
@@ -23,10 +23,13 @@ import javax.annotation.Nonnull;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.validation.spi.Validator;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Defines a validator instance with information about the type and the
parameterization of the validator.
*
*/
+@ProviderType
public interface ParameterizedValidator {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ResourceProperty.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ResourceProperty.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ResourceProperty.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ResourceProperty.java
Thu Dec 24 11:27:24 2015
@@ -24,9 +24,12 @@ import java.util.regex.Pattern;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Describes a {@link org.apache.sling.api.resource.Resource} property.
*/
+@ProviderType
public interface ResourceProperty {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java
Thu Dec 24 11:27:24 2015
@@ -22,9 +22,12 @@ import java.util.Collection;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ProviderType;
+
/**
* A {@code ValidationModel} defines the validation rules that a resource tree
has to pass.
*/
+@ProviderType
public interface ValidationModel {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelCache.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelCache.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelCache.java
Thu Dec 24 11:27:24 2015
@@ -18,9 +18,12 @@
*/
package org.apache.sling.validation.model.spi;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Validation models are cached until explicitly invalidated through this OSGi
service.
*/
+@ProviderType
public interface ValidationModelCache {
public void invalidate();
}
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelProvider.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelProvider.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/spi/ValidationModelProvider.java
Thu Dec 24 11:27:24 2015
@@ -27,11 +27,14 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.validation.model.ValidationModel;
import org.apache.sling.validation.spi.Validator;
+import aQute.bnd.annotation.ProviderType;
+
/**
* All providers of {@link ValidationModel}s must implement this interface. In
addition if the model might become
* invalid after some time it is also the obligatation of the provider
implementation to invalidate the cache via the
* {@link ValidationModelCache} OSGi service.
*/
+@ProviderType
public interface ValidationModelProvider {
/**
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java?rev=1721611&r1=1721610&r2=1721611&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java
(original)
+++
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java
Thu Dec 24 11:27:24 2015
@@ -25,10 +25,13 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.validation.ValidationService;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Used as parameter for each call of {@link Validator#validate(Object,
ValidationContext, ValueMap)}
* Exposes additional information about the context in which the validation
was called.
*/
+@ProviderType
public interface ValidationContext {
/**
