Skip to content

Commit 3d89db7

Browse files
committed
KAFKA-16907: Resolve the ClassDataAbstractionCoupling and ClassFanOutComplexity issue caused by RaftUtils
1 parent c2f53a9 commit 3d89db7

18 files changed

+1003
-851
lines changed

raft/src/main/java/org/apache/kafka/raft/KafkaNetworkChannel.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.kafka.common.requests.FetchSnapshotRequest;
3636
import org.apache.kafka.common.requests.VoteRequest;
3737
import org.apache.kafka.common.utils.Time;
38+
import org.apache.kafka.raft.utils.ApiMessageUtils;
3839
import org.apache.kafka.server.util.InterBrokerSendThread;
3940
import org.apache.kafka.server.util.RequestAndCompletionHandler;
4041

@@ -152,7 +153,7 @@ private void sendOnComplete(RaftRequest.Outbound request, ClientResponse clientR
152153

153154
private ApiMessage errorResponse(ApiMessage request, Errors error) {
154155
ApiKeys apiKey = ApiKeys.forId(request.apiKey());
155-
return RaftUtil.errorResponse(apiKey, error);
156+
return ApiMessageUtils.parseErrorResponse(apiKey, error);
156157
}
157158

158159
@Override

raft/src/main/java/org/apache/kafka/raft/KafkaRaftClient.java

+43-39
Large diffs are not rendered by default.

raft/src/main/java/org/apache/kafka/raft/LeaderState.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.kafka.raft.internals.ReplicaKey;
3535
import org.apache.kafka.raft.internals.UpdateVoterHandlerState;
3636
import org.apache.kafka.raft.internals.VoterSet;
37+
import org.apache.kafka.raft.utils.VoteRpc;
3738
import org.apache.kafka.server.common.KRaftVersion;
3839

3940
import org.slf4j.Logger;
@@ -225,7 +226,7 @@ public void resetAddVoterHandlerState(
225226
addVoterHandlerState.ifPresent(
226227
handlerState -> handlerState
227228
.future()
228-
.complete(RaftUtil.addVoterResponse(error, message))
229+
.complete(VoteRpc.addVoterResponse(error, message))
229230
);
230231
addVoterHandlerState = state;
231232
}
@@ -242,7 +243,7 @@ public void resetRemoveVoterHandlerState(
242243
removeVoterHandlerState.ifPresent(
243244
handlerState -> handlerState
244245
.future()
245-
.complete(RaftUtil.removeVoterResponse(error, message))
246+
.complete(VoteRpc.removeVoterResponse(error, message))
246247
);
247248
removeVoterHandlerState = state;
248249
}
@@ -719,7 +720,7 @@ private void updateVoterAndObserverStates(VoterSet lastVoterSet) {
719720
}
720721
}
721722

722-
static class ReplicaState implements Comparable<ReplicaState> {
723+
public static class ReplicaState implements Comparable<ReplicaState> {
723724
private ReplicaKey replicaKey;
724725
private Endpoints listeners;
725726
private Optional<LogOffsetMetadata> endOffset;

0 commit comments

Comments
 (0)