Synced with main

Author: germanosin

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

@@ -118,6 +118,13 @@ default ConfigSynonymDTO toConfigSynonym(ConfigEntry.ConfigSynonym config) {
 
   ReplicaDTO toReplica(InternalReplica replica);
 
+  @Mapping(target = "connectorsCount", ignore = true)
+  @Mapping(target = "failedConnectorsCount", ignore = true)
+  @Mapping(target = "tasksCount", ignore = true)
+  @Mapping(target = "failedTasksCount", ignore = true)
+  @Mapping(target = "version", ignore = true)
+  @Mapping(target = "commit", ignore = true)
+  @Mapping(target = "clusterId", ignore = true)
   ConnectDTO toKafkaConnect(ClustersProperties.ConnectCluster connect);
 
   List<ClusterDTO.FeaturesEnum> toFeaturesEnum(List<ClusterFeature> features);

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

@@ -2,13 +2,11 @@
 
 import io.kafbat.ui.config.ClustersProperties;
 import io.kafbat.ui.model.ActionDTO;
-import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ClientValueDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerJwtDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesAuthOauth2ResourceServerOpaquetokenDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesDTO;
 import io.kafbat.ui.model.ApplicationConfigPropertiesKafkaClustersInnerDTO;
-import io.kafbat.ui.model.ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO;
 import io.kafbat.ui.model.RbacPermissionDTO;
 import io.kafbat.ui.model.rbac.Permission;
 import io.kafbat.ui.util.DynamicConfigOperations;
@@ -27,17 +25,14 @@ public interface DynamicConfigMapper {
   @Mapping(target = "kafka.clusters[].metrics.store", ignore = true)
   ApplicationConfigPropertiesDTO toDto(DynamicConfigOperations.PropertiesStructure propertiesStructure);
 
-  @Mapping(target = "parsedActions", ignore = true)
-  Permission toPermission(RbacPermissionDTO dto);
-
   default String map(Resource resource) {
     return resource.getFilename();
   }
 
   @Mapping(source = "metrics.store", target = "metrics.store", ignore = true)
   ApplicationConfigPropertiesKafkaClustersInnerDTO map(ClustersProperties.Cluster cluster);
 
-  default Permission map(ApplicationConfigPropertiesRbacRolesInnerPermissionsInnerDTO perm) {
+  default Permission map(RbacPermissionDTO perm) {
     Permission permission = new Permission();
     permission.setResource(perm.getResource().getValue());
     permission.setActions(perm.getActions().stream().map(ActionDTO::getValue).toList());