Skip to content
Snippets Groups Projects
Commit 6a54d9fa authored by Martin Vogel's avatar Martin Vogel
Browse files

refactor(#1073): improve error messages, show problem detail

parent 899854b9
No related branches found
No related tags found
1 merge request!206#1073 Fix Reply Channel Valdiation
This commit is part of merge request !206. Comments created here will be created in the context of that merge request.
......@@ -120,23 +120,23 @@ public class SubmissionReceiver {
private void validateMetadata(final Metadata metadata, final Submission submission, final AuthenticationTags authenticationTags) {
final ValidationResult validationResult = subscriber.validateMetadata(metadata, submission, authenticationTags);
evaluateValidationResult(submission, validationResult, "Metadata is invalid");
evaluateValidationResult(submission, validationResult);
}
private void validateAttachments(final List<AttachmentForValidation> attachmentForValidation, final Submission submission, final AuthenticationTags authenticationTags) {
final ValidationResult validationResult = subscriber.validateAttachments(attachmentForValidation, authenticationTags);
evaluateValidationResult(submission, validationResult, "Attachment validation failed");
evaluateValidationResult(submission, validationResult);
}
private void validateData(final Submission submission, final Metadata metadata, final byte[] decryptedData, final AuthenticationTags authenticationTags) {
final ValidationResult validationResult = subscriber.validateData(decryptedData, submission, metadata, authenticationTags);
evaluateValidationResult(submission, validationResult, "Data is invalid");
evaluateValidationResult(submission, validationResult);
}
private void evaluateValidationResult(final Submission submission, final ValidationResult validationResult, final String errorMessage) throws SubmissionRequestException {
private void evaluateValidationResult(final Submission submission, final ValidationResult validationResult) throws SubmissionRequestException {
if (validationResult.hasProblems()) {
rejectSubmissionWithProblem(submission, validationResult.getProblems().toArray(new Problem[0]));
throw new SubmissionRequestException(validationResult.hasError() ? validationResult.getError().getMessage() : errorMessage);
throw new SubmissionRequestException(validationResult.getProblems().stream().map(Problem::getDetail).collect(Collectors.joining()));
} else if (validationResult.hasError()) {
LOGGER.error(validationResult.getError().getMessage(), validationResult.getError());
throw new SubmissionRequestException(validationResult.getError().getMessage(), validationResult.getError());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment