Merge "Fixed Kafka consumer behaviour on failed deserialization"

3 files changed, 6 insertions, 4 deletions

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/messaginglib/MessagingControllerTest.kt b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/messaginglib/MessagingControllerTest.kt
index f7459f522..602033ad9 100644
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/messaginglib/MessagingControllerTest.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/messaginglib/MessagingControllerTest.kt
@@ -90,7 +90,7 @@ class MessagingControllerTest {
     @Autowired
     lateinit var webTestClient: WebTestClient
 
-    var receivedEvent: String? = null
+    var event: ExecutionServiceInput? = null
 
     @Before
     fun setup() {
@@ -142,11 +142,13 @@ class MessagingControllerTest {
         log.info("test-sender sent message='{}'", ToStringBuilder.reflectionToString(input))
 
         Thread.sleep(1000)
+
+        assertNotNull(event)
     }
 
     @KafkaListener(topicPartitions = [TopicPartition(topic = "\${blueprintsprocessor.messageclient.self-service-api.topic}", partitionOffsets = [PartitionOffset(partition = "0", initialOffset = "0")])])
-    fun receivedEventFromBluePrintProducer(event: ExecutionServiceInput) {
-        assertNotNull(event)
+    fun receivedEventFromBluePrintProducer(receivedEvent: ExecutionServiceInput) {
+        event = receivedEvent
     }
 
     private fun uploadBluePrint() {
@@ -172,7 +174,7 @@ class MessagingControllerTest {
     }
 
     private fun loadCbaArchive():File {
-        return Paths.get("./src/test/resources/cba-for-kafka-integration.zip").toFile()
+        return Paths.get("./src/test/resources/cba-for-kafka-integration_enriched.zip").toFile()
     }
 
     @Configuration
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration.zip b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration.zip
deleted file mode 100644
index 23070380c..000000000
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration.zip
+++ /dev/null
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration_enriched.zip b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration_enriched.zip
new file mode 100755
index 000000000..9581191d7
--- /dev/null
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/cba-for-kafka-integration_enriched.zip