From dcdfe3eb789c14816206e1ad09a264b37ee7918c Mon Sep 17 00:00:00 2001
From: Naeim Taheri <nima.trueway@gmail.com>
Date: Fri, 27 Sep 2024 11:52:05 -0700
Subject: [PATCH 1/4] deps: upgrade libraries to make it jdk21 compatible

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index aa02a56f0e9..b488334fc8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,11 +32,11 @@
         <jackson.version>2.14.0</jackson.version>
         <kafka-clients.version>3.5.0</kafka-clients.version>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
-        <org.projectlombok.version>1.18.24</org.projectlombok.version>
+        <org.projectlombok.version>1.18.30</org.projectlombok.version>
         <protobuf-java.version>3.23.3</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <spring-boot.version>3.1.3</spring-boot.version>
+        <spring-boot.version>3.1.4</spring-boot.version>
         <kafka-ui-serde-api.version>1.0.0</kafka-ui-serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.26</odd-oddrn-client.version>

From 9edf97d7bfb5e3e62f4f1dcef96983adff720a1f Mon Sep 17 00:00:00 2001
From: Naeim Taheri <nima.trueway@gmail.com>
Date: Fri, 27 Sep 2024 11:52:23 -0700
Subject: [PATCH 2/4] deps: add event-bus-events-java and protobuf-java

---
 kafka-ui-api/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/kafka-ui-api/pom.xml b/kafka-ui-api/pom.xml
index d572a4ffa34..f9ec3c41de1 100644
--- a/kafka-ui-api/pom.xml
+++ b/kafka-ui-api/pom.xml
@@ -21,6 +21,16 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.hootsuite</groupId>
+            <artifactId>event-bus-events-java</artifactId>
+            <version>20.26.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>4.28.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>

From 5629aa4bcca5939ae46aa837e46bab7ffc6b8c6c Mon Sep 17 00:00:00 2001
From: Naeim Taheri <nima.trueway@gmail.com>
Date: Fri, 27 Sep 2024 11:54:16 -0700
Subject: [PATCH 3/4] feat: decode protobuf using hootsuite eventbus library

---
 .../kafka/ui/serdes/builtin/ProtobufRawSerde.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
index 221b8b5ea53..b461ba6cc96 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/serdes/builtin/ProtobufRawSerde.java
@@ -1,6 +1,6 @@
 package com.provectus.kafka.ui.serdes.builtin;
 
-import com.google.protobuf.UnknownFieldSet;
+import com.hootsuite.eventbus.events.deserialize.EventListDeserializer;
 import com.provectus.kafka.ui.exception.ValidationException;
 import com.provectus.kafka.ui.serde.api.DeserializeResult;
 import com.provectus.kafka.ui.serde.api.RecordHeaders;
@@ -8,6 +8,7 @@
 import com.provectus.kafka.ui.serdes.BuiltInSerde;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.SneakyThrows;
 
 public class ProtobufRawSerde implements BuiltInSerde {
@@ -48,12 +49,15 @@ public Deserializer deserializer(String topic, Target type) {
         @Override
         public DeserializeResult deserialize(RecordHeaders headers, byte[] data) {
             try {
-              UnknownFieldSet unknownFields = UnknownFieldSet.parseFrom(data);
-              return new DeserializeResult(unknownFields.toString(), DeserializeResult.Type.STRING, Map.of());
+              var events = EventListDeserializer.deserialize(data);
+              var serialized = events.stream().map(e ->
+                e.getDescriptorForType().getName() + " {\n" + e.toString().replaceAll("(?m)^", "  ") + "}"
+              ).collect(Collectors.joining("\n"));
+              return new DeserializeResult(serialized, DeserializeResult.Type.STRING, Map.of());
             } catch (Exception e) {
               throw new ValidationException(e.getMessage());
             }
         }
     };
   }
-}
\ No newline at end of file
+}

From 9de4107933616c7a26a6bbecb40f0934170c4109 Mon Sep 17 00:00:00 2001
From: Naeim Taheri <nima.trueway@gmail.com>
Date: Fri, 27 Sep 2024 11:54:38 -0700
Subject: [PATCH 4/4] conf: configure dev/staging

---
 kafka-ui-api/src/main/resources/application.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kafka-ui-api/src/main/resources/application.yml b/kafka-ui-api/src/main/resources/application.yml
index e8799206132..87f1958be4e 100644
--- a/kafka-ui-api/src/main/resources/application.yml
+++ b/kafka-ui-api/src/main/resources/application.yml
@@ -1,6 +1,18 @@
 auth:
   type: DISABLED
 
+server:
+  port: 8080
+
+kafka:
+  clusters:
+    - name: dev
+      bootstrapServers: b-1.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092,b-2.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092,b-3.eventbusmskdevelopment.6x9wvy.c8.kafka.us-east-1.amazonaws.com:9092
+      defaultValueSerde: ProtobufDecodeRaw
+    - name: staging
+      bootstrapServers: b-1.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092,b-2.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092,b-3.eventbusmskstaging.gxfvi6.c2.kafka.us-east-1.amazonaws.com:9092
+      defaultValueSerde: ProtobufDecodeRaw
+
 management:
   endpoint:
     info: