From 7caf677ffa47e4b45013fbc48a16ac483c2ed52a Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Tue, 19 Mar 2013 22:32:19 +0100 Subject: [PATCH] HV-678 Some clean-up --- .../validator/internal/engine/ValidationContext.java | 2 +- .../hibernate/validator/internal/engine/ValidatorImpl.java | 4 ++-- .../engine/groups/validation/GroupValidationTest.java | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java index 65773b268e..846ebeeec4 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidationContext.java @@ -332,7 +332,7 @@ else if ( executableReturnValue != null ) { } } - public boolean hasMetaConstraintBeProcessed(Object bean, Path path, MetaConstraint metaConstraint) { + public boolean hasMetaConstraintBeenProcessed(Object bean, Path path, MetaConstraint metaConstraint) { // TODO switch to proper multi key map (HF) IdentitySet processedConstraints = processedMetaConstraints.get( new BeanAndPath( bean, path ) ); return processedConstraints != null && processedConstraints.contains( metaConstraint ); diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java index 32667b1a54..dba374a2a5 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java @@ -996,7 +996,7 @@ private int validateParametersForGroup(ValidationContext validationContex if ( value != null ) { Class valueType = value.getClass(); - if ( parameterMetaData.getType() instanceof Class && ( (Class) parameterMetaData.getType() ).isPrimitive() ) { + if ( parameterMetaData.getType() instanceof Class && ( (Class) parameterMetaData.getType() ).isPrimitive() ) { valueType = ReflectionHelper.unBoxedType( valueType ); } if ( !TypeHelper.isAssignable( parameterMetaData.getType(), valueType ) ) { @@ -1278,7 +1278,7 @@ private TraversableResolver getCachingTraversableResolver() { private boolean isValidationRequired(ValidationContext validationContext, ValueContext valueContext, MetaConstraint metaConstraint) { - if ( validationContext.hasMetaConstraintBeProcessed( + if ( validationContext.hasMetaConstraintBeenProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), metaConstraint diff --git a/engine/src/test/java/org/hibernate/validator/test/internal/engine/groups/validation/GroupValidationTest.java b/engine/src/test/java/org/hibernate/validator/test/internal/engine/groups/validation/GroupValidationTest.java index 2725f17015..97a9eb6c65 100644 --- a/engine/src/test/java/org/hibernate/validator/test/internal/engine/groups/validation/GroupValidationTest.java +++ b/engine/src/test/java/org/hibernate/validator/test/internal/engine/groups/validation/GroupValidationTest.java @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source -* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors +* Copyright 2013, Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. See the copyright.txt in the distribution for a * full listing of individual contributors. * @@ -44,7 +44,6 @@ /** * @author Hardy Ferentschik - * @author Kevin Pollet (C) 2011 SERLI */ public class GroupValidationTest { private Validator validator; @@ -52,7 +51,6 @@ public class GroupValidationTest { @BeforeMethod public void setUp() { validator = getValidator(); - } @Test @@ -89,7 +87,7 @@ public interface Second { public class FailOnSecondValidationCallValidator implements ConstraintValidator { - private AtomicInteger invocationCount = new AtomicInteger( 0 ); + private final AtomicInteger invocationCount = new AtomicInteger( 0 ); @Override public void initialize(FailOnSecondValidationCall parameters) {