Skip to content

KAFKA-14133: Migrate topology builder mock in TaskManagerTest to mockito #13529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cadonna merged 2 commits into from
May 2, 2023
Merged

KAFKA-14133: Migrate topology builder mock in TaskManagerTest to mockito #13529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ab86a
KAFKA-14133: Migrate topology builder mock in TaskManagerTest to mockito
cadonna Apr 8, 2023
d2a7f7b
Add stub to avoid mockito error due to strict mock
cadonna Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...s/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2166,7 +2166,7 @@ private boolean hasSubscriptionUpdates() {
return !subscriptionUpdates.isEmpty();
}

synchronized void addSubscribedTopicsFromAssignment(final List<TopicPartition> partitions, final String logPrefix) {
synchronized void addSubscribedTopicsFromAssignment(final Set<TopicPartition> partitions, final String logPrefix) {
if (usesPatternSubscription()) {
final Set<String> assignedTopics = new HashSet<>();
for (final TopicPartition topicPartition : partitions) {
Expand Down
2 changes: 1 addition & 1 deletion streams/src/main/java/org/apache/kafka/streams/processor/internals/TaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ public void handleAssignment(final Map<TaskId, Set<TopicPartition>> activeTasks,
activeTasks.keySet(), standbyTasks.keySet(), activeTaskIds(), standbyTaskIds());

topologyMetadata.addSubscribedTopicsFromAssignment(
activeTasks.values().stream().flatMap(Collection::stream).collect(Collectors.toList()),
activeTasks.values().stream().flatMap(Collection::stream).collect(Collectors.toSet()),
logPrefix
);

Expand Down
2 changes: 1 addition & 1 deletion streams/src/main/java/org/apache/kafka/streams/processor/internals/TopologyMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ void addSubscribedTopicsFromMetadata(final Set<String> topics, final String logP
applyToEachBuilder(b -> b.addSubscribedTopicsFromMetadata(topics, logPrefix));
}

void addSubscribedTopicsFromAssignment(final List<TopicPartition> partitions, final String logPrefix) {
void addSubscribedTopicsFromAssignment(final Set<TopicPartition> partitions, final String logPrefix) {
applyToEachBuilder(b -> b.addSubscribedTopicsFromAssignment(partitions, logPrefix));
}

Expand Down
Loading