Skip to content
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

Jump to bottom

Update Pulsar to 3.3.2 #189

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Update Pulsar to 3.3.2 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dccd9f
Update Pulsar to 3.3.2
lhotari Oct 7, 2024
fb53ad9
Fix compilation in test due to Pulsar 3.3.2 update
onobc Oct 15, 2024
108d7ff
Replace order of `given/willAnswer` for spied objects
onobc Oct 16, 2024
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ junit-jupiter = "5.11.0-RC1"
licenser = "0.6.1"
log4j = "2.23.1"
mockito = "5.12.0"
pulsar = "3.3.1"
pulsar = "3.3.2"
rat-gradle = "0.8.0"
reactor = "3.6.9"
slf4j = "2.0.16"
Expand Down
2 changes: 1 addition & 1 deletion .../src/intTest/java/org/apache/pulsar/reactive/client/adapter/SingletonPulsarContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static PulsarClient createPulsarClient() throws PulsarClientException {
}

static DockerImageName getPulsarImage() {
return DockerImageName.parse("apachepulsar/pulsar:3.3.1");
return DockerImageName.parse("apachepulsar/pulsar:3.3.2");
}

}
2 changes: 1 addition & 1 deletion ...g/apache/pulsar/reactive/client/internal/adapter/AdaptedReactiveMessageConsumerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void consumerProperties() throws Exception {
PulsarClientImpl pulsarClient = spy(
(PulsarClientImpl) PulsarClient.builder().serviceUrl("http://dummy").build());
doReturn(CompletableFuture.completedFuture(new PartitionedTopicMetadata())).when(pulsarClient)
.getPartitionedTopicMetadata(anyString(), anyBoolean());
.getPartitionedTopicMetadata(anyString(), anyBoolean(), anyBoolean());

Consumer<String> consumer = mock(Consumer.class);
doReturn(CompletableFuture.completedFuture(null)).when(consumer).closeAsync();
Expand Down
17 changes: 9 additions & 8 deletions ...org/apache/pulsar/reactive/client/internal/adapter/AdaptedReactiveMessageSenderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
Expand Down Expand Up @@ -195,11 +196,11 @@ void sendOnePulsarException() throws Exception {
given(producer.newMessage()).willAnswer((__) -> {
TypedMessageBuilderImpl<String> typedMessageBuilder = spy(
new TypedMessageBuilderImpl<>(producer, Schema.STRING));
given(typedMessageBuilder.sendAsync()).willAnswer((___) -> {
willAnswer((___) -> {
CompletableFuture<MessageId> failed = new CompletableFuture<>();
failed.completeExceptionally(new ProducerQueueIsFullError("Queue is full"));
return failed;
});
}).given(typedMessageBuilder).sendAsync();
return typedMessageBuilder;
});

Expand Down Expand Up @@ -231,7 +232,7 @@ void sendManyStopOnError() throws Exception {
given(producer.newMessage()).willAnswer((__) -> {
TypedMessageBuilderImpl<String> typedMessageBuilder = spy(
new TypedMessageBuilderImpl<>(producer, Schema.STRING));
given(typedMessageBuilder.sendAsync()).willAnswer((___) -> {
willAnswer((___) -> {
if (entryId.get() == 1) {
CompletableFuture<MessageId> failed = new CompletableFuture<>();
failed.completeExceptionally(new ProducerQueueIsFullError("Queue is full"));
Expand All @@ -241,7 +242,7 @@ void sendManyStopOnError() throws Exception {
.newMessageId(1, entryId.incrementAndGet(), 1);
messageIds.add(messageId);
return CompletableFuture.completedFuture(messageId);
});
}).given(typedMessageBuilder).sendAsync();
return typedMessageBuilder;
});

Expand Down Expand Up @@ -279,7 +280,7 @@ void sendMany() throws Exception {
given(producer.newMessage()).willAnswer((__) -> {
TypedMessageBuilderImpl<String> typedMessageBuilder = spy(
new TypedMessageBuilderImpl<>(producer, Schema.STRING));
given(typedMessageBuilder.sendAsync()).willAnswer((___) -> {
willAnswer((___) -> {
if (entryId.get() == 2) {
CompletableFuture<MessageId> failed = new CompletableFuture<>();
failed.completeExceptionally(new ProducerQueueIsFullError("Queue is full"));
Expand All @@ -289,7 +290,7 @@ void sendMany() throws Exception {
.newMessageId(1, entryId.incrementAndGet(), 1);
messageIds.add(messageId);
return CompletableFuture.completedFuture(messageId);
});
}).given(typedMessageBuilder).sendAsync();
return typedMessageBuilder;
});

Expand Down Expand Up @@ -498,7 +499,7 @@ void doTestMaxInFlight(BiFunction<ReactiveMessageSender<String>, Flux<Integer>,
given(producer.newMessage()).willAnswer((__) -> {
TypedMessageBuilderImpl<String> typedMessageBuilder = spy(
new TypedMessageBuilderImpl<>(producer, Schema.STRING));
given(typedMessageBuilder.sendAsync()).willAnswer((___) -> {
willAnswer((___) -> {
CompletableFuture<MessageId> messageSender = new CompletableFuture<>();
finalExecutorService.execute(() -> {
long current = totalRequests.incrementAndGet();
Expand All @@ -512,7 +513,7 @@ void doTestMaxInFlight(BiFunction<ReactiveMessageSender<String>, Flux<Integer>,
DefaultImplementation.getDefaultImplementation().newMessageId(1, encodedEntryId, 1));
}, 100, TimeUnit.MILLISECONDS);
return messageSender;
});
}).given(typedMessageBuilder).sendAsync();
return typedMessageBuilder;
});

Expand Down
4 changes: 2 additions & 2 deletions scripts/validate_staging_repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if ! command -v gradle &>/dev/null; then
fi

DOCKER_CONTAINER_NAME=pulsar-standalone-$$
: ${DOCKER_IMAGE_NAME:=apachepulsar/pulsar:3.3.1}
: ${DOCKER_IMAGE_NAME:=apachepulsar/pulsar:3.3.2}

mkdir test-app-reactive-$$
cd test-app-reactive-$$
Expand Down Expand Up @@ -90,7 +90,7 @@ public class HelloPulsarClientReactive {

public static void main(String[] args) throws PulsarClientException, InterruptedException {
// Before running this, start Pulsar within docker with this command:
// docker run -it -p 8080:8080 -p 6650:6650 apachepulsar/pulsar:3.3.1 /pulsar/bin/pulsar standalone -nss -nfw
// docker run -it -p 8080:8080 -p 6650:6650 apachepulsar/pulsar:3.3.2 /pulsar/bin/pulsar standalone -nss -nfw

try (PulsarClient pulsarClient = PulsarClient.builder().serviceUrl("pulsar://localhost:6650").build()) {

Expand Down