0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip

Browse source
This commit is contained in:
iliax 2023-08-13 14:33:21 +04:00
parent 1336ec33cb
commit 26c21f733d
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/ClientQuotasController.java
View file

@ -42,7 +42,7 @@ public class ClientQuotasController extends AbstractController implements Client
Mono<ResponseEntity<Flux<ClientQuotasDTO>>> operation = Mono<ResponseEntity<Flux<ClientQuotasDTO>>> operation =
Mono.just( Mono.just(
clientQuotaService.list(getCluster(clusterName)) clientQuotaService.getAll(getCluster(clusterName))
.sort(QUOTA_RECORDS_COMPARATOR) .sort(QUOTA_RECORDS_COMPARATOR)
.map(this::mapToDto) .map(this::mapToDto)
).map(ResponseEntity::ok); ).map(ResponseEntity::ok);

2
kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/quota/ClientQuotaService.java
View file

@ -34,7 +34,7 @@ public class ClientQuotaService {
private final AdminClientService adminClientService; private final AdminClientService adminClientService;
public Flux<ClientQuotaRecord> list(KafkaCluster cluster) { public Flux<ClientQuotaRecord> getAll(KafkaCluster cluster) {
return adminClientService.get(cluster) return adminClientService.get(cluster)
.flatMap(ac -> ac.getClientQuotas(ClientQuotaFilter.all())) .flatMap(ac -> ac.getClientQuotas(ClientQuotaFilter.all()))
.flatMapIterable(Map::entrySet) .flatMapIterable(Map::entrySet)

16
kafka-ui-api/src/test/java/com/provectus/kafka/ui/service/quota/ClientQuotaServiceTest.java
View file

@ -34,7 +34,7 @@ class ClientQuotaServiceTest extends AbstractIntegrationTest {
nullValues = "null" nullValues = "null"
) )
void createUpdateDelete(String user, String clientId, String ip) { void createUpdateDelete(String user, String clientId, String ip) {
var quotas = Map.of( var initialQuotas = Map.of(
"producer_byte_rate", 123.0, "producer_byte_rate", 123.0,
"consumer_byte_rate", 234.0, "consumer_byte_rate", 234.0,
"request_percentage", 10.0 "request_percentage", 10.0
@ -42,22 +42,22 @@ class ClientQuotaServiceTest extends AbstractIntegrationTest {
//creating new //creating new
StepVerifier.create( StepVerifier.create(
quotaService.upsert(cluster, user, clientId, ip, quotas) quotaService.upsert(cluster, user, clientId, ip, initialQuotas)
) )
.assertNext(status -> assertThat(status.value()).isEqualTo(201)) .assertNext(status -> assertThat(status.value()).isEqualTo(201))
.verifyComplete(); .verifyComplete();
assertThat(quotaRecordExisits(new ClientQuotaRecord(user, clientId, ip, quotas))) assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, initialQuotas)))
.isTrue(); .isTrue();
//updating //updating
StepVerifier.create( StepVerifier.create(
quotaService.upsert(cluster, user, clientId, ip, Map.of("producer_byte_rate", 111111.0)) quotaService.upsert(cluster, user, clientId, ip, Map.of("producer_byte_rate", 22222.0))
) )
.assertNext(status -> assertThat(status.value()).isEqualTo(200)) .assertNext(status -> assertThat(status.value()).isEqualTo(200))
.verifyComplete(); .verifyComplete();
assertThat(quotaRecordExisits(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 111111.0)))) assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0))))
.isTrue(); .isTrue();
//deleting created record //deleting created record
@ -67,12 +67,12 @@ class ClientQuotaServiceTest extends AbstractIntegrationTest {
.assertNext(status -> assertThat(status.value()).isEqualTo(204)) .assertNext(status -> assertThat(status.value()).isEqualTo(204))
.verifyComplete(); .verifyComplete();
assertThat(quotaRecordExisits(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 111111.0)))) assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0))))
.isFalse(); .isFalse();
} }
private boolean quotaRecordExisits(ClientQuotaRecord rec) { private boolean quotaRecordExists(ClientQuotaRecord rec) {
return quotaService.list(cluster).collectList().block().contains(rec); return quotaService.getAll(cluster).collectList().block().contains(rec);
} }
} }