From 096d81269d7ba1b2fbe1b7db60aea1257d836578 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 28 Feb 2019 14:50:04 -0600 Subject: [PATCH] [#12] rework validation fix constructor to not add a message if null use empty constructor if all is well --- .../domain/resolvers/MetadataResolverValidationService.java | 4 +--- .../admin/ui/domain/resolvers/MetadataResolverValidator.java | 4 +++- .../resolvers/ResourceBackedMetadataResolverValidator.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java index c3a48afe2..676755b26 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidationService.java @@ -28,9 +28,7 @@ public ValidationResult validateIfNecessary(T metadataResolver) { this.validators .stream() .filter(v -> v.supports(metadataResolver)) - .forEach(v -> { - validationResult.getErrorMessages().addAll(v.validate(metadataResolver).getErrorMessages()); - }); + .forEach(v -> v.validate(metadataResolver).getErrorMessages().stream().filter(m -> m != null).forEach(r -> validationResult.getErrorMessages().add(r))); return validationResult; } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidator.java index d63f4e6ea..a57bc6f18 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidator.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverValidator.java @@ -23,7 +23,9 @@ class ValidationResult { public ValidationResult() {} public ValidationResult(String errorMessage) { - this.errorMessages.add(errorMessage); + if (errorMessage != null) { + this.errorMessages.add(errorMessage); + } } private List errorMessages = new ArrayList<>(); diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolverValidator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolverValidator.java index 0a828fbed..480491465 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolverValidator.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ResourceBackedMetadataResolverValidator.java @@ -15,6 +15,6 @@ public ValidationResult validate(ResourceBackedMetadataResolver resolver) { catch (ResourceBackedMetadataResolver.InvalidResourceTypeException e) { return new ValidationResult(e.getMessage()); } - return new ValidationResult(null); + return new ValidationResult(); } }