Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
FIT-Connect-SDK - Java
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FIT-Connect
FIT-Connect-SDK - Java
Merge requests
!206
#1073 Fix Reply Channel Valdiation
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
#1073 Fix Reply Channel Valdiation
bugfix/1073-invalid-reply-channel-validation
into
main
Overview
0
Commits
6
Pipelines
0
Changes
1
Merged
Martin Vogel
requested to merge
bugfix/1073-invalid-reply-channel-validation
into
main
1 year ago
Overview
0
Commits
6
Pipelines
0
Changes
1
Expand
Verhindert die Validierung des Submission ReplyChannel wenn in der Destination kein ReplyChannel gesetzt ist
Closes
planning#1073 (closed)
0
0
Merge request reports
Viewing commit
6a54d9fa
Prev
Next
Show latest version
1 file
+
5
−
5
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
6a54d9fa
refactor(#1073): improve error messages, show problem detail
· 6a54d9fa
Martin Vogel
authored
1 year ago
client/src/main/java/dev/fitko/fitconnect/client/subscriber/SubmissionReceiver.java
+
5
−
5
Options
@@ -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
());
Loading