Reduced duplicate code

germanosin · germanosin · commit 35f6c081a2b6 · 2025-09-30T10:27:10.000+02:00
diff --git a/api/src/main/java/io/kafbat/ui/serdes/ClusterSerdes.java b/api/src/main/java/io/kafbat/ui/serdes/ClusterSerdes.java
@@ -64,12 +64,12 @@ public Stream<SerdeInstance> all() {
 
   public SerdeInstance suggestSerdeForSerialize(String topic, Serde.Target type) {
     return findSerdeByPatternsOrDefault(topic, type, s -> s.canSerialize(topic, type))
-        .orElse(serdes.get(StringSerde.name()));
+        .orElse(serdes.get(StringSerde.NAME));
   }
 
   public SerdeInstance suggestSerdeForDeserialize(String topic, Serde.Target type) {
     return findSerdeByPatternsOrDefault(topic, type, s -> s.canDeserialize(topic, type))
-        .orElse(serdes.get(StringSerde.name()));
+        .orElse(serdes.get(StringSerde.NAME));
   }
 
   @Override
diff --git a/api/src/main/java/io/kafbat/ui/serdes/SerdesInitializer.java b/api/src/main/java/io/kafbat/ui/serdes/SerdesInitializer.java
@@ -42,23 +42,23 @@ public class SerdesInitializer {
   public SerdesInitializer() {
     this(
         ImmutableMap.<String, Class<? extends BuiltInSerde>>builder()
-            .put(StringSerde.name(), StringSerde.class)
-            .put(SchemaRegistrySerde.name(), SchemaRegistrySerde.class)
-            .put(ProtobufFileSerde.name(), ProtobufFileSerde.class)
-            .put(Int32Serde.name(), Int32Serde.class)
-            .put(Int64Serde.name(), Int64Serde.class)
-            .put(UInt32Serde.name(), UInt32Serde.class)
-            .put(UInt64Serde.name(), UInt64Serde.class)
-            .put(AvroEmbeddedSerde.name(), AvroEmbeddedSerde.class)
-            .put(Base64Serde.name(), Base64Serde.class)
-            .put(HexSerde.name(), HexSerde.class)
-            .put(UuidBinarySerde.name(), UuidBinarySerde.class)
-            .put(ProtobufRawSerde.name(), ProtobufRawSerde.class)
+            .put(StringSerde.NAME, StringSerde.class)
+            .put(SchemaRegistrySerde.NAME, SchemaRegistrySerde.class)
+            .put(ProtobufFileSerde.NAME, ProtobufFileSerde.class)
+            .put(Int32Serde.NAME, Int32Serde.class)
+            .put(Int64Serde.NAME, Int64Serde.class)
+            .put(UInt32Serde.NAME, UInt32Serde.class)
+            .put(UInt64Serde.NAME, UInt64Serde.class)
+            .put(AvroEmbeddedSerde.NAME, AvroEmbeddedSerde.class)
+            .put(Base64Serde.NAME, Base64Serde.class)
+            .put(HexSerde.NAME, HexSerde.class)
+            .put(UuidBinarySerde.NAME, UuidBinarySerde.class)
+            .put(ProtobufRawSerde.NAME, ProtobufRawSerde.class)
 
             // mm2 serdes
-            .put(HeartbeatSerde.name(), HeartbeatSerde.class)
-            .put(OffsetSyncSerde.name(), OffsetSyncSerde.class)
-            .put(CheckpointSerde.name(), CheckpointSerde.class)
+            .put(HeartbeatSerde.NAME, HeartbeatSerde.class)
+            .put(OffsetSyncSerde.NAME, OffsetSyncSerde.class)
+            .put(CheckpointSerde.NAME, CheckpointSerde.class)
             .build(),
         new CustomSerdeLoader()
     );
@@ -139,8 +139,8 @@ public ClusterSerdes init(Environment env,
             .orElse(null),
         Optional.ofNullable(clusterProperties.getDefaultValueSerde())
             .map(name -> Preconditions.checkNotNull(registeredSerdes.get(name), "Default value serde not found"))
-            .or(() -> Optional.ofNullable(registeredSerdes.get(SchemaRegistrySerde.name())))
-            .or(() -> Optional.ofNullable(registeredSerdes.get(ProtobufFileSerde.name())))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(SchemaRegistrySerde.NAME)))
+            .or(() -> Optional.ofNullable(registeredSerdes.get(ProtobufFileSerde.NAME)))
             .orElse(null),
         createFallbackSerde()
     );
@@ -150,16 +150,16 @@ public ClusterSerdes init(Environment env,
    * Registers serdse that should only be used for specific (hard-coded) topics, like ConsumerOffsetsSerde.
    */
   private void registerTopicRelatedSerde(Map<String, SerdeInstance> serdes) {
-    serdes.putAll(consumerOffsetsSerde(serdes));
-    serdes.putAll(mirrorMakerSerdes(serdes));
+    serdes.putAll(consumerOffsetsSerde());
+    serdes.putAll(mirrorMakerSerdes());
   }
 
-  private Map<String, SerdeInstance> consumerOffsetsSerde(Map<String, SerdeInstance> serdes) {
+  private Map<String, SerdeInstance> consumerOffsetsSerde() {
     var pattern = Pattern.compile(ConsumerOffsetsSerde.TOPIC);
     return Map.of(
-        ConsumerOffsetsSerde.name(),
+        ConsumerOffsetsSerde.NAME,
         new SerdeInstance(
-            ConsumerOffsetsSerde.name(),
+            ConsumerOffsetsSerde.NAME,
             new ConsumerOffsetsSerde(),
             pattern,
             pattern,
@@ -168,14 +168,14 @@ private Map<String, SerdeInstance> consumerOffsetsSerde(Map<String, SerdeInstanc
     );
   }
 
-  private Map<String, SerdeInstance> mirrorMakerSerdes(Map<String, SerdeInstance> serdes) {
+  private Map<String, SerdeInstance> mirrorMakerSerdes() {
     return Map.of(
-        HeartbeatSerde.name(),
-        mirrorSerde(HeartbeatSerde.name(), HeartbeatSerde.TOPIC_NAME_PATTERN, new HeartbeatSerde()),
-        OffsetSyncSerde.name(),
-        mirrorSerde(HeartbeatSerde.name(), OffsetSyncSerde.TOPIC_NAME_PATTERN, new OffsetSyncSerde()),
-        CheckpointSerde.name(),
-        mirrorSerde(HeartbeatSerde.name(), CheckpointSerde.TOPIC_NAME_PATTERN, new CheckpointSerde())
+        HeartbeatSerde.NAME,
+        mirrorSerde(HeartbeatSerde.NAME, HeartbeatSerde.TOPIC_NAME_PATTERN, new HeartbeatSerde()),
+        OffsetSyncSerde.NAME,
+        mirrorSerde(HeartbeatSerde.NAME, OffsetSyncSerde.TOPIC_NAME_PATTERN, new OffsetSyncSerde()),
+        CheckpointSerde.NAME,
+        mirrorSerde(HeartbeatSerde.NAME, CheckpointSerde.TOPIC_NAME_PATTERN, new CheckpointSerde())
     );
   }
 
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/AvroEmbeddedSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/AvroEmbeddedSerde.java
@@ -13,10 +13,7 @@
 import org.apache.avro.generic.GenericDatumReader;
 
 public class AvroEmbeddedSerde implements BuiltInSerde {
-
-  public static String name() {
-    return "Avro (Embedded)";
-  }
+  public static final String NAME = "Avro (Embedded)";
 
   @Override
   public boolean canDeserialize(String topic, Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/Base64Serde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/Base64Serde.java
@@ -1,18 +1,13 @@
 package io.kafbat.ui.serdes.builtin;
 
 import io.kafbat.ui.serde.api.DeserializeResult;
-import io.kafbat.ui.serde.api.SchemaDescription;
 import io.kafbat.ui.serde.api.Serde;
 import io.kafbat.ui.serdes.BuiltInSerde;
 import java.util.Base64;
 import java.util.Map;
-import java.util.Optional;
 
 public class Base64Serde implements BuiltInSerde {
-
-  public static String name() {
-    return "Base64";
-  }
+  public static final String NAME = "Base64";
 
   @Override
   public boolean canDeserialize(String topic, Serde.Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/ConsumerOffsetsSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/ConsumerOffsetsSerde.java
@@ -13,6 +13,7 @@
 // Deserialization logic and message's schemas can be found in
 // kafka.coordinator.group.GroupMetadataManager (readMessageKey, readOffsetMessageValue, readGroupMessageValue)
 public class ConsumerOffsetsSerde extends StructSerde implements BuiltInSerde {
+  public static final String NAME = "__consumer_offsets";
 
   private static final String ASSIGNMENT = "assignment";
   private static final String CLIENT_HOST = "client_host";
@@ -33,10 +34,6 @@ public class ConsumerOffsetsSerde extends StructSerde implements BuiltInSerde {
 
   public static final String TOPIC = "__consumer_offsets";
 
-  public static String name() {
-    return "__consumer_offsets";
-  }
-
   @Override
   public boolean canDeserialize(String topic, Target type) {
     return topic.equals(TOPIC);
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/HexSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/HexSerde.java
@@ -2,20 +2,15 @@
 
 import io.kafbat.ui.serde.api.DeserializeResult;
 import io.kafbat.ui.serde.api.PropertyResolver;
-import io.kafbat.ui.serde.api.SchemaDescription;
 import io.kafbat.ui.serdes.BuiltInSerde;
 import java.util.HexFormat;
 import java.util.Map;
-import java.util.Optional;
 
 public class HexSerde implements BuiltInSerde {
+  public static final String NAME = "Hex";
 
   private HexFormat deserializeHexFormat;
 
-  public static String name() {
-    return "Hex";
-  }
-
   @Override
   public void autoConfigure(PropertyResolver kafkaClusterProperties, PropertyResolver globalProperties) {
     configure(" ", true);
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/Int32Serde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/Int32Serde.java
@@ -8,10 +8,7 @@
 import java.util.Optional;
 
 public class Int32Serde implements BuiltInSerde {
-
-  public static String name() {
-    return "Int32";
-  }
+  public static final String NAME = "Int32";
 
   @Override
   public Optional<SchemaDescription> getSchema(String topic, Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/Int64Serde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/Int64Serde.java
@@ -9,10 +9,7 @@
 import java.util.Optional;
 
 public class Int64Serde implements BuiltInSerde {
-
-  public static String name() {
-    return "Int64";
-  }
+  public static final String NAME = "Int64";
 
   @Override
   public Optional<SchemaDescription> getSchema(String topic, Serde.Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java
@@ -69,10 +69,7 @@
 
 @Slf4j
 public class ProtobufFileSerde implements BuiltInSerde {
-
-  public static String name() {
-    return "ProtobufFile";
-  }
+  public static final String NAME = "ProtobufFile";
 
   private static final ProtobufSchemaConverter SCHEMA_CONVERTER = new ProtobufSchemaConverter();
 
@@ -112,7 +109,7 @@ void configure(Configuration configuration) {
         && configuration.defaultKeyMessageDescriptor() == null
         && configuration.messageDescriptorMap().isEmpty()
         && configuration.keyMessageDescriptorMap().isEmpty()) {
-      throw new ValidationException("Neither default, nor per-topic descriptors defined for " + name() + " serde");
+      throw new ValidationException("Neither default, nor per-topic descriptors defined for " + NAME + " serde");
     }
     this.defaultMessageDescriptor = configuration.defaultMessageDescriptor();
     this.defaultKeyMessageDescriptor = configuration.defaultKeyMessageDescriptor();
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufRawSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufRawSerde.java
@@ -12,17 +12,14 @@
 import lombok.SneakyThrows;
 
 public class ProtobufRawSerde implements BuiltInSerde {
-
-  public static String name() {
-    return "ProtobufDecodeRaw";
-  }
-
+  public static final String NAME = "ProtobufDecodeRaw";
 
   @Override
   public boolean canDeserialize(String topic, Serde.Target type) {
     return true;
   }
 
+
   @Override
   public Serde.Deserializer deserializer(String topic, Serde.Target type) {
     return new Serde.Deserializer() {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/StringSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/StringSerde.java
@@ -2,18 +2,13 @@
 
 import io.kafbat.ui.serde.api.DeserializeResult;
 import io.kafbat.ui.serde.api.PropertyResolver;
-import io.kafbat.ui.serde.api.SchemaDescription;
 import io.kafbat.ui.serdes.BuiltInSerde;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import java.util.Optional;
 
 public class StringSerde implements BuiltInSerde {
-
-  public static String name() {
-    return "String";
-  }
+  public static final String NAME = "String";
 
   private Charset encoding = StandardCharsets.UTF_8;
 
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/UInt32Serde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/UInt32Serde.java
@@ -10,10 +10,7 @@
 import java.util.Optional;
 
 public class UInt32Serde implements BuiltInSerde {
-
-  public static String name() {
-    return "UInt32";
-  }
+  public static final String NAME = "UInt32";
 
   @Override
   public Optional<SchemaDescription> getSchema(String topic, Serde.Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/UInt64Serde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/UInt64Serde.java
@@ -10,10 +10,7 @@
 
 
 public class UInt64Serde implements BuiltInSerde {
-
-  public static String name() {
-    return "UInt64";
-  }
+  public static final String NAME = "UInt64";
 
   @Override
   public Optional<SchemaDescription> getSchema(String topic, Target type) {
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/UuidBinarySerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/UuidBinarySerde.java
@@ -3,20 +3,15 @@
 import io.kafbat.ui.exception.ValidationException;
 import io.kafbat.ui.serde.api.DeserializeResult;
 import io.kafbat.ui.serde.api.PropertyResolver;
-import io.kafbat.ui.serde.api.SchemaDescription;
 import io.kafbat.ui.serde.api.Serde;
 import io.kafbat.ui.serdes.BuiltInSerde;
 import java.nio.ByteBuffer;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 
 
 public class UuidBinarySerde implements BuiltInSerde {
-
-  public static String name() {
-    return "UUIDBinary";
-  }
+  public static final String NAME = "UUIDBinary";
 
   private boolean mostSignificantBitsFirst = true;
 
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/CheckpointSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/CheckpointSerde.java
@@ -10,7 +10,7 @@
 
 @Slf4j
 public class CheckpointSerde extends MirrorMakerSerde implements BuiltInSerde {
-
+  public static final String NAME = "Checkpoint";
   public static final Pattern TOPIC_NAME_PATTERN = Pattern.compile(".*\\.checkpoints\\.internal");
 
   private static final String TOPIC_KEY = "topic";
@@ -34,10 +34,6 @@ public CheckpointSerde() {
     super(true);
   }
 
-  public static String name() {
-    return "Checkpoint";
-  }
-
   @Override
   protected Schema getKeySchema() {
     return KEY_SCHEMA;
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/HeartbeatSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/HeartbeatSerde.java
@@ -10,7 +10,7 @@
 
 @Slf4j
 public class HeartbeatSerde extends MirrorMakerSerde implements BuiltInSerde {
-
+  public static final String NAME = "Heartbeat";
   public static final Pattern TOPIC_NAME_PATTERN = Pattern.compile("heartbeats");
 
   private static final String SOURCE_CLUSTER_ALIAS_KEY = "sourceClusterAlias";
@@ -28,10 +28,6 @@ public HeartbeatSerde() {
     super(true);
   }
 
-  public static String name() {
-    return "Heartbeat";
-  }
-
   protected Schema getKeySchema() {
     return KEY_SCHEMA;
   }
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/OffsetSyncSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/mm2/OffsetSyncSerde.java
@@ -10,7 +10,7 @@
 
 @Slf4j
 public class OffsetSyncSerde extends MirrorMakerSerde implements BuiltInSerde {
-
+  public static final String NAME = "OffsetSync";
   public static final Pattern TOPIC_NAME_PATTERN = Pattern.compile("mm2-offset-syncs\\..*\\.internal");
 
   private static final Schema VALUE_SCHEMA;
@@ -31,10 +31,6 @@ public OffsetSyncSerde() {
     super(false);
   }
 
-  public static String name() {
-    return "OffsetSync";
-  }
-
   @Override
   protected Schema getKeySchema() {
     return KEY_SCHEMA;
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/sr/SchemaRegistrySerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/sr/SchemaRegistrySerde.java
@@ -39,14 +39,10 @@
 
 
 public class SchemaRegistrySerde implements BuiltInSerde {
-
+  public static final String NAME = "SchemaRegistry";
   private static final byte SR_PAYLOAD_MAGIC_BYTE = 0x0;
   private static final int SR_PAYLOAD_PREFIX_LENGTH = 5;
 
-  public static String name() {
-    return "SchemaRegistry";
-  }
-
   private static final String SCHEMA_REGISTRY = "schemaRegistry";
 
   private SchemaRegistryClient schemaRegistryClient;
@@ -303,7 +299,7 @@ private int extractSchemaIdFromMsg(byte[] data) {
     throw new ValidationException(
         String.format(
             "Data doesn't contain magic byte and schema id prefix, so it can't be deserialized with %s serde",
-            name())
+            NAME)
     );
   }
 }
diff --git a/api/src/test/java/io/kafbat/ui/emitter/CursorTest.java b/api/src/test/java/io/kafbat/ui/emitter/CursorTest.java
diff --git a/api/src/test/java/io/kafbat/ui/emitter/TailingEmitterTest.java b/api/src/test/java/io/kafbat/ui/emitter/TailingEmitterTest.java
diff --git a/api/src/test/java/io/kafbat/ui/serdes/SerdesInitializerTest.java b/api/src/test/java/io/kafbat/ui/serdes/SerdesInitializerTest.java
diff --git a/api/src/test/java/io/kafbat/ui/service/MessagesServiceTest.java b/api/src/test/java/io/kafbat/ui/service/MessagesServiceTest.java
diff --git a/api/src/test/java/io/kafbat/ui/service/RecordEmitterTest.java b/api/src/test/java/io/kafbat/ui/service/RecordEmitterTest.java
diff --git a/api/src/test/java/io/kafbat/ui/service/SendAndReadTests.java b/api/src/test/java/io/kafbat/ui/service/SendAndReadTests.java

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,12 @@ public Stream<SerdeInstance> all() {`
`64`	`64`
`65`	`65`	`public SerdeInstance suggestSerdeForSerialize(String topic, Serde.Target type) {`
`66`	`66`	`return findSerdeByPatternsOrDefault(topic, type, s -> s.canSerialize(topic, type))`
`67`		`- .orElse(serdes.get(StringSerde.name()));`
	`67`	`+ .orElse(serdes.get(StringSerde.NAME));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public SerdeInstance suggestSerdeForDeserialize(String topic, Serde.Target type) {`
`71`	`71`	`return findSerdeByPatternsOrDefault(topic, type, s -> s.canDeserialize(topic, type))`
`72`		`- .orElse(serdes.get(StringSerde.name()));`
	`72`	`+ .orElse(serdes.get(StringSerde.NAME));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`@Override`