From 6b1777bf08c682fab15f158e9946e36f3cb9698a Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Thu, 6 Sep 2018 13:37:27 +0200 Subject: Fix common event header parsing During JSON parsing we were using 3 times 'version' field. Replaced parsing with protobuf parser to avoid mistakes like this in future Change-Id: I6224dc6533ab553e7e2315a95567a1fa48c1c5ad Issue-ID: DCAEGEN2-710 Signed-off-by: Filip Krzywka --- .../onap/dcae/collectors/veshv/impl/MessageValidator.kt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'hv-collector-core/src/main/kotlin') 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 543d7dc6..8affa0b1 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 @@ -19,29 +19,17 @@ */ package org.onap.dcae.collectors.veshv.impl +import org.onap.dcae.collectors.veshv.domain.headerRequiredFieldDescriptors import org.onap.dcae.collectors.veshv.model.VesMessage import org.onap.ves.VesEventV5.VesEvent.CommonEventHeader internal object MessageValidator { - private val requiredFieldDescriptors = listOf( - "version", - "eventName", - "domain", - "eventId", - "sourceName", - "reportingEntityName", - "priority", - "startEpochMicrosec", - "lastEpochMicrosec", - "sequence") - .map { fieldName -> CommonEventHeader.getDescriptor().findFieldByName(fieldName) } - fun isValid(message: VesMessage): Boolean { return allMandatoryFieldsArePresent(message.header) } private fun allMandatoryFieldsArePresent(header: CommonEventHeader) = - requiredFieldDescriptors + headerRequiredFieldDescriptors .all { fieldDescriptor -> header.hasField(fieldDescriptor) } } -- cgit 1.2.3-korg