fixes

Author: germanosin

api/src/main/java/io/kafbat/ui/exception/GlobalErrorWebExceptionHandler.java

@@ -161,6 +161,7 @@ private String extractFieldErrorMsg(FieldError fieldError) {
     return coalesce(fieldError.getDefaultMessage(), fieldError.getCode(), "Invalid field value");
   }
 
+  @SafeVarargs
   private <T> T coalesce(T... items) {
     return Stream.of(items).filter(Objects::nonNull).findFirst().orElse(null);
   }

api/src/main/java/io/kafbat/ui/mapper/DynamicConfigMapper.java

@@ -5,18 +5,18 @@
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerJwtDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerOpaquetokenDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesDTO;
+import io.kafbat.ui.model.ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO;
+import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.util.Optional;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
 @Mapper(componentModel = "spring")
 public interface DynamicConfigMapper {
 
-  @Mapping(target = "rbac.roles[].permissions[].parsedActions", ignore = true)
   DynamicConfigOperations.PropertiesStructure fromDto(ApplicationConfigPropertiesDTO dto);
 
   ApplicationConfigPropertiesDTO toDto(DynamicConfigOperations.PropertiesStructure propertiesStructure);
@@ -25,6 +25,14 @@ default String map(Resource resource) {
     return resource.getFilename();
   }
 
+  default Permission map(ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO perm) {
+    Permission permission = new Permission();
+    permission.setResource(perm.getResource().getValue());
+    permission.setActions(perm.getActions().stream().map(ActionDTO::getValue).toList());
+    permission.setValue(perm.getValue());
+    return permission;
+  }
+
   default OAuth2ResourceServerProperties map(ApplicationConfigPropertiesAuthOauth2ResourceServerDTO value) {
     if (value != null) {
       OAuth2ResourceServerProperties result = new OAuth2ResourceServerProperties();

api/src/main/java/io/kafbat/ui/util/DynamicConfigOperations.java

@@ -206,11 +206,15 @@ protected NodeTuple representJavaBeanProperty(Object javaBean,
     representer.setPropertyUtils(propertyUtils);
     representer.addClassTag(PropertiesStructure.class, Tag.MAP); //to avoid adding class tag
     representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); //use indent instead of {}
-    return new Yaml(
-        new Constructor(new LoaderOptions()),
-        representer,
-        new DumperOptions()
-    ).dump(props);
+
+    DumperOptions dumperOptions = new DumperOptions();
+    dumperOptions.setDefaultFlowStyle(representer.getDefaultFlowStyle());
+    dumperOptions.setDefaultScalarStyle(representer.getDefaultScalarStyle());
+    dumperOptions
+        .setAllowReadOnlyProperties(representer.getPropertyUtils().isAllowReadOnlyProperties());
+    dumperOptions.setTimeZone(representer.getTimeZone());
+
+    return new Yaml(representer, dumperOptions).dump(props);
   }
 
   ///---------------------------------------------------------------------

api/src/test/java/io/kafbat/ui/service/quota/ClientQuotaServiceTest.java

@@ -1,12 +1,15 @@
 package io.kafbat.ui.service.quota;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
 
 import io.kafbat.ui.AbstractIntegrationTest;
 import io.kafbat.ui.model.KafkaCluster;
 import io.kafbat.ui.service.ClustersStorage;
 import java.util.Map;
-import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import org.assertj.core.api.ListAssert;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -48,8 +51,9 @@ void createUpdateDelete(String user, String clientId, String ip) {
         .assertNext(status -> assertThat(status.value()).isEqualTo(201))
         .verifyComplete();
 
-    assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, initialQuotas)))
-        .isTrue();
+    awaitAndVerify((l) ->
+        l.contains(new ClientQuotaRecord(user, clientId, ip, initialQuotas))
+    );
 
     //updating
     StepVerifier.create(
@@ -58,8 +62,9 @@ void createUpdateDelete(String user, String clientId, String ip) {
         .assertNext(status -> assertThat(status.value()).isEqualTo(200))
         .verifyComplete();
 
-    assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0))))
-        .isTrue();
+    awaitAndVerify((l) ->
+        l.contains(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0)))
+    );
 
     //deleting created record
     StepVerifier.create(
@@ -68,12 +73,16 @@ void createUpdateDelete(String user, String clientId, String ip) {
         .assertNext(status -> assertThat(status.value()).isEqualTo(204))
         .verifyComplete();
 
-    assertThat(quotaRecordExists(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0))))
-        .isFalse();
+    awaitAndVerify((l) ->
+        l.doesNotContain(new ClientQuotaRecord(user, clientId, ip, Map.of("producer_byte_rate", 22222.0)))
+    );
   }
 
-  private boolean quotaRecordExists(ClientQuotaRecord rec) {
-    return Objects.requireNonNull(quotaService.getAll(cluster).collectList().block()).contains(rec);
+  private void awaitAndVerify(Consumer<ListAssert<ClientQuotaRecord>> verifier) {
+    await()
+        .atMost(5, TimeUnit.SECONDS)
+        .pollInterval(200, TimeUnit.MILLISECONDS)
+        .untilAsserted(() -> verifier.accept(assertThat(quotaService.getAll(cluster).collectList().block())));
   }
 
 }

contract/build.gradle

@@ -9,10 +9,6 @@ plugins {
 def specDir = project.layout.projectDirectory.dir("src/main/resources/swagger/")
 def targetDir = project.layout.buildDirectory.dir("generated").get()
 
-tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
-}
-
 dependencies {
     implementation libs.spring.starter.webflux
     implementation libs.spring.starter.validation