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

added methods in base actor #76

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

added methods in base actor #76

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
825dd99
added methods in base actor
Feb 9, 2024
cf5f9ba
added test
Feb 14, 2024
477df10
addressed comment
Feb 19, 2024
eeb1982
added properties fix
Feb 22, 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
6 changes: 6 additions & 0 deletions src/main/java/io/appform/dropwizard/actors/actor/BaseActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ public final void publishWithExpiry(final Message message, final long expiryInMs
actorImpl.publishWithExpiry(message, expiryInMs);
}

public final void publishWithDelayAndExpiry(final Message message,
r0goyal marked this conversation as resolved.
Show resolved Hide resolved
final long expiryInMs,
final long delayMilliseconds) throws Exception {
actorImpl.publishWithDelayAndExpiry(message, expiryInMs, delayMilliseconds);
}

public final void publish(final Message message) throws Exception {
val properties = new AMQP.BasicProperties.Builder()
.deliveryMode(2)
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/appform/dropwizard/actors/actor/UnmanagedBaseActor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ public final void publishWithExpiry(final Message message, final long expiryInMs
publishActor().publishWithExpiry(message, expiryInMs);
}

public final void publishWithDelayAndExpiry(final Message message,
final long expiryInMs,
final long delayMilliseconds) throws Exception {
publishActor().publishWithDelayAndExpiry(message, expiryInMs, delayMilliseconds);
}

public final void publish(final Message message) throws Exception {
publishActor().publish(message);
}
Expand Down
43 changes: 43 additions & 0 deletions src/test/java/io/appform/dropwizard/actors/connectivity/actor/ExpiryMessagesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
Expand Down Expand Up @@ -342,6 +343,35 @@ private MessageHandlingFunction<Map, Boolean> handleExpectedMessageForReDelivery
};
}

@Test
public void testPublishWithExpiryAndDelay() throws Exception {
val queueName = "queue-1";
val objectMapper = new ObjectMapper();
val actorConfig = new ActorConfig();
actorConfig.setExchange("test-exchange-delay");
val publisher = new UnmanagedPublisher<>(
queueName, actorConfig, connection, objectMapper);
publisher.start();

val message = ImmutableMap.of(
"key", "test"
);
publisher.publishWithDelayAndExpiry(message, 1500, 500);

Thread.sleep(1510);


val expiredDeliveryCount = new AtomicInteger();
val consumer = new UnmanagedConsumer<>(
queueName, actorConfig, connection, objectMapper, new RetryStrategyFactory(), new ExceptionHandlingFactory(),
Map.class, this::handleForNoExpectedMsg, handleExpiredMessageWithDelay(expiredDeliveryCount), (x) -> true);
consumer.start();

Thread.sleep(1000);

Assertions.assertEquals(1, expiredDeliveryCount.getAndIncrement());
}

@NotNull
private MessageHandlingFunction<Map, Boolean> handleExpiredMessage(AtomicInteger expiredDeliveryCount) {
return (msg, meta) -> {
Expand All @@ -352,6 +382,19 @@ private MessageHandlingFunction<Map, Boolean> handleExpiredMessage(AtomicInteger
};
}

@NotNull
private MessageHandlingFunction<Map, Boolean> handleExpiredMessageWithDelay(AtomicInteger expiredDeliveryCount) {
return (msg, meta) -> {
log.info("Meta::{}", meta);
r0goyal marked this conversation as resolved.
Show resolved Hide resolved
Assertions.assertTrue(meta.getDelayInMs() > 1500);
Map<String, Object> msgHeaders = meta.getHeaders();
Assertions.assertNotNull(msgHeaders);
Assertions.assertTrue(StringUtils.equals("500", String.valueOf(msgHeaders.get("x-delay"))));
expiredDeliveryCount.getAndIncrement();
return true;
};
}

@NotNull
private MessageHandlingFunction<Map, Boolean> handleDelayedMessageConsumption(AtomicInteger normalDeliveryCount) {
return (msg, meta) -> {
Expand Down