Skip to content

Commit 04dcc28

Browse files
committed
fixing up email string array splitting
Signed-off-by: Neil South <[email protected]>
1 parent ebf4c60 commit 04dcc28

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ private void ValidateEmailTask(TaskObject currentTask)
481481
if (emailsSpecified)
482482
{
483483
var emails = currentTask.Args[RecipientEmails] ?? string.Empty;
484-
var formattedEmails = emails.Split(',').Where(e => !string.IsNullOrWhiteSpace(e.Trim()));
484+
var formattedEmails = emails.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
485485

486486
if (!formattedEmails.Any())
487487
{
@@ -522,7 +522,7 @@ private void ValidateEmailTask(TaskObject currentTask)
522522
if (rolesSpecified)
523523
{
524524
var roles = currentTask.Args[RecipientRoles] ?? string.Empty;
525-
var formattedRoles = roles.Split(',').Where(r => !string.IsNullOrWhiteSpace(r.Trim()));
525+
var formattedRoles = roles.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
526526

527527
if (!formattedRoles.Any())
528528
{
@@ -538,15 +538,15 @@ private void ValidateEmailTask(TaskObject currentTask)
538538
}
539539

540540
var metadataValues = currentTask.Args[MetadataValues] ?? string.Empty;
541-
var formattedMetadataValues = metadataValues.Split(',').Where(m => !string.IsNullOrWhiteSpace(m.Trim()));
541+
var formattedMetadataValues = metadataValues.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
542542

543543
if (!formattedMetadataValues.Any())
544544
{
545545
Errors.Add($"Argument '{MetadataValues}' for task {currentTask.Id} must be a comma seperated list of DICOM metadata tag names.");
546546
return;
547547
}
548548

549-
var disallowedTags = _options.Value.DicomTagsDisallowed.Split(',').Select(t => t.Trim());
549+
var disallowedTags = _options.Value.DicomTagsDisallowed.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
550550
var intersect = formattedMetadataValues.Intersect(disallowedTags);
551551

552552
if (intersect.Any())

0 commit comments

Comments
 (0)