Skip to content

[Studio] Normalize consumer diagnostics inputs #571

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

Closed
Aias00 wants to merge 1 commit into from
Closed

[Studio] Normalize consumer diagnostics inputs #571

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
15 changes: 9 additions & 6 deletions server/src/main/java/com/rocketmq/studio/instance/group/ConsumerDiagnosticsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ public class ConsumerDiagnosticsService {
private final ConsumerDiagnosticsProvider diagnosticsProvider;

public ConsumerStackTraceVO getConsumerStack(String groupName, String clientId) {
if (!StringUtils.hasText(groupName)) {
throw new BusinessException(HttpStatus.BAD_REQUEST.value(), "groupName is required");
}
if (!StringUtils.hasText(clientId)) {
throw new BusinessException(HttpStatus.BAD_REQUEST.value(), "clientId is required");
String normalizedGroupName = normalizeRequired(groupName, "groupName");
String normalizedClientId = normalizeRequired(clientId, "clientId");
return diagnosticsProvider.getConsumerStack(normalizedGroupName, normalizedClientId);
}

private String normalizeRequired(String value, String fieldName) {
if (!StringUtils.hasText(value)) {
throw new BusinessException(HttpStatus.BAD_REQUEST.value(), fieldName + " is required");
}
return diagnosticsProvider.getConsumerStack(groupName, clientId);
return value.trim();
}
}
18 changes: 18 additions & 0 deletions server/src/test/java/com/rocketmq/studio/instance/group/ConsumerDiagnosticsServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,24 @@ void getConsumerStackShouldDelegateToProvider() {
verify(diagnosticsProvider).getConsumerStack("cg-orders", "client-1");
}

@Test
void getConsumerStackShouldTrimInputsBeforeDelegatingToProvider() {
ConsumerStackTraceVO stackTrace = ConsumerStackTraceVO.builder()
.groupName("cg-orders")
.clientId("client-1")
.capturedAt(LocalDateTime.now())
.threadCount(0)
.threads(List.of())
.build();
when(diagnosticsProvider.getConsumerStack("cg-orders", "client-1")).thenReturn(stackTrace);

ConsumerStackTraceVO result = diagnosticsService.getConsumerStack(" cg-orders ", " client-1 ");

assertThat(result.getGroupName()).isEqualTo("cg-orders");
assertThat(result.getClientId()).isEqualTo("client-1");
verify(diagnosticsProvider).getConsumerStack("cg-orders", "client-1");
}

@Test
void getConsumerStackShouldRejectBlankGroupName() {
assertThatThrownBy(() -> diagnosticsService.getConsumerStack(" ", "client-1"))
Expand Down
Loading