Skip to content

SAMZA-2776: Fix unused parameter - EventHubSystemConsumer #1670

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
atoomula merged 1 commit into from
Jun 14, 2023
Merged

SAMZA-2776: Fix unused parameter - EventHubSystemConsumer #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions ...azure/src/main/java/org/apache/samza/system/eventhub/consumer/EventHubSystemConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,10 @@ private synchronized void initializeEventHubsManagers() {
// If no such offset exists Eventhub will return an error.
ReceiverOptions receiverOptions = new ReceiverOptions();
receiverOptions.setPrefetchCount(prefetchCount);
EventPosition position = EventPosition.fromOffset(offset, /* inclusiveFlag */false);
receiver = eventHubClientManager.getEventHubClient()
.createReceiver(consumerGroup, partitionId.toString(),
EventPosition.fromOffset(offset, /* inclusiveFlag */false)).get(DEFAULT_EVENTHUB_CREATE_RECEIVER_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
.createReceiver(consumerGroup, partitionId.toString(), position, receiverOptions)
.get(DEFAULT_EVENTHUB_CREATE_RECEIVER_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
}

PartitionReceiveHandler handler =
Expand Down Expand Up @@ -378,9 +379,9 @@ private void renewPartitionReceiver(SystemStreamPartition ssp) {
// Recreate receiver
ReceiverOptions receiverOptions = new ReceiverOptions();
receiverOptions.setPrefetchCount(prefetchCount);
EventPosition position = EventPosition.fromOffset(offset, !offset.equals(EventHubSystemConsumer.START_OF_STREAM));
PartitionReceiver receiver = eventHubClientManager.getEventHubClient()
.createReceiverSync(consumerGroup, partitionId.toString(),
EventPosition.fromOffset(offset, !offset.equals(EventHubSystemConsumer.START_OF_STREAM)), receiverOptions);
.createReceiverSync(consumerGroup, partitionId.toString(), position, receiverOptions);

// Timeout for EventHubClient receive
receiver.setReceiveTimeout(DEFAULT_EVENTHUB_RECEIVER_TIMEOUT);
Expand Down
2 changes: 1 addition & 1 deletion ...zure/src/test/java/org/apache/samza/system/eventhub/MockEventHubClientManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private class MockEventHubClientManager implements EventHubClientManager {
return CompletableFuture.completedFuture(mockPartitionReceiver);
});

PowerMockito.when(mockEventHubClient.createReceiver(anyString(), anyString(), anyObject()))
PowerMockito.when(mockEventHubClient.createReceiver(anyString(), anyString(), anyObject(), anyObject()))
.then((Answer<CompletableFuture<PartitionReceiver>>) invocationOnMock -> {
String partitionId = invocationOnMock.getArgumentAt(1, String.class);
EventPosition offset = invocationOnMock.getArgumentAt(2, EventPosition.class);
Expand Down