small refactoring

Author: germanosin

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

@@ -118,8 +118,8 @@ public enum SupportedFeature {
       this.predicate = (admin, ver) -> Mono.just(ver != null && ver >= fromVersion);
     }
 
-    static Mono<Set<SupportedFeature>> forVersion(AdminClient ac, String kafkaVersionStr) {
-      @Nullable Float kafkaVersion = KafkaVersion.parse(kafkaVersionStr).orElse(null);
+    static Mono<Set<SupportedFeature>> forVersion(AdminClient ac, Optional<String> kafkaVersionStr) {
+      @Nullable Float kafkaVersion = kafkaVersionStr.flatMap(KafkaVersion::parse).orElse(null);
       return Flux.fromArray(SupportedFeature.values())
           .flatMap(f -> f.predicate.apply(ac, kafkaVersion).map(enabled -> Tuples.of(f, enabled)))
           .filter(Tuple2::getT2)
@@ -158,22 +158,24 @@ private static Mono<ConfigRelatedInfo> extract(AdminClient ac) {
                 .flatMap(tuple -> {
                   List<ConfigEntry> configs = tuple.getT1();
                   FeatureMetadata featureMetadata = tuple.getT2();
-                  String version = DEFAULT_UNKNOWN_VERSION;
+                  Optional<String> version = Optional.empty();
                   boolean topicDeletionEnabled = true;
                   for (ConfigEntry entry : configs) {
                     if (entry.name().contains("inter.broker.protocol.version")) {
-                      version = entry.value();
+                      version = Optional.of(entry.value());
                     }
                     if (entry.name().equals("delete.topic.enable")) {
                       topicDeletionEnabled = Boolean.parseBoolean(entry.value());
                     }
                   }
-                  FinalizedVersionRange metadataVersion =
-                      featureMetadata.finalizedFeatures().get("metadata.version");
-                  if (metadataVersion != null) {
-                    version = MetadataVersion.findVersion(metadataVersion.maxVersionLevel(), version);
+                  if (version.isEmpty()) {
+                    FinalizedVersionRange metadataVersion =
+                        featureMetadata.finalizedFeatures().get("metadata.version");
+                    if (metadataVersion != null) {
+                      version = MetadataVersion.findVersion(metadataVersion.maxVersionLevel());
+                    }
                   }
-                  final String finalVersion = version;
+                  final String finalVersion = version.orElse(DEFAULT_UNKNOWN_VERSION);
                   final boolean finalTopicDeletionEnabled = topicDeletionEnabled;
                   return SupportedFeature.forVersion(ac, version)
                       .map(features -> new ConfigRelatedInfo(finalVersion, features, finalTopicDeletionEnabled));

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

@@ -1,6 +1,7 @@
 package io.kafbat.ui.util;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 public enum MetadataVersion {
   IBP_3_0_IV1(1, "3.0-IV1"),
@@ -38,11 +39,10 @@ public enum MetadataVersion {
     this.release = release;
   }
 
-  public static String findVersion(int featureLevel, String defaultValue) {
+  public static Optional<String> findVersion(int featureLevel) {
     return Arrays.stream(values())
         .filter(v -> v.featureLevel == featureLevel)
-        .findFirst().map(v -> v.release)
-        .orElse(defaultValue);
+        .findFirst().map(v -> v.release);
   }
 
 }