From b7eb4b5c624a78e3da9c3628e3c7bbbdaec288e5 Mon Sep 17 00:00:00 2001
From: mfvitale <mvitale@redhat.com>
Date: Tue, 13 Jun 2023 10:37:57 +0200
Subject: [PATCH] DBZ-6543 Fix NPE due to optional fields in PartitionRouting
 SMT

---
 .../io/debezium/transforms/partitions/PartitionRouting.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debezium-core/src/main/java/io/debezium/transforms/partitions/PartitionRouting.java b/debezium-core/src/main/java/io/debezium/transforms/partitions/PartitionRouting.java
index 08d88c54a..d6e18256f 100644
--- a/debezium-core/src/main/java/io/debezium/transforms/partitions/PartitionRouting.java
+++ b/debezium-core/src/main/java/io/debezium/transforms/partitions/PartitionRouting.java
@@ -189,7 +189,7 @@ private Optional<Object> toValue(String fieldName, Struct envelope) {
             String[] subFields = Arrays.stream(fieldName.split(NESTING_SEPARATOR)).map(String::trim).toArray(String[]::new);
 
             if (subFields.length == 1) {
-                return Optional.of(envelope.get(subFields[0]));
+                return Optional.ofNullable(envelope.get(subFields[0]));
             }
 
             Struct lastStruct = getLastStruct(envelope, subFields);