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/16 10:57:52 UTC
svn commit: r1787155 - in
/sling/trunk/bundles/extensions/validation/core/src:
main/java/org/apache/sling/validation/impl/
test/java/org/apache/sling/validation/impl/
test/java/org/apache/sling/validation/impl/model/
test/java/org/apache/sling/validati...
Author: kwin
Date: Thu Mar 16 10:57:52 2017
New Revision: 1787155
URL: http://svn.apache.org/viewvc?rev=1787155&view=rev
Log:
fix some more warnings
Modified:
sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.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
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=1787155&r1=1787154&r2=1787155&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 16 10:57:52 2017
@@ -114,7 +114,6 @@ public class ValidationServiceImpl imple
// ValidationService ###################################################################################################################
- @SuppressWarnings("unused")
public @CheckForNull ValidationModel getValidationModel(@Nonnull String validatedResourceType, String resourcePath, boolean considerResourceSuperTypeModels) {
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=459256
if (validatedResourceType == null) {
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java?rev=1787155&r1=1787154&r2=1787155&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Thu Mar 16 10:57:52 2017
@@ -500,7 +500,7 @@ public class ValidationServiceImplTest {
properties.put(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, "resourcetype3");
rr.create(testResource, "child3", properties);
- final Predicate ignoreResourceType3Filter = new Predicate<Resource>() {
+ final Predicate<Resource> ignoreResourceType3Filter = new Predicate<Resource>() {
@Override
public boolean test(final Resource resource) {
return !"resourcetype3".equals(resource.getResourceType());
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=1787155&r1=1787154&r2=1787155&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 Thu Mar 16 10:57:52 2017
@@ -18,11 +18,15 @@
*/
package org.apache.sling.validation.impl.model;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
import org.apache.sling.validation.impl.util.ChildResourceNameRegexMatcher;
import org.apache.sling.validation.impl.util.ResourcePropertyNameRegexMatcher;
+import org.apache.sling.validation.model.ChildResource;
+import org.apache.sling.validation.model.ResourceProperty;
import org.apache.sling.validation.model.ValidationModel;
+import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Before;
@@ -75,11 +79,14 @@ public class MergedValidationModelTest {
modelBuilder.childResource(childResourceBuilder.nameRegex("originalNameNotOverwritten").build(
"nameNotOverwritten"));
ValidationModel mergedModel = new MergedValidationModel(baseValidationModel, modelBuilder.build("superType", "some source"));
- Assert.assertThat(mergedModel.getResourceProperties(), Matchers.containsInAnyOrder(
- new ResourcePropertyNameRegexMatcher("overwrittenNameToOverwrite"),
- new ResourcePropertyNameRegexMatcher("originalNameNotOverwritten")));
- Assert.assertThat(mergedModel.getChildren(), Matchers.containsInAnyOrder(new ChildResourceNameRegexMatcher(
- "overwrittenNameToOverwrite"), new ChildResourceNameRegexMatcher("originalNameNotOverwritten")));
+ Collection<Matcher<ResourceProperty>> resourcePropertyMatchers = new ArrayList<>();
+ resourcePropertyMatchers.add(new ResourcePropertyNameRegexMatcher("overwrittenNameToOverwrite"));
+ resourcePropertyMatchers.add(new ResourcePropertyNameRegexMatcher("originalNameNotOverwritten"));
+ Assert.assertThat(mergedModel.getResourceProperties(), Matchers.containsInAnyOrder(resourcePropertyMatchers));
+ Collection<Matcher<ChildResource>> childMatchers = new ArrayList<>();
+ childMatchers.add(new ChildResourceNameRegexMatcher("overwrittenNameToOverwrite"));
+ childMatchers.add(new ChildResourceNameRegexMatcher("originalNameNotOverwritten"));
+ Assert.assertThat(mergedModel.getChildren(), Matchers.containsInAnyOrder(childMatchers));
}
@Test
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=1787155&r1=1787154&r2=1787155&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 Thu Mar 16 10:57:52 2017
@@ -58,7 +58,6 @@ import org.apache.sling.validation.model
import org.apache.sling.validation.model.ResourceProperty;
import org.apache.sling.validation.model.ValidationModel;
import org.apache.sling.validation.model.ValidatorAndSeverity;
-import org.apache.sling.validation.spi.Validator;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Assert;
@@ -68,9 +67,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
@RunWith(MockitoJUnitRunner.class)
public class ResourceValidationModelProviderImplTest {
@@ -134,7 +131,6 @@ public class ResourceValidationModelProv
private MockQueryResultHandler prefixBasedResultHandler;
private Map<PrefixAndResourceType, List<Node>> validatorModelNodesPerPrefixAndResourceType;
private Map<String, ValidatorAndSeverity<?>> validatorMap;
- private Map<String, Object> regexValdidatorParametrization;
private ValidationModelBuilder modelBuilder;
// extract resource type from strings like