You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/03/07 10:53:04 UTC
svn commit: r1785825 - in
/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation:
SlingValidationException.java spi/DefaultValidationFailure.java
spi/DefaultValidationResult.java
Author: kwin
Date: Tue Mar 7 10:53:01 2017
New Revision: 1785825
URL: http://svn.apache.org/viewvc?rev=1785825&view=rev
Log:
make DefaultValidationFailure/Result provider types and turn them into finals.
SlingValidationException is a consumer type now as well (because it lives in the same package as ValidationService) and implementing it should not restrict the import-version range of o.a.s.validation to [==,=+)
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationResult.java
Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java?rev=1785825&r1=1785824&r2=1785825&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java (original)
+++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java Tue Mar 7 10:53:01 2017
@@ -18,9 +18,12 @@
*/
package org.apache.sling.validation;
+import org.osgi.annotation.versioning.ConsumerType;
+
/**
* Exception that is thrown for Validator inconsistencies, e.g. if a mandatory parameter for a validator is missing.
*/
+@ConsumerType
public class SlingValidationException extends RuntimeException {
private static final long serialVersionUID = 3123210091593613191L;
Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java?rev=1785825&r1=1785824&r2=1785825&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java (original)
+++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java Tue Mar 7 10:53:01 2017
@@ -26,12 +26,14 @@ import java.util.ResourceBundle;
import javax.annotation.Nonnull;
import org.apache.sling.validation.ValidationFailure;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Wraps a message key (being looked up in a {@link ResourceBundle}), messageArguments (being used with {@link MessageFormat#format(String, Object...)}
* and the location where the validation failure occurred.
*/
-public class DefaultValidationFailure implements ValidationFailure, Serializable {
+@ProviderType
+public final class DefaultValidationFailure implements ValidationFailure, Serializable {
/**
*
Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationResult.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationResult.java?rev=1785825&r1=1785824&r2=1785825&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationResult.java (original)
+++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationResult.java Tue Mar 7 10:53:01 2017
@@ -28,12 +28,14 @@ import javax.annotation.Nonnull;
import org.apache.sling.validation.ValidationFailure;
import org.apache.sling.validation.ValidationResult;
+import org.osgi.annotation.versioning.ProviderType;
/**
* Default implementation of {@link ValidationResult} wrapping a list of {@link ValidationFailure}s.
*
*/
-public class DefaultValidationResult implements ValidationResult, Serializable {
+@ProviderType
+public final class DefaultValidationResult implements ValidationResult, Serializable {
/**
*