Skip to content

GH-2377: Add DestinationTopic.Properties#isRetryTopic() #2589

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
merged 4 commits into from
Feb 27, 2023
Merged

GH-2377: Add DestinationTopic.Properties#isRetryTopic() #2589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ed92c0
GH-2377: Feature Request: Provide DestinationTopic.Properties#isRetry…
Feb 17, 2023
0a19913
GH-2377: Provide DestinationTopic.Properties#isRetryTopic() method
Feb 17, 2023
7db5e86
Merge remote-tracking branch 'origin/GH-2377' into GH-2377
Feb 17, 2023
d68d753
Fix to align with code style
Feb 24, 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
6 changes: 5 additions & 1 deletion spring-kafka/src/main/java/org/springframework/kafka/retrytopic/DestinationTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2022 the original author or authors.
* Copyright 2018-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -212,6 +212,10 @@ public boolean isDltTopic() {
return Type.DLT.equals(this.type);
}

public boolean isRetryTopic() {
return Type.RETRY.equals(this.type) || Type.SINGLE_TOPIC_RETRY.equals(this.type);
}

public String suffix() {
return this.suffix;
}
Expand Down
8 changes: 7 additions & 1 deletion ...est/java/org/springframework/kafka/retrytopic/DestinationTopicPropertiesFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2018-2021 the original author or authors.
* Copyright 2018-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -96,6 +96,7 @@ void shouldCreateMainAndDltProperties() {
DestinationTopic.Properties mainTopicProperties = propertiesList.get(0);
assertThat(mainTopicProperties.suffix()).isEqualTo("");
assertThat(mainTopicProperties.isDltTopic()).isFalse();
assertThat(mainTopicProperties.isRetryTopic()).isFalse();
DestinationTopic mainTopic = new DestinationTopic("mainTopic", mainTopicProperties);
assertThat(mainTopic.getDestinationDelay()).isEqualTo(0L);
assertThat(mainTopic.shouldRetryOn(0, new IllegalArgumentException())).isTrue();
Expand All @@ -110,6 +111,7 @@ void shouldCreateMainAndDltProperties() {
private void assertDltTopic(DestinationTopic.Properties dltProperties) {
assertThat(dltProperties.suffix()).isEqualTo(dltSuffix);
assertThat(dltProperties.isDltTopic()).isTrue();
assertThat(dltProperties.isRetryTopic()).isFalse();
DestinationTopic dltTopic = new DestinationTopic("mainTopic", dltProperties);
assertThat(dltTopic.getDestinationDelay()).isEqualTo(0);
assertThat(dltTopic.shouldRetryOn(0, new IllegalArgumentException())).isFalse();
Expand Down Expand Up @@ -144,6 +146,7 @@ void shouldCreateTwoRetryPropertiesForMultipleBackoffValues() {
DestinationTopic.Properties firstRetryProperties = propertiesList.get(1);
assertThat(firstRetryProperties.suffix()).isEqualTo(retryTopicSuffix + "-1000");
assertThat(firstRetryProperties.isDltTopic()).isFalse();
assertThat(firstRetryProperties.isRetryTopic()).isTrue();
DestinationTopic firstRetryDestinationTopic = destinationTopicList.get(1);
assertThat(firstRetryDestinationTopic.getDestinationDelay()).isEqualTo(1000);
assertThat(firstRetryDestinationTopic.getDestinationPartitions()).isEqualTo(numPartitions);
Expand All @@ -154,6 +157,7 @@ void shouldCreateTwoRetryPropertiesForMultipleBackoffValues() {
DestinationTopic.Properties secondRetryProperties = propertiesList.get(2);
assertThat(secondRetryProperties.suffix()).isEqualTo(retryTopicSuffix + "-2000");
assertThat(secondRetryProperties.isDltTopic()).isFalse();
assertThat(secondRetryProperties.isRetryTopic()).isTrue();
DestinationTopic secondRetryDestinationTopic = destinationTopicList.get(2);
assertThat(secondRetryDestinationTopic.getDestinationDelay()).isEqualTo(2000);
assertThat(secondRetryDestinationTopic.getDestinationPartitions()).isEqualTo(numPartitions);
Expand Down Expand Up @@ -219,6 +223,7 @@ void shouldCreateOneRetryPropertyForFixedBackoffWithSingleTopicStrategy() {

DestinationTopic.Properties firstRetryProperties = propertiesList.get(1);
assertThat(firstRetryProperties.suffix()).isEqualTo(retryTopicSuffix);
assertThat(firstRetryProperties.isRetryTopic()).isTrue();
DestinationTopic retryDestinationTopic = destinationTopicList.get(1);
assertThat(retryDestinationTopic.isSingleTopicRetry()).isTrue();
assertThat(retryDestinationTopic.getDestinationDelay()).isEqualTo(1000);
Expand Down Expand Up @@ -261,6 +266,7 @@ void shouldCreateRetryPropertiesForFixedBackoffWithMultiTopicStrategy() {

DestinationTopic.Properties firstRetryProperties = propertiesList.get(1);
assertThat(firstRetryProperties.suffix()).isEqualTo(retryTopicSuffix + "-0");
assertThat(firstRetryProperties.isRetryTopic()).isTrue();
DestinationTopic retryDestinationTopic = destinationTopicList.get(1);
assertThat(retryDestinationTopic.isSingleTopicRetry()).isFalse();
assertThat(retryDestinationTopic.getDestinationDelay()).isEqualTo(5000);
Expand Down