From 3ca93f9ff6f6a3b7319ef1733476b2cad083fc1c Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Tue, 26 Sep 2023 19:13:12 +0530
Subject: Change Kafka consumerGroup name

Current name causing authentication issues while using with OOM

Issue-ID: CCSDK-3918
Change-Id: Iada936b2fbb8920ba520063bb816c52e15a887e2
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 sdnr/wt/mountpoint-registrar/feature/pom.xml                  | 11 ++++++++++-
 .../wt/mountpointregistrar/kafka/VESMsgKafkaConsumer.java     |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/sdnr/wt/mountpoint-registrar/feature/pom.xml b/sdnr/wt/mountpoint-registrar/feature/pom.xml
index 09468552e..acf02ed2b 100644
--- a/sdnr/wt/mountpoint-registrar/feature/pom.xml
+++ b/sdnr/wt/mountpoint-registrar/feature/pom.xml
@@ -22,6 +22,7 @@
   ~ ============LICENSE_END=======================================================
   ~
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -38,7 +39,15 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.kafka</groupId>
+                <artifactId>kafka-clients</artifactId>
+		<version>3.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/kafka/VESMsgKafkaConsumer.java b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/kafka/VESMsgKafkaConsumer.java
index b8dee44b0..352db03f2 100644
--- a/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/kafka/VESMsgKafkaConsumer.java
+++ b/sdnr/wt/mountpoint-registrar/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/mountpointregistrar/kafka/VESMsgKafkaConsumer.java
@@ -38,7 +38,7 @@ public class VESMsgKafkaConsumer {
         props.put(SaslConfigs.SASL_MECHANISM, strimziKafkaProperties.getProperty("saslMechanism"));
         props.put(SaslConfigs.SASL_JAAS_CONFIG, strimziKafkaProperties.getProperty("saslJaasConfig"));
         props.put(ConsumerConfig.GROUP_ID_CONFIG,
-                consumerProperties.getProperty("topic") + "-" + consumerProperties.getProperty("consumerGroup"));
+                consumerProperties.getProperty("consumerGroup") + "-" + consumerProperties.getProperty("topic"));
         props.put(ConsumerConfig.CLIENT_ID_CONFIG,
                 consumerProperties.getProperty("topic") + "-" + consumerProperties.getProperty("consumerID"));
         props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "latest");
-- 
cgit 1.2.3-korg