diff --git a/api/src/main/java/io/kafbat/ui/service/OffsetsResetService.java b/api/src/main/java/io/kafbat/ui/service/OffsetsResetService.java index d2e376cf3..82af48423 100644 --- a/api/src/main/java/io/kafbat/ui/service/OffsetsResetService.java +++ b/api/src/main/java/io/kafbat/ui/service/OffsetsResetService.java @@ -2,9 +2,8 @@ import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; -import static org.apache.kafka.common.ConsumerGroupState.DEAD; -import static org.apache.kafka.common.ConsumerGroupState.EMPTY; - +import static org.apache.kafka.common.GroupState.DEAD; +import static org.apache.kafka.common.GroupState.EMPTY; import com.google.common.base.Preconditions; import io.kafbat.ui.exception.NotFoundException; import io.kafbat.ui.exception.ValidationException; @@ -104,13 +103,13 @@ private Mono checkGroupCondition(KafkaCluster cluster, Stri .filter(cgs -> cgs.containsKey(groupId)) .map(cgs -> cgs.get(groupId)) .flatMap(cg -> { - if (!Set.of(DEAD, EMPTY).contains(cg.state())) { + if (!Set.of(DEAD, EMPTY).contains(cg.groupState())) { return Mono.error( new ValidationException( String.format( "Group's offsets can be reset only if group is inactive," + " but group is in %s state", - cg.state() + cg.groupState() ) ) ); diff --git a/api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java b/api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java index 5bb2775a3..cd44e0548 100644 --- a/api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java +++ b/api/src/main/java/io/kafbat/ui/service/ReactiveAdminClient.java @@ -493,13 +493,9 @@ public Mono createPartitions(Map newPartitionsMap) // NOTE: places whole current topic config with new one. Entries that were present in old config, // but missed in new will be set to default public Mono updateTopicConfig(String topicName, Map configs) { - if (getClusterFeatures().contains(SupportedFeature.INCREMENTAL_ALTER_CONFIGS)) { return getTopicsConfigImpl(List.of(topicName), false) .map(conf -> conf.getOrDefault(topicName, List.of())) .flatMap(currentConfigs -> incrementalAlterConfig(topicName, currentConfigs, configs)); - } else { - return alterConfig(topicName, configs); - } } public Mono> listConsumerGroupNames() { @@ -742,16 +738,6 @@ private Mono incrementalAlterConfig(String topicName, )).all()); } - @SuppressWarnings("deprecation") - private Mono alterConfig(String topicName, Map configs) { - List configEntries = configs.entrySet().stream() - .flatMap(cfg -> Stream.of(new ConfigEntry(cfg.getKey(), cfg.getValue()))) - .collect(toList()); - Config config = new Config(configEntries); - var topicResource = new ConfigResource(ConfigResource.Type.TOPIC, topicName); - return toMono(client.alterConfigs(Map.of(topicResource, config)).all()); - } - /** * Splits input collection into batches, converts each batch into Mono, sequentially subscribes to them * and merges output Monos into one Mono. diff --git a/api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java b/api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java index 76baf0072..9223f16a6 100644 --- a/api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java +++ b/api/src/main/java/io/kafbat/ui/util/jsonschema/JsonAvroConversion.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.databind.node.TextNode; import com.google.common.collect.Lists; import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils; -import io.confluent.kafka.serializers.AvroData; import io.kafbat.ui.exception.JsonAvroConversionException; import java.math.BigDecimal; import java.nio.ByteBuffer; diff --git a/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml index 77614253e..50c655a48 100644 --- a/contract/src/main/resources/swagger/kafbat-ui-api.yaml +++ b/contract/src/main/resources/swagger/kafbat-ui-api.yaml @@ -3872,6 +3872,7 @@ components: - DYNAMIC_CLIENT_METRICS_CONFIG - STATIC_BROKER_CONFIG - DEFAULT_CONFIG + - DYNAMIC_GROUP_CONFIG - UNKNOWN ConfigSynonym: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a09c90a9..1b631baf4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,8 +13,8 @@ apache-commons-compress = '1.26.0' assertj = '3.25.3' avro = '1.11.4' byte-buddy = '1.14.19' -confluent = '7.9.0' -confluent-ccs = '7.9.0-ccs' +confluent = '8.0.0' +confluent-ccs = '8.0.0-ccs' mapstruct = '1.6.2' lombok = '1.18.34'