Made various post cherry-pick changes in order to get PR to build again

apache · Jan 22, 2025 · 3563bb8 · 3563bb8
1 parent 3eea866
commit 3563bb8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java b/clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java
@@ -133,10 +133,9 @@ public enum ApiKeys {
     READ_SHARE_GROUP_STATE_SUMMARY(ApiMessageType.READ_SHARE_GROUP_STATE_SUMMARY, true),
     STREAMS_GROUP_HEARTBEAT(ApiMessageType.STREAMS_GROUP_HEARTBEAT),
     STREAMS_GROUP_DESCRIBE(ApiMessageType.STREAMS_GROUP_DESCRIBE),
-    DESCRIBE_SHARE_GROUP_OFFSETS(ApiMessageType.DESCRIBE_SHARE_GROUP_OFFSETS);
+    DESCRIBE_SHARE_GROUP_OFFSETS(ApiMessageType.DESCRIBE_SHARE_GROUP_OFFSETS),
     GET_REPLICA_LOG_INFO(ApiMessageType.GET_REPLICA_LOG_INFO);
 
-
     private static final Map<ApiMessageType.ListenerType, EnumSet<ApiKeys>> APIS_BY_LISTENER =
         new EnumMap<>(ApiMessageType.ListenerType.class);
 

diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AbstractRequest.java
@@ -349,7 +349,7 @@ private static AbstractRequest doParseRequest(ApiKeys apiKey, short apiVersion,
             case DESCRIBE_SHARE_GROUP_OFFSETS:
                 return DescribeShareGroupOffsetsRequest.parse(buffer, apiVersion);
             case GET_REPLICA_LOG_INFO:
-                    return GetReplicaLogInfoRequest.parse(buffer, apiVersion);
+                return GetReplicaLogInfoRequest.parse(buffer, apiVersion);
             default:
                 throw new AssertionError(String.format("ApiKey %s is not currently handled in `parseRequest`, the " +
                         "code should be updated to do so.", apiKey));

diff --git a/clients/src/main/resources/common/message/GetReplicaLogInfoRequest.json b/clients/src/main/resources/common/message/GetReplicaLogInfoRequest.json
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 {
-  "apiKey":83,
+  "apiKey":91,
   "type": "request",
   "listeners": ["broker"],
   "name": "GetReplicaLogInfoRequest",

diff --git a/clients/src/main/resources/common/message/GetReplicaLogInfoResponse.json b/clients/src/main/resources/common/message/GetReplicaLogInfoResponse.json
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 {
-  "apiKey":83,
+  "apiKey":91,
   "type": "response",
   "name": "GetReplicaLogInfoResponse",
   "validVersions": "0",

diff --git a/core/src/main/scala/kafka/network/RequestConvertToJson.scala b/core/src/main/scala/kafka/network/RequestConvertToJson.scala