You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/03/30 08:16:10 UTC
svn commit: r1789450 - in
/sling/trunk/bundles/extensions/validation/core/src:
main/java/org/apache/sling/validation/impl/
test/java/org/apache/sling/validation/impl/
Author: olli
Date: Thu Mar 30 08:16:10 2017
New Revision: 1789450
URL: http://svn.apache.org/viewvc?rev=1789450&view=rev
Log:
style (ValidatorMetaData -> ValidatorMetadata)
Modified:
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorMap.java
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidatorMapTest.java
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1789450&r1=1789449&r2=1789450&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Thu Mar 30 08:16:10 2017
@@ -44,6 +44,7 @@ import org.apache.sling.serviceusermappi
import org.apache.sling.validation.SlingValidationException;
import org.apache.sling.validation.ValidationResult;
import org.apache.sling.validation.ValidationService;
+import org.apache.sling.validation.impl.ValidatorMap.ValidatorMetadata;
import org.apache.sling.validation.model.ChildResource;
import org.apache.sling.validation.model.ValidatorInvocation;
import org.apache.sling.validation.model.ResourceProperty;
@@ -348,14 +349,14 @@ public class ValidationServiceImpl imple
for (ValidatorInvocation validatorInvocation : validatorInvocations) {
// lookup validator by id
- ValidatorMap.ValidatorMetaData validatorMetaData = validatorMap.get(validatorInvocation.getValidatorId());
- if (validatorMetaData == null) {
+ ValidatorMetadata validatorMetadata = validatorMap.get(validatorInvocation.getValidatorId());
+ if (validatorMetadata == null) {
throw new IllegalStateException("Could not find validator with id '" + validatorInvocation.getValidatorId() + "'");
}
- int severity = getSeverityForValidator(validatorInvocation.getSeverity(), validatorMetaData.getSeverity());
+ int severity = getSeverityForValidator(validatorInvocation.getSeverity(), validatorMetadata.getSeverity());
// convert the type always to an array
- Class<?> type = validatorMetaData.getType();
+ Class<?> type = validatorMetadata.getType();
if (!type.isArray()) {
try {
// https://docs.oracle.com/javase/6/docs/api/java/lang/Class.html#getName%28%29 has some hints on class names
@@ -369,23 +370,23 @@ public class ValidationServiceImpl imple
// see https://issues.apache.org/jira/browse/SLING-4178 for why the second check is necessary
if (typedValue == null || (typedValue.length > 0 && typedValue[0] == null)) {
// here the missing required property case was already treated in validateValueMap
- result.addFailure(relativePath + property, severity, defaultResourceBundle, I18N_KEY_WRONG_PROPERTY_TYPE, validatorMetaData.getType());
+ result.addFailure(relativePath + property, severity, defaultResourceBundle, I18N_KEY_WRONG_PROPERTY_TYPE, validatorMetadata.getType());
return;
}
// see https://issues.apache.org/jira/browse/SLING-662 for a description on how multivalue properties are treated with ValueMap
- if (validatorMetaData.getType().isArray()) {
+ if (validatorMetadata.getType().isArray()) {
// ValueMap already returns an array in both cases (property is single value or multivalue)
- validateValue(result, typedValue, property, relativePath, valueMap, resource, validatorMetaData.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
+ validateValue(result, typedValue, property, relativePath, valueMap, resource, validatorMetadata.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
} else {
// call validate for each entry in the array (supports both singlevalue and multivalue)
@Nonnull Object[] array = (Object[])typedValue;
if (array.length == 1) {
- validateValue(result, array[0], property, relativePath, valueMap, resource, validatorMetaData.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
+ validateValue(result, array[0], property, relativePath, valueMap, resource, validatorMetadata.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
} else {
int n = 0;
for (Object item : array) {
- validateValue(result, item, property + "[" + n++ + "]", relativePath, valueMap, resource, validatorMetaData.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
+ validateValue(result, item, property + "[" + n++ + "]", relativePath, valueMap, resource, validatorMetadata.getValidator(), validatorInvocation.getParameters(), defaultResourceBundle, severity);
}
}
}
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorMap.java?rev=1789450&r1=1789449&r2=1789450&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorMap.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidatorMap.java Thu Mar 30 08:16:10 2017
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*/
public class ValidatorMap {
- final static class ValidatorMetaData implements Comparable<ValidatorMetaData> {
+ final static class ValidatorMetadata implements Comparable<ValidatorMetadata> {
protected final @Nonnull Validator<?> validator;
// default severity of the validator
protected final Integer severity;
@@ -44,7 +44,7 @@ public class ValidatorMap {
/** used for comparison, to sort by service ranking and id */
protected final @Nonnull ServiceReference<Validator<?>> serviceReference;
- public ValidatorMetaData(Validator<?> validator, ServiceReference<Validator<?>> serviceReference, Integer severity) {
+ public ValidatorMetadata(Validator<?> validator, ServiceReference<Validator<?>> serviceReference, Integer severity) {
this.validator = validator;
this.severity = severity;
this.serviceReference = serviceReference;
@@ -53,7 +53,7 @@ public class ValidatorMap {
}
@Override
- public int compareTo(ValidatorMetaData o) {
+ public int compareTo(ValidatorMetadata o) {
return serviceReference.compareTo(o.serviceReference);
}
@@ -76,7 +76,7 @@ public class ValidatorMap {
return false;
if (getClass() != obj.getClass())
return false;
- ValidatorMetaData other = (ValidatorMetaData) obj;
+ ValidatorMetadata other = (ValidatorMetadata) obj;
if (serviceReference == null) {
if (other.serviceReference != null)
return false;
@@ -116,7 +116,7 @@ public class ValidatorMap {
}
private static final Logger LOG = LoggerFactory.getLogger(ValidatorMap.class);
- private final Map<String, ValidatorMetaData> validatorMap;
+ private final Map<String, ValidatorMetadata> validatorMap;
public ValidatorMap() {
validatorMap = new ConcurrentHashMap<>();
@@ -163,9 +163,9 @@ public class ValidatorMap {
void put(@Nonnull String id, @Nonnull Validator<?> validator, ServiceReference<Validator<?>> serviceReference, Integer severity) {
// create new entry
- ValidatorMetaData entry = new ValidatorMetaData(validator, serviceReference, severity);
+ ValidatorMetadata entry = new ValidatorMetadata(validator, serviceReference, severity);
if (validatorMap.containsKey(id)) {
- ValidatorMetaData existingEntry = validatorMap.get(id);
+ ValidatorMetadata existingEntry = validatorMap.get(id);
if (entry.compareTo(existingEntry) > 0) {
LOG.info("Overwriting already existing validator {} with {}, because it has the same id '{}' and a higher service ranking",
existingEntry, entry, id);
@@ -195,8 +195,8 @@ public class ValidatorMap {
}
private boolean remove(ServiceReference<Validator<?>> serviceReference) {
- for (java.util.Iterator<ValidatorMetaData> iterator = validatorMap.values().iterator(); iterator.hasNext();) {
- ValidatorMetaData value = iterator.next();
+ for (java.util.Iterator<ValidatorMetadata> iterator = validatorMap.values().iterator(); iterator.hasNext();) {
+ ValidatorMetadata value = iterator.next();
if (value.serviceReference.equals(serviceReference)) {
iterator.remove();
return true;
@@ -215,7 +215,7 @@ public class ValidatorMap {
if (id == null) {
// find by service reference
}
- ValidatorMetaData entry = validatorMap.get(id);
+ ValidatorMetadata entry = validatorMap.get(id);
if (entry == null) {
LOG.warn("Could not remove validator with id '{}' from map, because it is not there!", id);
return false;
@@ -230,7 +230,7 @@ public class ValidatorMap {
}
}
- public ValidatorMetaData get(String id) {
+ public ValidatorMetadata get(String id) {
return validatorMap.get(id);
}
}
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidatorMapTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidatorMapTest.java?rev=1789450&r1=1789449&r2=1789450&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidatorMapTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidatorMapTest.java Thu Mar 30 08:16:10 2017
@@ -21,6 +21,7 @@ package org.apache.sling.validation.impl
import java.util.HashMap;
import java.util.Map;
+import org.apache.sling.validation.impl.ValidatorMap.ValidatorMetadata;
import org.apache.sling.validation.impl.util.examplevalidators.DateValidator;
import org.apache.sling.validation.impl.util.examplevalidators.StringValidator;
import org.apache.sling.validation.spi.Validator;
@@ -80,7 +81,7 @@ public class ValidatorMapTest {
Mockito.doReturn(1).when(newValidatorServiceReference).compareTo(Mockito.anyObject());
Validator<String> stringValidator = new StringValidator();
validatorMap.put(validatorProperties,stringValidator, newValidatorServiceReference);
- Assert.assertEquals(new ValidatorMap.ValidatorMetaData(stringValidator, newValidatorServiceReference, 2), validatorMap.get(DATE_VALIDATOR_ID));
+ Assert.assertEquals(new ValidatorMetadata(stringValidator, newValidatorServiceReference, 2), validatorMap.get(DATE_VALIDATOR_ID));
}
@Test
@@ -91,7 +92,7 @@ public class ValidatorMapTest {
Mockito.doReturn(-1).when(newValidatorServiceReference).compareTo(Mockito.anyObject());
Validator<String> stringValidator = new StringValidator();
validatorMap.put(validatorProperties, stringValidator, newValidatorServiceReference);
- Assert.assertEquals(new ValidatorMap.ValidatorMetaData(dateValidator, validatorServiceReference, 10), validatorMap.get(DATE_VALIDATOR_ID));
+ Assert.assertEquals(new ValidatorMetadata(dateValidator, validatorServiceReference, 10), validatorMap.get(DATE_VALIDATOR_ID));
}
@Test
@@ -102,7 +103,7 @@ public class ValidatorMapTest {
validatorProperties.put(Validator.PROPERTY_VALIDATOR_SEVERITY, 1);
Mockito.doReturn(-1).when(newValidatorServiceReference).compareTo(Mockito.anyObject());
validatorMap.update(validatorProperties, dateValidator, validatorServiceReference);
- Assert.assertEquals(new ValidatorMap.ValidatorMetaData(dateValidator, validatorServiceReference, 1), validatorMap.get(newId));
+ Assert.assertEquals(new ValidatorMetadata(dateValidator, validatorServiceReference, 1), validatorMap.get(newId));
// make sure that the old validator id is no longer in the list
Assert.assertNull(validatorMap.get(DATE_VALIDATOR_ID));
}