Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-28 09:06:14 +01:00
Code Issues Packages Projects Releases Activity

Let validation error dto inherit from 'normal' error

Browse Source
This commit is contained in:
René Pfeuffer
2018-10-26 09:47:30 +02:00
parent 7f0b7c5831
commit f34ea4ece1
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scm-webapp/src/main/java/sonia/scm/api/v2/ValidationExceptionMapper.java
View File

@@ -2,6 +2,8 @@ package sonia.scm.api.v2;
import lombok.Getter;
import org.jboss.resteasy.api.validation.ResteasyViolationException;
import org.slf4j.MDC;
import sonia.scm.api.v2.resources.ErrorDto;
import javax.validation.ConstraintViolation;
import javax.ws.rs.core.MediaType;
@@ -11,46 +13,50 @@ import javax.ws.rs.ext.Provider;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import static java.util.Collections.emptyList;
@Provider
public class ValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
@Override
public Response toResponse(ResteasyViolationException exception) {
List<ConstraintViolationBean> violations =
List<ConstraintViolationDto> violations =
exception.getConstraintViolations()
.stream()
.map(ConstraintViolationBean::new)
.map(ConstraintViolationDto::new)
.collect(Collectors.toList());
return Response
.status(Response.Status.BAD_REQUEST)
.type(MediaType.APPLICATION_JSON_TYPE)
.entity(new ValidationError(violations))
.entity(new ValidationErrorDto(violations))
.build();
}
@Getter
public static class ValidationError {
public static class ValidationErrorDto extends ErrorDto {
@XmlElement(name = "violation")
@XmlElementWrapper(name = "violations")
private List<ConstraintViolationBean> violations;
private List<ConstraintViolationDto> violations;
public ValidationError(List<ConstraintViolationBean> violations) {
public ValidationErrorDto(List<ConstraintViolationDto> violations) {
super(MDC.get("transaction_id"), "1wR7ZBe7H1", emptyList(), "input violates conditions (see violation list)");
this.violations = violations;
}
}
@XmlRootElement(name = "violation")
@Getter
public static class ConstraintViolationBean {
public static class ConstraintViolationDto {
private String path;
private String message;
public ConstraintViolationBean(ConstraintViolation<?> violation) {
public ConstraintViolationDto(ConstraintViolation<?> violation) {
message = violation.getMessage();
path = violation.getPropertyPath().toString();
}