diff options
| author |   Jakub Dudycz <jakub.dudycz@nokia.com> | 2018-11-15 13:29:09 +0100 |
|---|---|---|
| committer | Jakub Dudycz <jakub.dudycz@nokia.com> | 2018-11-19 09:29:35 +0100 |
| commit | 33ff28e3fab91baa36e954c4fd167b615e94993c (patch) | |
| tree | 33ed79a9d53e9457a18f9aa355962d6f89f95f5c /hv-collector-core/src/main/kotlin | |
| parent | 3fdd2fe2b4f35e18998d050c632fc6de24a7e3b1 (diff) | |
Fix Common Event Header fields validation
- "sequence" is no longer a required parameter,
since deafult value "0" is acceptable
- "vesEventListenerVersion" has to match the regular expression "7\.[0-9]+\.[0-9]+"
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-976
Change-Id: I2f9fd6f375ccca3255cc9e035918dc37cc97bd6a
Diffstat (limited to 'hv-collector-core/src/main/kotlin')
| -rw-r--r-- | hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt index a4a4374c..fb949079 100644 --- a/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt +++ b/hv-collector-core/src/main/kotlin/org/onap/dcae/collectors/veshv/impl/MessageValidator.kt @@ -20,6 +20,7 @@ package org.onap.dcae.collectors.veshv.impl import org.onap.dcae.collectors.veshv.domain.headerRequiredFieldDescriptors +import org.onap.dcae.collectors.veshv.domain.vesEventListenerVersionRegex import org.onap.dcae.collectors.veshv.model.VesMessage import org.onap.ves.VesEventOuterClass.CommonEventHeader @@ -32,4 +33,6 @@ internal object MessageValidator { private fun allMandatoryFieldsArePresent(header: CommonEventHeader) = headerRequiredFieldDescriptors .all { fieldDescriptor -> header.hasField(fieldDescriptor) } + .and(vesEventListenerVersionRegex.matches(header.vesEventListenerVersion)) + } |