Author: kwin
Date: Thu Nov 13 11:57:06 2014
New Revision: 1639315
URL: http://svn.apache.org/r1639315
Log:
SLING-4160, log error in case invalid validator was specified in the model
improved javadoc for ValidatorLookupService
Modified:
sling/trunk/contrib/validation/api/src/main/java/org/apache/sling/validation/api/ValidatorLookupService.java
sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/util/JCRBuilder.java
Modified:
sling/trunk/contrib/validation/api/src/main/java/org/apache/sling/validation/api/ValidatorLookupService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/validation/api/src/main/java/org/apache/sling/validation/api/ValidatorLookupService.java?rev=1639315&r1=1639314&r2=1639315&view=diff
==============================================================================
---
sling/trunk/contrib/validation/api/src/main/java/org/apache/sling/validation/api/ValidatorLookupService.java
(original)
+++
sling/trunk/contrib/validation/api/src/main/java/org/apache/sling/validation/api/ValidatorLookupService.java
Thu Nov 13 11:57:06 2014
@@ -23,5 +23,10 @@ package org.apache.sling.validation.api;
*/
public interface ValidatorLookupService {
+ /**
+ * Returns a {@link Validator} with the given class name.
+ * @param validatorType the class name of the requested validator
+ * @return a validator or {@code null} in case no validator could be found
with the given name.
+ */
Validator getValidator(String validatorType);
}
Modified:
sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/util/JCRBuilder.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/util/JCRBuilder.java?rev=1639315&r1=1639314&r2=1639315&view=diff
==============================================================================
---
sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/util/JCRBuilder.java
(original)
+++
sling/trunk/contrib/validation/core/src/main/java/org/apache/sling/validation/impl/util/JCRBuilder.java
Thu Nov 13 11:57:06 2014
@@ -68,6 +68,9 @@ public class JCRBuilder {
ValueMap validatorProperties =
validator.adaptTo(ValueMap.class);
String validatorName = validator.getName();
Validator v = vls.getValidator(validatorName);
+ if (v == null) {
+ throw new IllegalArgumentException("Could not find
validator with name '" + validatorName + "'");
+ }
String[] validatorArguments =
validatorProperties.get(Constants.VALIDATOR_ARGUMENTS, String[].class);
Map<String, String> validatorArgumentsMap = new
HashMap<String, String>();
if (validatorArguments != null) {
