Merge 2.0.0-m3

scm-webapp/src/main/java/sonia/scm/api/v2/ResteasyValidationExceptionMapper.java

@@ -1,7 +1,7 @@
 package sonia.scm.api.v2;
 
 import org.jboss.resteasy.api.validation.ResteasyViolationException;
-import sonia.scm.api.v2.resources.ViolationExceptionToErrorDtoMapper;
+import sonia.scm.api.v2.resources.ResteasyViolationExceptionToErrorDtoMapper;
 
 import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
@@ -10,12 +10,12 @@ import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class ValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
+public class ResteasyValidationExceptionMapper implements ExceptionMapper<ResteasyViolationException> {
 
-  private final ViolationExceptionToErrorDtoMapper mapper;
+  private final ResteasyViolationExceptionToErrorDtoMapper mapper;
 
   @Inject
-  public ValidationExceptionMapper(ViolationExceptionToErrorDtoMapper mapper) {
+  public ResteasyValidationExceptionMapper(ResteasyViolationExceptionToErrorDtoMapper mapper) {
     this.mapper = mapper;
   }
 

scm-webapp/src/main/java/sonia/scm/api/v2/ScmConstraintValidationExceptionMapper.java

@@ -0,0 +1,30 @@
+package sonia.scm.api.v2;
+
+import sonia.scm.ScmConstraintViolationException;
+import sonia.scm.api.v2.resources.ScmViolationExceptionToErrorDtoMapper;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+public class ScmConstraintValidationExceptionMapper implements ExceptionMapper<ScmConstraintViolationException> {
+
+  private final ScmViolationExceptionToErrorDtoMapper mapper;
+
+  @Inject
+  public ScmConstraintValidationExceptionMapper(ScmViolationExceptionToErrorDtoMapper mapper) {
+    this.mapper = mapper;
+  }
+
+  @Override
+  public Response toResponse(ScmConstraintViolationException exception) {
+    return Response
+      .status(Response.Status.BAD_REQUEST)
+      .type(MediaType.APPLICATION_JSON_TYPE)
+      .entity(mapper.map(exception))
+      .build();
+  }
+}

scm-webapp/src/main/java/sonia/scm/api/v2/resources/MapperModule.java

@@ -39,7 +39,8 @@ public class MapperModule extends AbstractModule {
 
     bind(ReducedObjectModelToDtoMapper.class).to(Mappers.getMapper(ReducedObjectModelToDtoMapper.class).getClass());
 
-    bind(ViolationExceptionToErrorDtoMapper.class).to(Mappers.getMapper(ViolationExceptionToErrorDtoMapper.class).getClass());
+    bind(ResteasyViolationExceptionToErrorDtoMapper.class).to(Mappers.getMapper(ResteasyViolationExceptionToErrorDtoMapper.class).getClass());
+    bind(ScmViolationExceptionToErrorDtoMapper.class).to(Mappers.getMapper(ScmViolationExceptionToErrorDtoMapper.class).getClass());
     bind(ExceptionWithContextToErrorDtoMapper.class).to(Mappers.getMapper(ExceptionWithContextToErrorDtoMapper.class).getClass());
 
     // no mapstruct required

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ResteasyViolationExceptionToErrorDtoMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Mapper
-public abstract class ViolationExceptionToErrorDtoMapper {
+public abstract class ResteasyViolationExceptionToErrorDtoMapper {
 
   @Mapping(target = "errorCode", ignore = true)
   @Mapping(target = "transactionId", ignore = true)

scm-webapp/src/main/java/sonia/scm/api/v2/resources/ScmViolationExceptionToErrorDtoMapper.java

@@ -0,0 +1,53 @@
+package sonia.scm.api.v2.resources;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+import org.slf4j.MDC;
+import sonia.scm.ScmConstraintViolationException;
+import sonia.scm.ScmConstraintViolationException.ScmConstraintViolation;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public abstract class ScmViolationExceptionToErrorDtoMapper {
+
+  @Mapping(target = "errorCode", ignore = true)
+  @Mapping(target = "transactionId", ignore = true)
+  @Mapping(target = "context", ignore = true)
+  public abstract ErrorDto map(ScmConstraintViolationException exception);
+
+  @AfterMapping
+  void setTransactionId(@MappingTarget ErrorDto dto) {
+    dto.setTransactionId(MDC.get("transaction_id"));
+  }
+
+  @AfterMapping
+  void mapViolations(ScmConstraintViolationException exception, @MappingTarget ErrorDto dto) {
+    List<ErrorDto.ConstraintViolationDto> violations =
+      exception.getViolations()
+        .stream()
+        .map(this::createViolationDto)
+        .collect(Collectors.toList());
+    dto.setViolations(violations);
+  }
+
+  private ErrorDto.ConstraintViolationDto createViolationDto(ScmConstraintViolation violation) {
+    ErrorDto.ConstraintViolationDto constraintViolationDto = new ErrorDto.ConstraintViolationDto();
+    constraintViolationDto.setMessage(violation.getMessage());
+    constraintViolationDto.setPath(violation.getPropertyPath());
+    return constraintViolationDto;
+  }
+
+  @AfterMapping
+  void setErrorCode(@MappingTarget ErrorDto dto) {
+    dto.setErrorCode("3zR9vPNIE1");
+  }
+
+  @AfterMapping
+  void setMessage(@MappingTarget ErrorDto dto) {
+    dto.setMessage("input violates conditions (see violation list)");
+  }
+}