Merge "NCMP : forward bulk response messages to client topic"

2 files changed, 8 insertions, 8 deletions

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
index 2c7659949..b343d70a7 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/async/BatchRecordFilterStrategy.java
@@ -22,6 +22,7 @@ package org.onap.cps.ncmp.api.impl.async;
 
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.kafka.common.header.Header;
+import org.onap.cps.ncmp.events.async.BatchDataResponseEventV1;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.listener.adapter.RecordFilterStrategy;
@@ -40,16 +41,15 @@ public class BatchRecordFilterStrategy {
      * @return boolean value.
      */
     @Bean
-    public RecordFilterStrategy<Object, Object> filterBatchDataResponseEvent() {
+    public RecordFilterStrategy<String, BatchDataResponseEventV1> filterBatchDataResponseEvent() {
         return consumedRecord -> {
             final Header eventTypeHeader = consumedRecord.headers().lastHeader("eventType");
-            if (eventTypeHeader != null) {
-                final String eventTypeHeaderValue = SerializationUtils.deserialize(eventTypeHeader.value());
-                return !(eventTypeHeaderValue != null
-                        && eventTypeHeaderValue.startsWith("org.onap.cps.ncmp.events.async.BatchDataResponseEvent"));
-            } else {
-                return true;
+            if (eventTypeHeader == null) {
+                return false;
             }
+            final String eventTypeHeaderValue = SerializationUtils.deserialize(eventTypeHeader.value());
+            return !(eventTypeHeaderValue != null
+                    && eventTypeHeaderValue.startsWith("org.onap.cps.ncmp.events.async.BatchDataResponseEvent"));
         };
     }
 }
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/async/NcmpAsyncBatchEventConsumerSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/async/NcmpAsyncBatchEventConsumerSpec.groovy
index 65c43a011..28464bb91 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/async/NcmpAsyncBatchEventConsumerSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/async/NcmpAsyncBatchEventConsumerSpec.groovy
@@ -55,7 +55,7 @@ class NcmpAsyncBatchEventConsumerSpec extends MessagingBaseSpec {
     JsonObjectMapper jsonObjectMapper
 
     @Autowired
-    RecordFilterStrategy<Object, Object> recordFilterStrategy
+    RecordFilterStrategy<String, BatchDataResponseEventV1> recordFilterStrategy
 
     def kafkaConsumer = new KafkaConsumer<>(consumerConfigProperties('test'))
     def static clientTopic = 'client-topic'