Author: tchemit Date: 2011-01-18 07:43:11 +0100 (Tue, 18 Jan 2011) New Revision: 2018 Url: http://nuiton.org/repositories/revision/nuiton-utils/2018 Log: suppression de la methode getModel du contrat de NuitonValidator Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidator.java trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidator.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProviderTest.java trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidator.java 2011-01-17 18:50:24 UTC (rev 2017) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/NuitonValidator.java 2011-01-18 06:43:11 UTC (rev 2018) @@ -33,14 +33,6 @@ public interface NuitonValidator<O> { /** - * Obtain the model of a validator. - * - * @return the model of this validator - * @see NuitonValidatorModel - */ - NuitonValidatorModel<O> getModel(); - - /** * Validates the given object and returns the result of validation. * * @param object the object to validate Modified: trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidator.java =================================================================== --- trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidator.java 2011-01-17 18:50:24 UTC (rev 2017) +++ trunk/nuiton-validator/src/main/java/org/nuiton/validator/xwork2/XWork2NuitonValidator.java 2011-01-18 06:43:11 UTC (rev 2018) @@ -37,7 +37,7 @@ import java.util.Set; /** - * Implementation of {@link NuitonValidator} using {@code XWorks2} validators. + * Implementation of {@link NuitonValidator} using {@code XWork2} validators. * * @author tchemit <chemit@codelutin.com> * @since 2.0 @@ -86,17 +86,12 @@ } @Override - public NuitonValidatorModel<O> getModel() { - return model; - } - - @Override public NuitonValidatorResult validate(O object) throws NullPointerException { if (object == null) { throw new NullPointerException("object parameter can not be null."); } - + NuitonValidatorResult result = new NuitonValidatorResult(); for (NuitonValidatorScope scope : validators.keySet()) { @@ -109,4 +104,8 @@ } return result; } + + protected NuitonValidatorModel<O> getModel() { + return model; + } } Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProviderTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProviderTest.java 2011-01-17 18:50:24 UTC (rev 2017) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorProviderTest.java 2011-01-18 06:43:11 UTC (rev 2018) @@ -75,9 +75,6 @@ NuitonValidator<Person> validator = provider.newValidator(model); Assert.assertNotNull(validator); - Assert.assertNotNull(validator.getModel()); - Assert.assertEquals(model, validator.getModel()); - } } Modified: trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java =================================================================== --- trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java 2011-01-17 18:50:24 UTC (rev 2017) +++ trunk/nuiton-validator/src/test/java/org/nuiton/validator/xwork2/XWork2NuitonValidatorTest.java 2011-01-18 06:43:11 UTC (rev 2018) @@ -52,8 +52,6 @@ NuitonValidator<Person> validator = provider.newValidator(model); Assert.assertNotNull(validator); - Assert.assertNotNull(validator.getModel()); - Assert.assertEquals(model, validator.getModel()); ValidatorTestHelper.testPerson(validator);