diff options
author | Michal Banka <michal.banka@nokia.com> | 2020-03-23 15:03:10 +0100 |
---|---|---|
committer | Michal Banka <michal.banka@nokia.com> | 2020-03-24 12:45:53 +0100 |
commit | c4047c754b96f63e5c7675969937967aa739bd2f (patch) | |
tree | dd00967d688b5984aa6a9a9b72380d9b633dab51 /certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation | |
parent | 2d8221140ce7d57892e94bc87ada96a0900f9fcc (diff) |
Add validation for uniqueness of CA names
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Change-Id: Icfa9ee0f78d360a4f640904bb9077a10f15497ed
Issue-ID: AAF-1107
Diffstat (limited to 'certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation')
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java (renamed from certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidator.java) | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidator.java b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java index 736a65d1..3cf7fdf7 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServerConfigurationValidator.java +++ b/certService/src/main/java/org/onap/aaf/certservice/certification/configuration/validation/Cmpv2ServersConfigurationValidator.java @@ -27,22 +27,42 @@ import org.springframework.stereotype.Service; import javax.validation.ConstraintViolation; import javax.validation.Validator; import java.security.InvalidParameterException; +import java.util.List; import java.util.Set; @Service -public class Cmpv2ServerConfigurationValidator { +public class Cmpv2ServersConfigurationValidator { private final Validator validator; @Autowired - public Cmpv2ServerConfigurationValidator(Validator validator) { + public Cmpv2ServersConfigurationValidator(Validator validator) { this.validator = validator; } - public void validate(Cmpv2Server serverDetails) { + public void validate(List<Cmpv2Server> servers) { + servers.forEach(this::validateServer); + validateUniqueCaNames(servers); + } + + private void validateServer(Cmpv2Server serverDetails) { Set<ConstraintViolation<Cmpv2Server>> violations = validator.validate(serverDetails); if (!violations.isEmpty()) { throw new InvalidParameterException(violations.toString()); } } + + private void validateUniqueCaNames(List<Cmpv2Server> servers) { + long distinctCAs = getNumberOfUniqueCaNames(servers); + if (servers.size() != distinctCAs) { + throw new InvalidParameterException("CA names are not unique within given CMPv2 servers"); + } + } + + private long getNumberOfUniqueCaNames(List<Cmpv2Server> servers) { + return servers.stream().map(Cmpv2Server::getCaName) + .distinct() + .count(); + } + } |