iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-20499 | Merging javax-validation-advanced module in javaxval-2. (#14362)

This commit is contained in:
Gaetano Piazzolla 2023-07-05 19:23:06 +02:00 committed by GitHub
parent fae290a102
commit 6130c8436d
14 changed files with 162 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javax-validation-advanced/.gitignore vendored
View File

@ -1,6 +0,0 @@
.classpath
.project
.settings/
target/
bin/

6
javax-validation-advanced/README.md
View File

@ -1,6 +0,0 @@
## Java Bean Validation Examples
This module contains articles about Bean Validation.
### Relevant Articles:
- [Object Validation After Deserialization](https://www.baeldung.com/java-object-validation-deserialization)

33
javax-validation-advanced/pom.xml
View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>javax-validation-advanced</artifactId>
<name>javax-validation-advanced</name>
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
</dependencies>
<properties>
<spring.boot.version>2.7.5</spring.boot.version>
<jackson.databind.version>2.14.0</jackson.databind.version>
</properties>
</project>

1
javaxval-2/README.md
View File

@ -6,4 +6,5 @@ This module contains articles about Bean Validation.
- [Method Constraints with Bean Validation 2.0](https://www.baeldung.com/javax-validation-method-constraints)
- [Guide to ParameterMessageInterpolator](https://www.baeldung.com/hibernate-parametermessageinterpolator)
- [Hibernate Validator Annotation Processor in Depth](https://www.baeldung.com/hibernate-validator-annotation-processor)
- [Object Validation After Deserialization](https://www.baeldung.com/java-object-validation-deserialization)
- More articles: [[<-- prev]](../javaxval)

6
javaxval-2/pom.xml
View File

@ -25,6 +25,11 @@
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
</dependencies>
<!-- uncomment in order to enable Hibernate Validator Anotation Processor -->
@ -39,6 +44,7 @@
<properties>
<spring.boot.version>3.0.4</spring.boot.version>
<jackson.databind.version>2.14.0</jackson.databind.version>
</properties>
</project>

40
javax-validation-advanced/src/main/java/com/baeldung/javaxval/afterdeserialization/BeanDeserializerModifierWithValidation.java → javaxval-2/src/main/java/com/baeldung/javaxval/afterdeserialization/BeanDeserializerModifierWithValidation.java
View File

@ -1,20 +1,20 @@
package com.baeldung.javaxval.afterdeserialization;
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
public class BeanDeserializerModifierWithValidation extends BeanDeserializerModifier {
@Override
public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config, BeanDescription beanDesc, JsonDeserializer<?> deserializer) {
if (deserializer instanceof BeanDeserializer) {
return new BeanDeserializerWithValidation((BeanDeserializer) deserializer);
}
return deserializer;
}
}
package com.baeldung.javaxval.afterdeserialization;
import com.fasterxml.jackson.databind.BeanDescription;
import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
public class BeanDeserializerModifierWithValidation extends BeanDeserializerModifier {
@Override
public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config, BeanDescription beanDesc, JsonDeserializer<?> deserializer) {
if (deserializer instanceof BeanDeserializer) {
return new BeanDeserializerWithValidation((BeanDeserializer) deserializer);
}
return deserializer;
}
}

80
javax-validation-advanced/src/main/java/com/baeldung/javaxval/afterdeserialization/BeanDeserializerWithValidation.java → javaxval-2/src/main/java/com/baeldung/javaxval/afterdeserialization/BeanDeserializerWithValidation.java
View File

@ -1,40 +1,40 @@
package com.baeldung.javaxval.afterdeserialization;
import java.io.IOException;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializerBase;
public class BeanDeserializerWithValidation extends BeanDeserializer {
private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
private static final Validator validator = factory.getValidator();
protected BeanDeserializerWithValidation(BeanDeserializerBase src) {
super(src);
}
@Override
public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
Object instance = super.deserialize(p, ctxt);
validate(instance);
return instance;
}
public <T> void validate(T t) {
Set<ConstraintViolation<T>> violations = validator.validate(t);
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
}
}
}
package com.baeldung.javaxval.afterdeserialization;
import java.io.IOException;
import java.util.Set;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validation;
import jakarta.validation.Validator;
import jakarta.validation.ValidatorFactory;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.deser.BeanDeserializer;
import com.fasterxml.jackson.databind.deser.BeanDeserializerBase;
public class BeanDeserializerWithValidation extends BeanDeserializer {
private static final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
private static final Validator validator = factory.getValidator();
protected BeanDeserializerWithValidation(BeanDeserializerBase src) {
super(src);
}
@Override
public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
Object instance = super.deserialize(p, ctxt);
validate(instance);
return instance;
}
public <T> void validate(T t) {
Set<ConstraintViolation<T>> violations = validator.validate(t);
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
}
}
}

28
javax-validation-advanced/src/main/java/com/baeldung/javaxval/afterdeserialization/Student.java → javaxval-2/src/main/java/com/baeldung/javaxval/afterdeserialization/Student.java
View File

@ -1,14 +1,14 @@
package com.baeldung.javaxval.afterdeserialization;
import javax.validation.constraints.Size;
public class Student {
@Size(min = 5, max = 10, message = "Student's name must be between 5 and 10 characters")
private String name;
public String getName() {
return name;
}
}
package com.baeldung.javaxval.afterdeserialization;
import jakarta.validation.constraints.Size;
public class Student {
@Size(min = 5, max = 10, message = "Student's name must be between 5 and 10 characters")
private String name;
public String getName() {
return name;
}
}

48
javax-validation-advanced/src/main/java/com/baeldung/javaxval/afterdeserialization/StudentDeserializerWithValidation.java → javaxval-2/src/main/java/com/baeldung/javaxval/afterdeserialization/StudentDeserializerWithValidation.java
View File

@ -1,24 +1,24 @@
package com.baeldung.javaxval.afterdeserialization;
import java.io.IOException;
import java.io.InputStream;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
public class StudentDeserializerWithValidation {
public static Student readStudent(InputStream inputStream) throws IOException {
ObjectMapper mapper = getObjectMapperWithValidation();
return mapper.readValue(inputStream, Student.class);
}
private static ObjectMapper getObjectMapperWithValidation() {
SimpleModule validationModule = new SimpleModule();
validationModule.setDeserializerModifier(new BeanDeserializerModifierWithValidation());
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(validationModule);
return mapper;
}
}
package com.baeldung.javaxval.afterdeserialization;
import java.io.IOException;
import java.io.InputStream;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
public class StudentDeserializerWithValidation {
public static Student readStudent(InputStream inputStream) throws IOException {
ObjectMapper mapper = getObjectMapperWithValidation();
return mapper.readValue(inputStream, Student.class);
}
private static ObjectMapper getObjectMapperWithValidation() {
SimpleModule validationModule = new SimpleModule();
validationModule.setDeserializerModifier(new BeanDeserializerModifierWithValidation());
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(validationModule);
return mapper;
}
}

102
javax-validation-advanced/src/test/java/com/baeldung/javaxval/StudentDeserializerWithValidationUnitTest.java → javaxval-2/src/test/java/com/baeldung/javaxval/afterdeserialization/StudentDeserializerWithValidationUnitTest.java
View File

@ -1,51 +1,51 @@
package com.baeldung.javaxval;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import java.io.InputStream;
import javax.validation.ConstraintViolationException;
import org.junit.jupiter.api.Test;
import com.baeldung.javaxval.afterdeserialization.Student;
import com.baeldung.javaxval.afterdeserialization.StudentDeserializerWithValidation;
public class StudentDeserializerWithValidationUnitTest {
private final String EXPECTED_ERROR_MESSAGE = "name: Student's name must be between 5 and 10 characters";
private final String EXPECTED_STUDENT_NAME = "Daniel";
private final String NAME_TOO_LONG_STUDENT_FILE = "nameTooLongStudent.json";
private final String NAME_TOO_SHORT_STUDENT_FILE = "nameTooShortStudent.json";
private final String SUBDIRECTORY = "afterdeserialization/";
private final String VALID_STUDENT_FILE = "validStudent.json";
@Test
void givenValidStudent_WhenReadStudent_ThenReturnStudent() throws IOException {
InputStream inputStream = getInputStream(VALID_STUDENT_FILE);
Student result = StudentDeserializerWithValidation.readStudent(inputStream);
assertEquals(EXPECTED_STUDENT_NAME, result.getName());
}
@Test
void givenStudentWithTooShortName_WhenReadStudent_ThenThrows() {
InputStream inputStream = getInputStream(NAME_TOO_SHORT_STUDENT_FILE);
ConstraintViolationException constraintViolationException = assertThrows(ConstraintViolationException.class, () -> StudentDeserializerWithValidation.readStudent(inputStream));
assertEquals(EXPECTED_ERROR_MESSAGE, constraintViolationException.getMessage());
}
@Test
void givenStudentWithTooLongName_WhenReadStudent_ThenThrows() {
InputStream inputStream = getInputStream(NAME_TOO_LONG_STUDENT_FILE);
ConstraintViolationException constraintViolationException = assertThrows(ConstraintViolationException.class, () -> StudentDeserializerWithValidation.readStudent(inputStream));
assertEquals(EXPECTED_ERROR_MESSAGE, constraintViolationException.getMessage());
}
private InputStream getInputStream(String fileName) {
return getClass().getClassLoader()
.getResourceAsStream(SUBDIRECTORY + fileName);
}
}
package com.baeldung.javaxval;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import java.io.InputStream;
import jakarta.validation.ConstraintViolationException;
import org.junit.jupiter.api.Test;
import com.baeldung.javaxval.afterdeserialization.Student;
import com.baeldung.javaxval.afterdeserialization.StudentDeserializerWithValidation;
public class StudentDeserializerWithValidationUnitTest {
private final String EXPECTED_ERROR_MESSAGE = "name: Student's name must be between 5 and 10 characters";
private final String EXPECTED_STUDENT_NAME = "Daniel";
private final String NAME_TOO_LONG_STUDENT_FILE = "nameTooLongStudent.json";
private final String NAME_TOO_SHORT_STUDENT_FILE = "nameTooShortStudent.json";
private final String SUBDIRECTORY = "afterdeserialization/";
private final String VALID_STUDENT_FILE = "validStudent.json";
@Test
void givenValidStudent_WhenReadStudent_ThenReturnStudent() throws IOException {
InputStream inputStream = getInputStream(VALID_STUDENT_FILE);
Student result = StudentDeserializerWithValidation.readStudent(inputStream);
assertEquals(EXPECTED_STUDENT_NAME, result.getName());
}
@Test
void givenStudentWithTooShortName_WhenReadStudent_ThenThrows() {
InputStream inputStream = getInputStream(NAME_TOO_SHORT_STUDENT_FILE);
ConstraintViolationException constraintViolationException = assertThrows(ConstraintViolationException.class, () -> StudentDeserializerWithValidation.readStudent(inputStream));
assertEquals(EXPECTED_ERROR_MESSAGE, constraintViolationException.getMessage());
}
@Test
void givenStudentWithTooLongName_WhenReadStudent_ThenThrows() {
InputStream inputStream = getInputStream(NAME_TOO_LONG_STUDENT_FILE);
ConstraintViolationException constraintViolationException = assertThrows(ConstraintViolationException.class, () -> StudentDeserializerWithValidation.readStudent(inputStream));
assertEquals(EXPECTED_ERROR_MESSAGE, constraintViolationException.getMessage());
}
private InputStream getInputStream(String fileName) {
return getClass().getClassLoader()
.getResourceAsStream(SUBDIRECTORY + fileName);
}
}

4
javax-validation-advanced/src/test/resources/afterdeserialization/nameTooLongStudent.json → javaxval-2/src/test/resources/afterdeserialization/nameTooLongStudent.json
View File

@ -1,3 +1,3 @@
{
"name": "Constantine"
{
"name": "Constantine"
}

4
javax-validation-advanced/src/test/resources/afterdeserialization/nameTooShortStudent.json → javaxval-2/src/test/resources/afterdeserialization/nameTooShortStudent.json
View File

@ -1,3 +1,3 @@
{
"name": "Max"
{
"name": "Max"
}

4
javax-validation-advanced/src/test/resources/afterdeserialization/validStudent.json → javaxval-2/src/test/resources/afterdeserialization/validStudent.json
View File

@ -1,3 +1,3 @@
{
"name": "Daniel"
{
"name": "Daniel"
}

2
pom.xml
View File

@ -850,7 +850,6 @@
<module>javax-sound</module>
<module>javaxval</module>
<module>javaxval-2</module>
<module>javax-validation-advanced</module>
<module>jetbrains</module>
<module>jgit</module>
<module>jib</module>
@ -1120,7 +1119,6 @@
<module>javax-sound</module>
<module>javaxval</module>
<module>javaxval-2</module>
<module>javax-validation-advanced</module>
<module>jetbrains</module>
<module>jgit</module>
<module>jib</module>