Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ public class TopicValidator {
private static final int GROUP_MAX_LENGTH = 120;
private static final int RETRY_OR_DLQ_TOPIC_MAX_LENGTH = 255;

private static volatile int groupMaxLength = GROUP_MAX_LENGTH;

private static final Set<String> SYSTEM_TOPIC_SET = new HashSet<>();

/**
Expand Down Expand Up @@ -139,6 +141,11 @@ public static ValidateResult validateTopic(String topic) {
return new ValidateResult(true, "");
}

public static void setGroupMaxLength(int maxLength) {
groupMaxLength = maxLength <= 0 ? GROUP_MAX_LENGTH
: Math.min(maxLength, RETRY_OR_DLQ_TOPIC_MAX_LENGTH);
}

public static ValidateResult validateGroup(String group) {

if (UtilAll.isBlank(group)) {
Expand All @@ -150,8 +157,8 @@ public static ValidateResult validateGroup(String group) {
return new ValidateResult(false, falseRemark);
}

if (group.length() > GROUP_MAX_LENGTH) {
String falseRemark = "The specified group: " + group + ", is longer than group max length: " + GROUP_MAX_LENGTH;
if (group.length() > groupMaxLength) {
String falseRemark = "The specified group: " + group + ", is longer than group max length: " + groupMaxLength;
return new ValidateResult(false, falseRemark);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,27 @@ public void testGroupValidator__NotPass() {
assertThat(res.isValid()).isFalse();
}

@Test
public void testGroupValidator_WithCustomMaxLength() {
try {
TopicValidator.setGroupMaxLength(255);
assertThat(TopicValidator.validateGroup(generateString2(255)).isValid()).isTrue();
assertThat(TopicValidator.validateGroup(generateString2(256)).isValid()).isFalse();

// values above 255 are capped at 255
TopicValidator.setGroupMaxLength(300);
assertThat(TopicValidator.validateGroup(generateString2(255)).isValid()).isTrue();
assertThat(TopicValidator.validateGroup(generateString2(256)).isValid()).isFalse();

// non-positive values fall back to the default of 120
TopicValidator.setGroupMaxLength(0);
assertThat(TopicValidator.validateGroup(generateString2(120)).isValid()).isTrue();
assertThat(TopicValidator.validateGroup(generateString2(121)).isValid()).isFalse();
} finally {
TopicValidator.setGroupMaxLength(120);
}
}

@Test
public void testAddSystemTopic() {
String topic = "SYSTEM_TOPIC_TEST";
Expand Down
Loading