root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MINOR: cleanup SinkNode generics (#18975) 

Reviewers: Andrew Schofield <aschofield@confluent.io>, Bill Bejeck <bill@confluent.io>
This commit is contained in:
Matthias J. Sax 2025-02-20 17:47:39 -08:00 committed by GitHub
parent 709bfc506a
commit acea35ddf3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
streams/src/main/java/org/apache/kafka/streams/kstream/internals/WrappingNullableUtils.java
View File

@ -28,8 +28,8 @@ import org.apache.kafka.streams.processor.internals.SerdeGetter;
*/ */
public class WrappingNullableUtils { public class WrappingNullableUtils {
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "resource"})
private static <T> Deserializer<T> prepareDeserializer(final Deserializer<T> specificDeserializer, final ProcessorContext context, final boolean isKey, final String name) { private static <T> Deserializer<T> prepareDeserializer(final Deserializer<T> specificDeserializer, final ProcessorContext<?, ?> context, final boolean isKey) {
final Deserializer<T> deserializerToUse; final Deserializer<T> deserializerToUse;
if (specificDeserializer == null) { if (specificDeserializer == null) {
@ -41,8 +41,8 @@ public class WrappingNullableUtils {
return deserializerToUse; return deserializerToUse;
} }
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings({"unchecked", "resource"})
private static <T> Serializer<T> prepareSerializer(final Serializer<T> specificSerializer, final ProcessorContext context, final boolean isKey, final String name) { private static <T> Serializer<T> prepareSerializer(final Serializer<T> specificSerializer, final ProcessorContext<?, ?> context, final boolean isKey) {
final Serializer<T> serializerToUse; final Serializer<T> serializerToUse;
if (specificSerializer == null) { if (specificSerializer == null) {
serializerToUse = (Serializer<T>) (isKey ? context.keySerde().serializer() : context.valueSerde().serializer()); serializerToUse = (Serializer<T>) (isKey ? context.keySerde().serializer() : context.valueSerde().serializer());
@ -53,7 +53,7 @@ public class WrappingNullableUtils {
return serializerToUse; return serializerToUse;
} }
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings("unchecked")
private static <T> Serde<T> prepareSerde(final Serde<T> specificSerde, final SerdeGetter getter, final boolean isKey) { private static <T> Serde<T> prepareSerde(final Serde<T> specificSerde, final SerdeGetter getter, final boolean isKey) {
final Serde<T> serdeToUse; final Serde<T> serdeToUse;
if (specificSerde == null) { if (specificSerde == null) {
@ -62,25 +62,25 @@ public class WrappingNullableUtils {
serdeToUse = specificSerde; serdeToUse = specificSerde;
} }
if (serdeToUse instanceof WrappingNullableSerde) { if (serdeToUse instanceof WrappingNullableSerde) {
((WrappingNullableSerde) serdeToUse).setIfUnset(getter); ((WrappingNullableSerde<?, ?, ?>) serdeToUse).setIfUnset(getter);
} }
return serdeToUse; return serdeToUse;
} }
public static <K> Deserializer<K> prepareKeyDeserializer(final Deserializer<K> specificDeserializer, final ProcessorContext<K, ?> context, final String name) { public static <K> Deserializer<K> prepareKeyDeserializer(final Deserializer<K> specificDeserializer, final ProcessorContext<K, ?> context) {
return prepareDeserializer(specificDeserializer, context, true, name); return prepareDeserializer(specificDeserializer, context, true);
} }
public static <V> Deserializer<V> prepareValueDeserializer(final Deserializer<V> specificDeserializer, final ProcessorContext<?, V> context, final String name) { public static <V> Deserializer<V> prepareValueDeserializer(final Deserializer<V> specificDeserializer, final ProcessorContext<?, V> context) {
return prepareDeserializer(specificDeserializer, context, false, name); return prepareDeserializer(specificDeserializer, context, false);
} }
public static <K> Serializer<K> prepareKeySerializer(final Serializer<K> specificSerializer, final ProcessorContext<K, ?> context, final String name) { public static <K> Serializer<K> prepareKeySerializer(final Serializer<K> specificSerializer, final ProcessorContext<?, ?> context) {
return prepareSerializer(specificSerializer, context, true, name); return prepareSerializer(specificSerializer, context, true);
} }
public static <V> Serializer<V> prepareValueSerializer(final Serializer<V> specificSerializer, final ProcessorContext<?, V> context, final String name) { public static <V> Serializer<V> prepareValueSerializer(final Serializer<V> specificSerializer, final ProcessorContext<?, ?> context) {
return prepareSerializer(specificSerializer, context, false, name); return prepareSerializer(specificSerializer, context, false);
} }
public static <K> Serde<K> prepareKeySerde(final Serde<K> specificSerde, final SerdeGetter getter) { public static <K> Serde<K> prepareKeySerde(final Serde<K> specificSerde, final SerdeGetter getter) {
@ -91,17 +91,15 @@ public class WrappingNullableUtils {
return prepareSerde(specificSerde, getter, false); return prepareSerde(specificSerde, getter, false);
} }
@SuppressWarnings({"rawtypes", "unchecked"})
public static <T> void initNullableSerializer(final Serializer<T> specificSerializer, final SerdeGetter getter) { public static <T> void initNullableSerializer(final Serializer<T> specificSerializer, final SerdeGetter getter) {
if (specificSerializer instanceof WrappingNullableSerializer) { if (specificSerializer instanceof WrappingNullableSerializer) {
((WrappingNullableSerializer) specificSerializer).setIfUnset(getter); ((WrappingNullableSerializer<?, ?, ?>) specificSerializer).setIfUnset(getter);
} }
} }
@SuppressWarnings({"rawtypes", "unchecked"})
public static <T> void initNullableDeserializer(final Deserializer<T> specificDeserializer, final SerdeGetter getter) { public static <T> void initNullableDeserializer(final Deserializer<T> specificDeserializer, final SerdeGetter getter) {
if (specificDeserializer instanceof WrappingNullableDeserializer) { if (specificDeserializer instanceof WrappingNullableDeserializer) {
((WrappingNullableDeserializer) specificDeserializer).setIfUnset(getter); ((WrappingNullableDeserializer<?, ?, ?>) specificDeserializer).setIfUnset(getter);
} }
} }

5
streams/src/main/java/org/apache/kafka/streams/processor/internals/SinkNode.java
View File

@ -56,19 +56,18 @@ public class SinkNode<KIn, VIn> extends ProcessorNode<KIn, VIn, Void, Void> {
throw new UnsupportedOperationException("sink node does not allow addChild"); throw new UnsupportedOperationException("sink node does not allow addChild");
} }
@SuppressWarnings({"unchecked", "rawtypes"})
@Override @Override
public void init(final InternalProcessorContext<Void, Void> context) { public void init(final InternalProcessorContext<Void, Void> context) {
super.init(context); super.init(context);
this.context = context; this.context = context;
try { try {
keySerializer = prepareKeySerializer(keySerializer, (InternalProcessorContext) context, this.name()); keySerializer = prepareKeySerializer(keySerializer, context);
} catch (ConfigException | StreamsException e) { } catch (ConfigException | StreamsException e) {
throw new StreamsException(String.format("Failed to initialize key serdes for sink node %s", name()), e, context.taskId()); throw new StreamsException(String.format("Failed to initialize key serdes for sink node %s", name()), e, context.taskId());
} }
try { try {
valSerializer = prepareValueSerializer(valSerializer, (InternalProcessorContext) context, this.name()); valSerializer = prepareValueSerializer(valSerializer, context);
} catch (final ConfigException | StreamsException e) { } catch (final ConfigException | StreamsException e) {
throw new StreamsException(String.format("Failed to initialize value serdes for sink node %s", name()), e, context.taskId()); throw new StreamsException(String.format("Failed to initialize value serdes for sink node %s", name()), e, context.taskId());
} }

4
streams/src/main/java/org/apache/kafka/streams/processor/internals/SourceNode.java
View File

@ -77,13 +77,13 @@ public class SourceNode<KIn, VIn> extends ProcessorNode<KIn, VIn, KIn, VIn> {
this.context = context; this.context = context;
try { try {
keyDeserializer = prepareKeyDeserializer(keyDeserializer, context, name()); keyDeserializer = prepareKeyDeserializer(keyDeserializer, context);
} catch (final ConfigException | StreamsException e) { } catch (final ConfigException | StreamsException e) {
throw new StreamsException(String.format("Failed to initialize key serdes for source node %s", name()), e, context.taskId()); throw new StreamsException(String.format("Failed to initialize key serdes for source node %s", name()), e, context.taskId());
} }
try { try {
valDeserializer = prepareValueDeserializer(valDeserializer, context, name()); valDeserializer = prepareValueDeserializer(valDeserializer, context);
} catch (final ConfigException | StreamsException e) { } catch (final ConfigException | StreamsException e) {
throw new StreamsException(String.format("Failed to initialize value serdes for source node %s", name()), e, context.taskId()); throw new StreamsException(String.format("Failed to initialize value serdes for source node %s", name()), e, context.taskId());
} }

10
streams/src/test/java/org/apache/kafka/streams/processor/internals/SinkNodeTest.java
View File

@ -48,8 +48,8 @@ public class SinkNodeTest {
new StaticTopicNameExtractor<>("any-output-topic"), anySerializer, anySerializer, null); new StaticTopicNameExtractor<>("any-output-topic"), anySerializer, anySerializer, null);
// Used to verify that the correct exceptions are thrown if the compiler checks are bypassed // Used to verify that the correct exceptions are thrown if the compiler checks are bypassed
@SuppressWarnings({"unchecked", "rawtypes"}) @SuppressWarnings("unchecked")
private final SinkNode<Object, Object> illTypedSink = (SinkNode) sink; private final SinkNode<Object, Object> illTypedSink = (SinkNode<Object, Object>) ((SinkNode<?, ?>) sink);
private MockedStatic<WrappingNullableUtils> utilsMock; private MockedStatic<WrappingNullableUtils> utilsMock;
@BeforeEach @BeforeEach
@ -77,7 +77,7 @@ public class SinkNodeTest {
@Test @Test
public void shouldThrowStreamsExceptionOnUndefinedKeySerde() { public void shouldThrowStreamsExceptionOnUndefinedKeySerde() {
utilsMock.when(() -> WrappingNullableUtils.prepareKeySerializer(any(), any(), any())) utilsMock.when(() -> WrappingNullableUtils.prepareKeySerializer(any(), any()))
.thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_KEY_SERDE_CLASS_CONFIG")); .thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_KEY_SERDE_CLASS_CONFIG"));
final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context));
@ -94,7 +94,7 @@ public class SinkNodeTest {
@Test @Test
public void shouldThrowStreamsExceptionOnUndefinedValueSerde() { public void shouldThrowStreamsExceptionOnUndefinedValueSerde() {
utilsMock.when(() -> WrappingNullableUtils.prepareValueSerializer(any(), any(), any())) utilsMock.when(() -> WrappingNullableUtils.prepareValueSerializer(any(), any()))
.thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_VALUE_SERDE_CLASS_CONFIG")); .thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_VALUE_SERDE_CLASS_CONFIG"));
final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context));
@ -111,7 +111,7 @@ public class SinkNodeTest {
@Test @Test
public void shouldThrowStreamsExceptionWithExplicitErrorMessage() { public void shouldThrowStreamsExceptionWithExplicitErrorMessage() {
utilsMock.when(() -> WrappingNullableUtils.prepareKeySerializer(any(), any(), any())).thenThrow(new StreamsException("")); utilsMock.when(() -> WrappingNullableUtils.prepareKeySerializer(any(), any())).thenThrow(new StreamsException(""));
final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> sink.init(context));

6
streams/src/test/java/org/apache/kafka/streams/processor/internals/SourceNodeTest.java
View File

@ -137,7 +137,7 @@ public class SourceNodeTest {
final SourceNode<String, String> node = final SourceNode<String, String> node =
new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer()); new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer());
utilsMock.when(() -> WrappingNullableUtils.prepareKeyDeserializer(any(), any(), any())) utilsMock.when(() -> WrappingNullableUtils.prepareKeyDeserializer(any(), any()))
.thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_KEY_SERDE_CLASS_CONFIG")); .thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_KEY_SERDE_CLASS_CONFIG"));
final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context));
@ -159,7 +159,7 @@ public class SourceNodeTest {
final SourceNode<String, String> node = final SourceNode<String, String> node =
new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer()); new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer());
utilsMock.when(() -> WrappingNullableUtils.prepareValueDeserializer(any(), any(), any())) utilsMock.when(() -> WrappingNullableUtils.prepareValueDeserializer(any(), any()))
.thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_VALUE_SERDE_CLASS_CONFIG")); .thenThrow(new ConfigException("Please set StreamsConfig#DEFAULT_VALUE_SERDE_CLASS_CONFIG"));
final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context));
@ -181,7 +181,7 @@ public class SourceNodeTest {
final SourceNode<String, String> node = final SourceNode<String, String> node =
new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer()); new SourceNode<>(context.currentNode().name(), new TheDeserializer(), new TheDeserializer());
utilsMock.when(() -> WrappingNullableUtils.prepareKeyDeserializer(any(), any(), any())).thenThrow(new StreamsException("")); utilsMock.when(() -> WrappingNullableUtils.prepareKeyDeserializer(any(), any())).thenThrow(new StreamsException(""));
final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context)); final Throwable exception = assertThrows(StreamsException.class, () -> node.init(context));