Skip to content

Commit

Permalink
Make field BeanValidationRandomizerRegistry#annotationHandlers protected
Browse files Browse the repository at this point in the history
This change is required to be able to extend the default bean validation
registry with custom annotation handlers.

Issue j-easy#401
  • Loading branch information
fmbenhassine committed Mar 26, 2020
1 parent 3caa7e2 commit 1598695
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@Priority(-2)
public class BeanValidationRandomizerRegistry implements RandomizerRegistry {

private Map<Class<? extends Annotation>, BeanValidationAnnotationHandler> annotationHandlers = new HashMap<>();
protected Map<Class<? extends Annotation>, BeanValidationAnnotationHandler> annotationHandlers = new HashMap<>();

@Override
public void init(EasyRandomParameters parameters) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.validation.constraints.Digits;

import org.jeasy.random.EasyRandom;
import org.jeasy.random.EasyRandomParameters;
Expand Down Expand Up @@ -219,4 +220,24 @@ void generatedBeanShouldBeValidUsingBeanValidationAPI() {
assertThat(violations).isEmpty();
}

@Test
void customRegistryTest() {
// given
class Salary {
@Digits(integer = 2, fraction = 2) // OSS developer salary.. :-)
private BigDecimal amount;
}

EasyRandomParameters parameters = new EasyRandomParameters()
.randomizerRegistry(new MyCustomBeanValidationRandomizerRegistry());
EasyRandom easyRandom = new EasyRandom(parameters);

// when
Salary salary = easyRandom.nextObject(Salary.class);

// then
assertThat(salary).isNotNull();
assertThat(salary.amount).isLessThanOrEqualTo(new BigDecimal("99.99"));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* The MIT License
*
* Copyright (c) 2020, Mahmoud Ben Hassine ([email protected])
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package org.jeasy.random.validation;

import javax.validation.constraints.Digits;

import org.jeasy.random.EasyRandomParameters;

public class MyCustomBeanValidationRandomizerRegistry extends BeanValidationRandomizerRegistry {

@Override
public void init(EasyRandomParameters parameters) {
super.init(parameters);
annotationHandlers.put(Digits.class, new MyCustomDigitsAnnotationHandler());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* The MIT License
*
* Copyright (c) 2020, Mahmoud Ben Hassine ([email protected])
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package org.jeasy.random.validation;

import java.lang.reflect.Field;

import org.jeasy.random.api.Randomizer;
import org.jeasy.random.randomizers.number.BigDecimalRandomizer;

public class MyCustomDigitsAnnotationHandler implements BeanValidationAnnotationHandler {

@Override
public Randomizer<?> getRandomizer(Field field) {
// `@Digits` is applicable to several types (see its javadoc)
// for this test, just assuming the field is a BigDecimal
return new BigDecimalRandomizer(Integer.valueOf(2));
}

}

0 comments on commit 1598695

Please sign in to comment.