(kafka) branch trunk updated: MINOR: Simplify inheritance for MeteredTimestampedWindowStoreWithHeaders (#21966)

[mjsax]

This is an automated email from the ASF dual-hosted git repository.

mjsax pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b0684bf424a MINOR: Simplify inheritance for 
MeteredTimestampedWindowStoreWithHeaders (#21966)
b0684bf424a is described below

commit b0684bf424a6412d38b6b7ba8cbe14d5555d3843
Author: Uladzislau Blok <123193120+uladzislaub...@users.noreply.github.com>
AuthorDate: Sun Apr 5 04:36:30 2026 +0200

    MINOR: Simplify inheritance for MeteredTimestampedWindowStoreWithHeaders 
(#21966)
    
    Reviewers: Matthias J. Sax <matth...@confluent.io>
---
 .../internals/MeteredTimestampedKeyValueStoreWithHeaders.java    | 4 ++--
 .../internals/MeteredTimestampedWindowStoreWithHeaders.java      | 9 ++-------
 .../apache/kafka/streams/state/internals/MeteredWindowStore.java | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreWithHeaders.java
 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreWithHeaders.java
index 423ca08fc08..ebdcc8f73c5 100644
--- 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreWithHeaders.java
+++ 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreWithHeaders.java
@@ -664,7 +664,7 @@ public class MeteredTimestampedKeyValueStoreWithHeaders<K, 
V>
         throw new 
UnsupportedOperationException("MeteredTimestampedKeyValueStoreWithHeaders 
required to pass in Headers when serializing a key.");
     }
 
-    protected Bytes serializeKey(final K key, final Headers headers) {
+    private Bytes serializeKey(final K key, final Headers headers) {
         return Bytes.wrap(serdes.rawKey(key, headers));
     }
 
@@ -673,7 +673,7 @@ public class MeteredTimestampedKeyValueStoreWithHeaders<K, 
V>
         throw new 
UnsupportedOperationException("MeteredTimestampedKeyValueStoreWithHeaders 
required to pass in Headers when deserializing a key.");
     }
 
-    protected K deserializeKey(final byte[] rawKey, final Headers headers) {
+    private K deserializeKey(final byte[] rawKey, final Headers headers) {
         return serdes.keyFrom(rawKey, headers);
     }
 }
diff --git 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeaders.java
 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeaders.java
index 6d4cf93beba..7db8bb0d2e7 100644
--- 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeaders.java
+++ 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreWithHeaders.java
@@ -507,16 +507,11 @@ public class MeteredTimestampedWindowStoreWithHeaders<K, 
V>
         return false;
     }
 
-    protected Bytes serializeKey(final K key, final Headers headers) {
+    private Bytes serializeKey(final K key, final Headers headers) {
         return Bytes.wrap(serdes.rawKey(key, headers));
     }
 
-    @Override
-    protected K deserializeKey(final byte[] rawKey) {
-        throw new 
UnsupportedOperationException("MeteredTimestampedWindowStoreWithHeaders 
required to pass in Headers when deserializing a key.");
-    }
-
-    protected K deserializeKey(final byte[] rawKey, final Headers headers) {
+    private K deserializeKey(final byte[] rawKey, final Headers headers) {
         return serdes.keyFrom(rawKey, headers);
     }
 
diff --git 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
index 2320d48af8f..44e7d1b4510 100644
--- 
a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
+++ 
b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
@@ -541,7 +541,7 @@ public class MeteredWindowStore<K, V>
         return Bytes.wrap(serdes.rawKey(key, internalContext.headers()));
     }
 
-    protected K deserializeKey(final byte[] rawKey) {
+    private K deserializeKey(final byte[] rawKey) {
         return serdes.keyFrom(rawKey, internalContext.headers());
     }