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/29 11:24:38 UTC
svn commit: r1789339 - in /sling/trunk/bundles/extensions/validation:
api/src/main/java/org/apache/sling/validation/model/
core/src/main/java/org/apache/sling/validation/impl/model/
core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ cor...
Author: kwin
Date: Wed Mar 29 11:24:38 2017
New Revision: 1789339
URL: http://svn.apache.org/viewvc?rev=1789339&view=rev
Log:
SLING-6727 ValidationModel.getValidatedResourceType -> ValidationModel.getValidatingResourceType
Modified:
sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/model/ValidationModel.java
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/MergedValidationModel.java
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/ValidationModelImpl.java
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java
sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.admin.json
sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.regular.json
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=1789339&r1=1789338&r2=1789339&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 Wed Mar 29 11:24:38 2017
@@ -41,9 +41,9 @@ public interface ValidationModel {
/**
* Returns the type of resource this model validates.
*
- * @return the validated resource type, never {@code null}
+ * @return the resource type to be validated, never {@code null}
*/
- @Nonnull String getValidatedResourceType();
+ @Nonnull String getValidatingResourceType();
/**
* Returns the paths under which resources will be validated by this model.
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/MergedValidationModel.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/MergedValidationModel.java?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/MergedValidationModel.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/MergedValidationModel.java Wed Mar 29 11:24:38 2017
@@ -104,8 +104,8 @@ public class MergedValidationModel imple
@Override
@Nonnull
- public String getValidatedResourceType() {
- return baseModel.getValidatedResourceType();
+ public String getValidatingResourceType() {
+ return baseModel.getValidatingResourceType();
}
@Override
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/ValidationModelImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/ValidationModelImpl.java?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/ValidationModelImpl.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/model/ValidationModelImpl.java Wed Mar 29 11:24:38 2017
@@ -70,7 +70,7 @@ public class ValidationModelImpl impleme
}
@Override
- public @Nonnull String getValidatedResourceType() {
+ public @Nonnull String getValidatingResourceType() {
return validatedResourceType;
}
Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImpl.java Wed Mar 29 11:24:38 2017
@@ -65,7 +65,7 @@ public class ResourceValidationModelProv
static final String MODEL_XPATH_QUERY = "/jcr:root%s/*[@sling:resourceType=\""
+ ResourceValidationModelProviderImpl.VALIDATION_MODEL_RESOURCE_TYPE + "\" and @"
- + ResourceValidationModelProviderImpl.VALIDATED_RESOURCE_TYPE + "=\"%s\"]";
+ + ResourceValidationModelProviderImpl.VALIDATING_RESOURCE_TYPE + "=\"%s\"]";
static final String[] TOPICS = { SlingConstants.TOPIC_RESOURCE_REMOVED, SlingConstants.TOPIC_RESOURCE_CHANGED,
SlingConstants.TOPIC_RESOURCE_ADDED };
@@ -78,7 +78,7 @@ public class ResourceValidationModelProv
public static final @Nonnull String PROPERTIES = "properties";
public static final @Nonnull String VALIDATION_MODEL_RESOURCE_TYPE = "sling/validation/model";
public static final @Nonnull String APPLICABLE_PATHS = "applicablePaths";
- public static final @Nonnull String VALIDATED_RESOURCE_TYPE = "validatedResourceType";
+ public static final @Nonnull String VALIDATING_RESOURCE_TYPE = "validatingResourceType";
public static final @Nonnull String SEVERITY = "severity";
@Reference
@@ -202,7 +202,7 @@ public class ResourceValidationModelProv
if (properties == null) {
throw new IllegalStateException("Could not adapt resource at " + path + " to a ValueMap");
}
- return properties.get(VALIDATED_RESOURCE_TYPE, String.class);
+ return properties.get(VALIDATING_RESOURCE_TYPE, String.class);
} finally {
if (resourceResolver != null) {
resourceResolver.close();
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java Wed Mar 29 11:24:38 2017
@@ -87,7 +87,7 @@ public class MergedValidationModelTest {
public void testValidatedResourceTypes() {
ValidationModel mergedModel = new MergedValidationModel(modelBuilder.build("base", "some source"),
modelBuilder.build("superType", "some source"));
- Assert.assertThat(mergedModel.getValidatedResourceType(), Matchers.equalTo("base"));
+ Assert.assertThat(mergedModel.getValidatingResourceType(), Matchers.equalTo("base"));
}
}
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/resourcemodel/ResourceValidationModelProviderImplTest.java Wed Mar 29 11:24:38 2017
@@ -133,7 +133,7 @@ public class ResourceValidationModelProv
// extract resource type from strings like
// "/jcr:root/apps//validation//*[@sling:resourceType="sling/validation/model" and @validatedResourceType="<some-resource-type>"]"
- private static final Pattern RESOURCE_TYPE_PATTERN = Pattern.compile(".*@validatedResourceType=\"([^\"]*)\".*");
+ private static final Pattern RESOURCE_TYPE_PATTERN = Pattern.compile(".*@validatingResourceType=\"([^\"]*)\".*");
@Rule
public SlingContext context = new SlingContext(ResourceResolverType.JCR_MOCK); // search capability necessary
@@ -161,7 +161,7 @@ public class ResourceValidationModelProv
}
String statement = query.getStatement();
// query looks like /jcr:root/apps//validation//*[@sling:resourceType="sling/validation/model" and
- // @validatedResourceType="<some-resource-type>"]
+ // @validatingResourceType="<some-resource-type>"]
if (statement.startsWith("/jcr:root/")) {
statement = statement.substring("/jcr:root/".length() - 1);
}
@@ -414,7 +414,7 @@ public class ResourceValidationModelProv
private Resource createValidationModelResource(ResourceResolver rr, String root, String name, ValidationModel model)
throws Exception {
Map<String, Object> modelProperties = new HashMap<String, Object>();
- modelProperties.put(ResourceValidationModelProviderImpl.VALIDATED_RESOURCE_TYPE, model.getValidatedResourceType());
+ modelProperties.put(ResourceValidationModelProviderImpl.VALIDATING_RESOURCE_TYPE, model.getValidatingResourceType());
modelProperties.put(ResourceValidationModelProviderImpl.APPLICABLE_PATHS, model.getApplicablePaths().toArray());
modelProperties.put(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, ResourceValidationModelProviderImpl.VALIDATION_MODEL_RESOURCE_TYPE);
modelProperties.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
@@ -428,7 +428,7 @@ public class ResourceValidationModelProv
// add to search handler (with root path)
String prefix = Text.getAbsoluteParent(root, 0);
PrefixAndResourceType prefixAndResourceType = new PrefixAndResourceType(prefix,
- model.getValidatedResourceType());
+ model.getValidatingResourceType());
List<Node> nodes;
nodes = validatorModelNodesPerPrefixAndResourceType.get(prefixAndResourceType);
if (nodes == null) {
Modified: sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.admin.json
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.admin.json?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.admin.json (original)
+++ sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.admin.json Wed Mar 29 11:24:38 2017
@@ -4,7 +4,7 @@
"applicablePaths": [
"/content/validationdemo/users/admin"
],
- "validatedResourceType": "/apps/validationdemo/components/user",
+ "validatingResourceType": "/apps/validationdemo/components/user",
"properties": {
"jcr:primaryType": "nt:unstructured",
"firstName": {
Modified: sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.regular.json
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.regular.json?rev=1789339&r1=1789338&r2=1789339&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.regular.json (original)
+++ sling/trunk/bundles/extensions/validation/examples/src/main/resources/SLING-INF/apps/sling/validation/models/user.regular.json Wed Mar 29 11:24:38 2017
@@ -4,7 +4,7 @@
"applicablePaths": [
"/content/validationdemo/users/"
],
- "validatedResourceType": "/apps/validationdemo/components/user",
+ "validatingResourceType": "/apps/validationdemo/components/user",
"properties": {
"jcr:primaryType": "nt:unstructured",
"firstName": {