From 6d41aa44a11048fe834b808eee4914659ffa6674 Mon Sep 17 00:00:00 2001
From: Alexandr Gorshenin <alexandr268@ydb.tech>
Date: Wed, 9 Jul 2025 12:39:34 +0100
Subject: [PATCH] Fixed minor NPE warnings

---
 .../java/org/jooq/impl/FieldMapsForUpsertReplace.java  |  7 ++++---
 .../java/tech/ydb/jooq/codegen/YdbIndexDefinition.java | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/jooq-dialect/src/main/java/org/jooq/impl/FieldMapsForUpsertReplace.java b/jooq-dialect/src/main/java/org/jooq/impl/FieldMapsForUpsertReplace.java
index c854e63..f669e54 100644
--- a/jooq-dialect/src/main/java/org/jooq/impl/FieldMapsForUpsertReplace.java
+++ b/jooq-dialect/src/main/java/org/jooq/impl/FieldMapsForUpsertReplace.java
@@ -12,6 +12,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.stream.IntStream;
+
 import org.jooq.Context;
 import org.jooq.DataType;
 import org.jooq.Field;
@@ -19,6 +20,7 @@
 import org.jooq.RenderContext.CastMode;
 import org.jooq.Select;
 import org.jooq.Table;
+
 import static org.jooq.impl.Keywords.K_VALUES;
 import static org.jooq.impl.Tools.BooleanDataKey.DATA_STORE_ASSIGNMENT;
 
@@ -78,10 +80,9 @@ public Select<Record> upsertSelect() {
         Map<Field<?>, List<Field<?>>> v = valuesFlattened();
 
         return IntStream.range(0, rows)
-                .mapToObj(row -> (Select<Record>) DSL.select(Tools.map(v.entrySet(),
-                        e -> patchDefault0(e.getValue().get(row), e.getKey()))))
+                .mapToObj(row -> (Select<Record>) DSL.select(Tools.map(v.entrySet(), e -> patchDefault0(e.getValue().get(row), e.getKey()))))
                 .reduce(Select::unionAll)
-                .orElse(null);
+                .orElseThrow();
     }
 
     private void toSQL92Values(Context<?> ctx) {
diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbIndexDefinition.java b/jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbIndexDefinition.java
index 7c39f52..9ec04f6 100644
--- a/jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbIndexDefinition.java
+++ b/jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbIndexDefinition.java
@@ -1,5 +1,8 @@
 package tech.ydb.jooq.codegen;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jooq.SortOrder;
 import org.jooq.meta.AbstractIndexDefinition;
 import org.jooq.meta.ColumnDefinition;
@@ -7,10 +10,8 @@
 import org.jooq.meta.IndexColumnDefinition;
 import org.jooq.meta.SchemaDefinition;
 import org.jooq.meta.TableDefinition;
-import tech.ydb.table.description.TableIndex;
 
-import java.util.ArrayList;
-import java.util.List;
+import tech.ydb.table.description.TableIndex;
 
 public class YdbIndexDefinition extends AbstractIndexDefinition {
     private final TableIndex tableIndex;
@@ -29,6 +30,9 @@ protected List<IndexColumnDefinition> getIndexColumns0() {
 
         for (String column : columns) {
             ColumnDefinition columnDefinition = getTable().getColumn(column);
+            if (columnDefinition == null) {
+                continue;
+            }
 
             IndexColumnDefinition definition = new DefaultIndexColumnDefinition(
                     this,