Skip to content

[FLINK-40597][core] Fix input type validation for Types.UUID #29133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twalthr merged 2 commits into from
Sep 14, 2026
+31 −3
Merged

[FLINK-40597][core] Fix input type validation for Types.UUID #29133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccfe431
[FLINK-40597][core] Fix input type validation for Types.UUID
dylanhz Sep 8, 2026
792f7a8
[FLINK-40597][core] Move UUID type extraction tests to TypeExtractorTest
dylanhz Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

import static org.apache.flink.api.java.typeutils.TypeExtractionUtils.checkAndExtractLambda;
import static org.apache.flink.api.java.typeutils.TypeExtractionUtils.getAllDeclaredMethods;
Expand Down Expand Up @@ -1498,10 +1499,16 @@ private static void validateInfo(
// check for Java Basic Types
if (typeInfo instanceof BasicTypeInfo) {

TypeInformation<?> actual;
// check if basic type at all
if (!(type instanceof Class<?>)
|| (actual = BasicTypeInfo.getInfoFor((Class<?>) type)) == null) {
if (!(type instanceof Class<?>)) {
throw new InvalidTypesException("Basic type expected.");
}
// UUID is not registered for automatic extraction to preserve existing serializers.
final TypeInformation<?> actual =
type == UUID.class
? BasicTypeInfo.UUID_TYPE_INFO
: BasicTypeInfo.getInfoFor((Class<?>) type);
Comment on lines +1507 to +1510

@raminqaf raminqaf Sep 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a test in TypeExtractorTest?

@dylanhz dylanhz Sep 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. Moved both tests to TypeExtractorTest.

if (actual == null) {
throw new InvalidTypesException("Basic type expected.");
}
// check if correct basic type
Expand Down
21 changes: 21 additions & 0 deletions flink-core/src/test/java/org/apache/flink/api/java/typeutils/TypeExtractorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down Expand Up @@ -115,6 +116,26 @@ public void reduce(Iterable<Boolean> values, Collector<Boolean> out)
assertThat(TypeExtractor.getForObject(true)).isEqualTo(BasicTypeInfo.BOOLEAN_TYPE_INFO);
}

@Test
void testMapWithExplicitUuidType() {
// A lambda would bypass the input validation exercised by this test.
final MapFunction<UUID, String> mapper =
new MapFunction<UUID, String>() {
@Override
public String map(UUID value) {
return value.toString();
}
};

assertThat(TypeExtractor.getMapReturnTypes(mapper, Types.UUID)).isEqualTo(Types.STRING);
}

@Test
void testUuidIsNotAutomaticallyExtracted() {
assertThat(TypeExtractor.getForObject(new UUID(0L, 0L)))
.isEqualTo(new GenericTypeInfo<>(UUID.class));
}

@SuppressWarnings({"unchecked", "rawtypes"})
@Test
void testTupleWithBasicTypes() throws Exception {
Expand Down