From 8280865dce0e7df5529eee2abd543f6feda7e9ea Mon Sep 17 00:00:00 2001
From: dan-du-car <dan.du@leidos.com>
Date: Thu, 6 Jul 2023 14:30:41 -0400
Subject: [PATCH] remove uuid

---
 src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp | 7 -------
 src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h   | 5 +----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp
index 217ca1fa6..71703bd59 100755
--- a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp
+++ b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.cpp
@@ -84,13 +84,6 @@ void CARMAStreetsPlugin::InitKafkaConsumerProducers()
 	}
 
 	//Consumers
-	auto uuid = boost::uuids::random_generator()();
-	std::stringstream ss;
-	ss << uuid;
-	_subscribeToSpatConsumerGroupId += ss.str();
-	_subscribeToSchedulingPlanConsumerGroupId += ss.str();
-	_subscribeToSSMConsumerGroupId += ss.str();
-	//Todo further enhancement: Temporary fix for the consumer rebalancing due to multiple consumers join the same group upon restarting plugin.
 	_spat_kafka_consumer_ptr = client.create_consumer(kafkaConnectString, _subscribeToSpatTopic,_subscribeToSpatConsumerGroupId);
 	_scheduing_plan_kafka_consumer_ptr = client.create_consumer(kafkaConnectString, _subscribeToSchedulingPlanTopic,_subscribeToSchedulingPlanConsumerGroupId);
 	_ssm_kafka_consumer_ptr = client.create_consumer(kafkaConnectString, _subscribeToSsmTopic,_subscribeToSSMConsumerGroupId);
diff --git a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h
index 190e2a19f..35df38132 100755
--- a/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h
+++ b/src/v2i-hub/CARMAStreetsPlugin/src/CARMAStreetsPlugin.h
@@ -16,10 +16,7 @@
 #include <mutex>
 #include "J2735MapToJsonConverter.h"
 #include "JsonToJ2735SpatConverter.h"
-#include "J2735ToSRMJsonConverter.h"
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>   
+#include "J2735ToSRMJsonConverter.h"   
 #include <kafka/kafka_client.h>
 #include <kafka/kafka_consumer_worker.h>
 #include "JsonToJ2735SSMConverter.h"