Merge branch 'main' into feature/search_acl

Author: polegkashti

.github/workflows/backend_tests.yml

@@ -34,4 +34,4 @@ jobs:
 
       - name: "Tests"
         run: |
-          ./gradlew :api:test --info
+          ./gradlew :api:test

api/build.gradle

@@ -61,6 +61,7 @@ dependencies {
     implementation libs.json.smart
     implementation libs.netty.common
     implementation libs.netty.handler
+    implementation libs.spring.context
 
     implementation libs.modelcontextprotocol.spring.webflux
     implementation libs.victools.jsonschema.generator
@@ -106,11 +107,14 @@ generateGrammarSource {
     arguments += ["-package", "ksql"]
 }
 
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
+}
+
+
+
 sourceSets {
     main {
-        antlr {
-            srcDirs = ["src/main/antlr4"]
-        }
         java {
             srcDirs += generateGrammarSource.outputDirectory
         }

api/src/main/antlr4/ksql/KsqlGrammar.g4 renamed to api/src/main/antlr/ksql/KsqlGrammar.g4

@@ -5,7 +5,6 @@
 import io.kafbat.ui.service.mcp.McpTool;
 import io.modelcontextprotocol.server.McpAsyncServer;
 import io.modelcontextprotocol.server.McpServer;
-import io.modelcontextprotocol.server.McpServerFeatures.AsyncPromptSpecification;
 import io.modelcontextprotocol.server.McpServerFeatures.AsyncToolSpecification;
 import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
 import io.modelcontextprotocol.spec.McpSchema;

api/src/main/java/io/kafbat/ui/config/McpConfig.java

@@ -21,6 +21,8 @@ protected AbstractAuthSecurityConfig() {
       "/manifest.json",
       "/favicon.svg",
       "/favicon/**",
+      "/images/**",
+      "/fonts/**",
 
       "/static/**",
       "/resources/**",

api/src/main/java/io/kafbat/ui/config/auth/AbstractAuthSecurityConfig.java

@@ -5,10 +5,9 @@
 
 import io.kafbat.ui.api.ApplicationConfigApi;
 import io.kafbat.ui.config.ClustersProperties;
-import io.kafbat.ui.model.ActionDTO;
+import io.kafbat.ui.mapper.DynamicConfigMapper;
 import io.kafbat.ui.model.AppAuthenticationSettingsDTO;
 import io.kafbat.ui.model.ApplicationConfigDTO;
-import io.kafbat.ui.model.ApplicationConfigPropertiesDTO;
 import io.kafbat.ui.model.ApplicationConfigValidationDTO;
 import io.kafbat.ui.model.ApplicationInfoDTO;
 import io.kafbat.ui.model.ClusterConfigValidationDTO;
@@ -20,12 +19,9 @@
 import io.kafbat.ui.util.ApplicationRestarter;
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.util.Map;
-import java.util.Optional;
 import javax.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.http.codec.multipart.Part;
@@ -41,26 +37,11 @@
 @RequiredArgsConstructor
 public class ApplicationConfigController extends AbstractController implements ApplicationConfigApi {
 
-  private static final PropertiesMapper MAPPER = Mappers.getMapper(PropertiesMapper.class);
-
-  @Mapper
-  interface PropertiesMapper {
-
-    DynamicConfigOperations.PropertiesStructure fromDto(ApplicationConfigPropertiesDTO dto);
-
-    ApplicationConfigPropertiesDTO toDto(DynamicConfigOperations.PropertiesStructure propertiesStructure);
-
-    default ActionDTO stringToActionDto(String str) {
-      return Optional.ofNullable(str)
-          .map(s -> Enum.valueOf(ActionDTO.class, s.toUpperCase()))
-          .orElseThrow();
-    }
-  }
-
   private final DynamicConfigOperations dynamicConfigOperations;
   private final ApplicationRestarter restarter;
   private final KafkaClusterFactory kafkaClusterFactory;
   private final ApplicationInfoService applicationInfoService;
+  private final DynamicConfigMapper configMapper;
 
   @Override
   public Mono<ResponseEntity<ApplicationInfoDTO>> getApplicationInfo(ServerWebExchange exchange) {
@@ -83,7 +64,7 @@ public Mono<ResponseEntity<ApplicationConfigDTO>> getCurrentConfig(ServerWebExch
     return validateAccess(context)
         .then(Mono.fromSupplier(() -> ResponseEntity.ok(
             new ApplicationConfigDTO()
-                .properties(MAPPER.toDto(dynamicConfigOperations.getCurrentProperties()))
+                .properties(configMapper.toDto(dynamicConfigOperations.getCurrentProperties()))
         )))
         .doOnEach(sig -> audit(context, sig));
   }
@@ -98,7 +79,7 @@ public Mono<ResponseEntity<Void>> restartWithConfig(Mono<RestartRequestDTO> rest
     return validateAccess(context)
         .then(restartRequestDto)
         .doOnNext(restartDto -> {
-          var newConfig = MAPPER.fromDto(restartDto.getConfig().getProperties());
+          var newConfig = configMapper.fromDto(restartDto.getConfig().getProperties());
           dynamicConfigOperations.persist(newConfig);
         })
         .doOnEach(sig -> audit(context, sig))
@@ -132,7 +113,7 @@ public Mono<ResponseEntity<ApplicationConfigValidationDTO>> validateConfig(Mono<
     return validateAccess(context)
         .then(configDto)
         .flatMap(config -> {
-          DynamicConfigOperations.PropertiesStructure newConfig = MAPPER.fromDto(config.getProperties());
+          DynamicConfigOperations.PropertiesStructure newConfig = configMapper.fromDto(config.getProperties());
           ClustersProperties clustersProperties = newConfig.getKafka();
           return validateClustersConfig(clustersProperties)
               .map(validations -> new ApplicationConfigValidationDTO().clusters(validations));

api/src/main/java/io/kafbat/ui/controller/ApplicationConfigController.java

@@ -45,23 +45,22 @@ public Mono<ResponseEntity<AuthenticationInfoDTO>> getUserAuthInfo(ServerWebExch
         .map(SecurityContext::getAuthentication)
         .map(Principal::getName);
 
-    var builder = AuthenticationInfoDTO.builder()
+    var builder = new AuthenticationInfoDTO()
         .rbacEnabled(accessControlService.isRbacEnabled());
 
     return userName
         .zipWith(permissions)
         .map(data -> (AuthenticationInfoDTO) builder
             .userInfo(new UserInfoDTO(data.getT1(), data.getT2()))
-            .build()
         )
-        .switchIfEmpty(Mono.just(builder.build()))
+        .switchIfEmpty(Mono.just(builder))
         .map(ResponseEntity::ok);
   }
 
   private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, List<String> clusters) {
     return permissions
         .stream()
-        .map(permission -> (UserPermissionDTO) UserPermissionDTO.builder()
+        .map(permission ->  new UserPermissionDTO()
             .clusters(clusters)
             .resource(ResourceTypeDTO.fromValue(permission.getResource().toString().toUpperCase()))
             .value(permission.getValue())
@@ -71,7 +70,6 @@ private List<UserPermissionDTO> mapPermissions(List<Permission> permissions, Lis
                 .map(this::mapAction)
                 .filter(Objects::nonNull)
                 .toList())
-            .build()
         )
         .toList();
   }

api/src/main/java/io/kafbat/ui/controller/AuthorizationController.java

@@ -191,11 +191,7 @@ public Mono<ResponseEntity<Void>> updateConnectorState(String clusterName, Strin
                                                          ConnectorActionDTO action,
                                                          ServerWebExchange exchange) {
     ConnectAction[] connectActions;
-    if (RESTART_ACTIONS.contains(action)) {
-      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.RESTART};
-    } else {
-      connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.EDIT};
-    }
+    connectActions = new ConnectAction[] {ConnectAction.VIEW, ConnectAction.OPERATE};
 
     var context = AccessContext.builder()
         .cluster(clusterName)
@@ -237,7 +233,7 @@ public Mono<ResponseEntity<Void>> restartConnectorTask(String clusterName, Strin
 
     var context = AccessContext.builder()
         .cluster(clusterName)
-        .connectActions(connectName, ConnectAction.VIEW, ConnectAction.RESTART)
+        .connectActions(connectName, ConnectAction.VIEW, ConnectAction.OPERATE)
         .operationName("restartConnectorTask")
         .operationParams(Map.of(CONNECTOR_NAME, connectorName))
         .build();

api/src/main/java/io/kafbat/ui/controller/KafkaConnectController.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/exception/GlobalErrorWebExceptionHandler.java

@@ -49,8 +49,10 @@
 @Mapper(componentModel = "spring")
 public interface ClusterMapper {
 
+  @Mapping(target = "defaultCluster", ignore = true)
   ClusterDTO toCluster(InternalClusterState clusterState);
 
+  @Mapping(target = "zooKeeperStatus", ignore = true)
   ClusterStatsDTO toClusterStats(InternalClusterState clusterState);
 
   default ClusterMetricsDTO toClusterMetrics(Metrics metrics) {
@@ -95,6 +97,8 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   BrokerDTO toBrokerDto(InternalBroker broker);
 
+  @Mapping(target = "keySerde", ignore = true)
+  @Mapping(target = "valueSerde", ignore = true)
   TopicDetailsDTO toTopicDetails(InternalTopic topic);
 
   @Mapping(target = "isReadOnly", source = "readOnly")