From 0ff4184e485c31a3a1faa54f6172710bea86c286 Mon Sep 17 00:00:00 2001 From: Brinda Santh Date: Mon, 18 Nov 2019 11:38:54 -0500 Subject: Fix Message Prioritization merge conflicts Issue-ID: CCSDK-1917 Signed-off-by: Brinda Santh Change-Id: I92cdca04036c23c212b7b333ca14455eef20555c --- .../message/service/BluePrintMessageLibPropertyService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin') diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/BluePrintMessageLibPropertyService.kt b/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/BluePrintMessageLibPropertyService.kt index 97da7285d..853b88bc9 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/BluePrintMessageLibPropertyService.kt +++ b/ms/blueprintsprocessor/modules/commons/message-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/message/service/BluePrintMessageLibPropertyService.kt @@ -148,7 +148,7 @@ open class BluePrintMessageLibPropertyService(private var bluePrintPropertiesSer } private fun kafkaStreamsBasicAuthMessageConsumerProperties(prefix: String): KafkaStreamsBasicAuthConsumerProperties { - return bluePrintProperties.propertyBeanType( + return bluePrintPropertiesService.propertyBeanType( prefix, KafkaStreamsBasicAuthConsumerProperties::class.java) } -- cgit 1.2.3-korg