Upgrade to Spring Boot 4.x

api/build.gradle

@@ -24,6 +24,11 @@ dependencies {
     implementation libs.spring.starter.logging
     implementation libs.spring.starter.oauth2.client
     implementation libs.spring.security.oauth2.resource.server
+    implementation libs.spring.boot.security.oauth2.resource.server
+    implementation libs.spring.boot.security.oauth2.client
+    implementation libs.spring.boot.webflux
+    implementation libs.spring.boot.web.server
+    implementation libs.spring.boot.ldap
     implementation libs.spring.boot.actuator
 
     compileOnly libs.spring.boot.devtools

api/src/main/java/io/kafbat/ui/KafkaUiApplication.java

@@ -4,7 +4,7 @@
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.security.Security;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
+import org.springframework.boot.ldap.autoconfigure.LdapAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;

api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.unit.DataSize;

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

@@ -13,7 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

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

@@ -5,8 +5,8 @@
 import lombok.AllArgsConstructor;
 import org.openapitools.jackson.nullable.JsonNullableModule;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.web.ServerProperties;
-import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
+import org.springframework.boot.web.server.autoconfigure.ServerProperties;
+import org.springframework.boot.webflux.autoconfigure.WebFluxProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 import lombok.Data;
-import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
+import org.springframework.boot.security.oauth2.server.resource.autoconfigure.OAuth2ResourceServerProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
 

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

@@ -1,14 +1,14 @@
 package io.kafbat.ui.config.auth;
 
-import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Provider;
-import static org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties.Registration;
+import static org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties.Provider;
+import static org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties.Registration;
 
 import java.util.Optional;
 import java.util.Set;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties;
 import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

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

@@ -12,9 +12,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientProperties;
-import org.springframework.boot.autoconfigure.security.oauth2.client.OAuth2ClientPropertiesMapper;
-import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientPropertiesMapper;
+import org.springframework.boot.security.oauth2.server.resource.autoconfigure.OAuth2ResourceServerProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -19,7 +19,7 @@
 import io.kafbat.ui.util.ApplicationRestarter;
 import io.kafbat.ui.util.DynamicConfigOperations;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

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

@@ -15,7 +15,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

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

@@ -14,7 +14,7 @@
 import io.kafbat.ui.service.mcp.McpTool;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

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

@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

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

@@ -29,7 +29,7 @@
 import io.kafbat.ui.service.mcp.McpTool;
 import java.util.List;
 import java.util.Optional;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

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

@@ -26,7 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;

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

@@ -37,7 +37,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

api/src/main/java/io/kafbat/ui/emitter/ConsumingStats.java

@@ -3,7 +3,7 @@
 import io.kafbat.ui.model.TopicMessageConsumingDTO;
 import io.kafbat.ui.model.TopicMessageEventDTO;
 import io.kafbat.ui.model.TopicMessageNextPageCursorDTO;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import reactor.core.publisher.FluxSink;
 
 class ConsumingStats {

api/src/main/java/io/kafbat/ui/emitter/MessageFilters.java

@@ -33,7 +33,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 

api/src/main/java/io/kafbat/ui/emitter/MessagesProcessing.java

@@ -16,7 +16,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;

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

@@ -13,8 +13,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.springframework.boot.autoconfigure.web.WebProperties;
-import org.springframework.boot.autoconfigure.web.reactive.error.AbstractErrorWebExceptionHandler;
-import org.springframework.boot.web.reactive.error.ErrorAttributes;
+import org.springframework.boot.webflux.autoconfigure.error.AbstractErrorWebExceptionHandler;
+import org.springframework.boot.webflux.error.ErrorAttributes;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

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

@@ -13,7 +13,7 @@
 import java.util.Optional;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.springframework.boot.autoconfigure.security.oauth2.resource.OAuth2ResourceServerProperties;
+import org.springframework.boot.security.oauth2.server.resource.autoconfigure.OAuth2ResourceServerProperties;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 

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

@@ -28,7 +28,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 

api/src/main/java/io/kafbat/ui/model/ConsumerPosition.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.apache.kafka.common.TopicPartition;
 
 public record ConsumerPosition(PollingModeDTO pollingMode,

api/src/main/java/io/kafbat/ui/model/InternalBroker.java

@@ -1,7 +1,7 @@
 package io.kafbat.ui.model;
 
 import java.math.BigDecimal;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.Data;
 import org.apache.kafka.common.Node;
 

api/src/main/java/io/kafbat/ui/model/InternalTopic.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.Builder;
 import lombok.Data;
 import org.apache.kafka.clients.admin.ConfigEntry;

api/src/main/java/io/kafbat/ui/model/InternalTopicConsumerGroup.java

@@ -2,7 +2,7 @@
 
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.Builder;
 import lombok.Value;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;

api/src/main/java/io/kafbat/ui/model/PartitionDistributionStats.java

@@ -5,7 +5,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

api/src/main/java/io/kafbat/ui/model/rbac/Permission.java

@@ -7,7 +7,7 @@
 import io.kafbat.ui.model.rbac.permission.PermissibleAction;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;

api/src/main/java/io/kafbat/ui/serdes/ClusterSerdes.java

@@ -7,7 +7,7 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

api/src/main/java/io/kafbat/ui/serdes/ProducerRecordCreator.java

@@ -2,7 +2,7 @@
 
 import io.kafbat.ui.serde.api.Serde;
 import java.util.Map;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.header.Headers;

api/src/main/java/io/kafbat/ui/serdes/PropertyResolverImpl.java

@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.boot.context.properties.source.ConfigurationPropertyName;

api/src/main/java/io/kafbat/ui/serdes/SerdeInstance.java

@@ -6,7 +6,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

api/src/main/java/io/kafbat/ui/serdes/SerdesInitializer.java

@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.env.Environment;

api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java

@@ -61,7 +61,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SystemUtils;

api/src/main/java/io/kafbat/ui/serdes/builtin/sr/SchemaRegistrySerde.java

@@ -34,7 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.SneakyThrows;
 import org.apache.kafka.common.config.SslConfigs;
 

api/src/main/java/io/kafbat/ui/service/ConsumerGroupService.java

@@ -28,7 +28,7 @@
 import java.util.function.ToIntFunction;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import org.apache.kafka.clients.admin.ConsumerGroupDescription;
 import org.apache.kafka.clients.admin.ConsumerGroupListing;

api/src/main/java/io/kafbat/ui/service/DeserializationService.java

@@ -15,8 +15,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
-import javax.validation.ValidationException;
+import jakarta.annotation.Nullable;
+import jakarta.validation.ValidationException;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 

api/src/main/java/io/kafbat/ui/service/KafkaConfigSanitizer.java

@@ -11,7 +11,7 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.config.SaslConfigs;
 import org.apache.kafka.common.config.SslConfigs;

api/src/main/java/io/kafbat/ui/service/KafkaConnectService.java

@@ -36,7 +36,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClientResponseException;

api/src/main/java/io/kafbat/ui/service/MessagesService.java

@@ -36,7 +36,7 @@
 import java.util.function.Predicate;
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.OffsetSpec;
 import org.apache.kafka.clients.admin.TopicDescription;

api/src/main/java/io/kafbat/ui/service/OffsetsResetService.java

@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.OffsetSpec;

api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java

@@ -35,7 +35,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

api/src/main/java/io/kafbat/ui/service/acl/AclsService.java

@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.common.acl.AccessControlEntry;