svn commit: r1733904 - in /sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation: SlingValidationException.java ValidationService.java exceptions/ spi/Validator.java

[ol...@apache.org]

Author: olli
Date: Mon Mar  7 11:59:05 2016
New Revision: 1733904

URL: http://svn.apache.org/viewvc?rev=1733904&view=rev
Log:
SLING-5584 Move SlingValidationException to package org.apache.sling.validation

Added:
    sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java
      - copied, changed from r1733898, sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java
Removed:
    sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/
Modified:
    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/spi/Validator.java

Copied: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java (from r1733898, 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/SlingValidationException.java?p2=sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/SlingValidationException.java&p1=sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/exceptions/SlingValidationException.java&r1=1733898&r2=1733904&rev=1733904&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/SlingValidationException.java Mon Mar  7 11:59:05 2016
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.validation.exceptions;
+package org.apache.sling.validation;
 
 /**
  * Exception that is thrown for Validator inconsistencies, e.g. if a mandatory parameter for a validator is missing.

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=1733904&r1=1733903&r2=1733904&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 Mon Mar  7 11:59:05 2016
@@ -25,7 +25,6 @@ import org.apache.commons.collections.Pr
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.validation.exceptions.SlingValidationException;
 import org.apache.sling.validation.model.ValidationModel;
 
 import aQute.bnd.annotation.ProviderType;

Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java?rev=1733904&r1=1733903&r2=1733904&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java (original)
+++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java Mon Mar  7 11:59:05 2016
@@ -22,7 +22,7 @@ import javax.annotation.Nonnull;
 
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.validation.ValidationResult;
-import org.apache.sling.validation.exceptions.SlingValidationException;
+import org.apache.sling.validation.SlingValidationException;
 
 import aQute.bnd.annotation.ConsumerType;
 
@@ -70,7 +70,7 @@ public interface Validator <T> {
      * @param context the validation context contains additional information about the data to be validated, never {@code null}.
      * @param arguments the parameterization of the validator. Never {@code null} but might be the empty map.
      * @return the validation result (encapsulates the validation status as well as messages).
-     * @throws org.apache.sling.validation.exceptions.SlingValidationException if some expected arguments are missing from the arguments map
+     * @throws SlingValidationException if some expected arguments are missing from the arguments map
      */
     @Nonnull ValidationResult validate(@Nonnull T data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) throws SlingValidationException;
 }