Skip to content

Commit 6d41aa4

Browse files
committed
Fixed minor NPE warnings
1 parent 1a02ddc commit 6d41aa4

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

jooq-dialect/src/main/java/org/jooq/impl/FieldMapsForUpsertReplace.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
import java.util.Map.Entry;
1313
import java.util.Set;
1414
import java.util.stream.IntStream;
15+
1516
import org.jooq.Context;
1617
import org.jooq.DataType;
1718
import org.jooq.Field;
1819
import org.jooq.Record;
1920
import org.jooq.RenderContext.CastMode;
2021
import org.jooq.Select;
2122
import org.jooq.Table;
23+
2224
import static org.jooq.impl.Keywords.K_VALUES;
2325
import static org.jooq.impl.Tools.BooleanDataKey.DATA_STORE_ASSIGNMENT;
2426

@@ -78,10 +80,9 @@ public Select<Record> upsertSelect() {
7880
Map<Field<?>, List<Field<?>>> v = valuesFlattened();
7981

8082
return IntStream.range(0, rows)
81-
.mapToObj(row -> (Select<Record>) DSL.select(Tools.map(v.entrySet(),
82-
e -> patchDefault0(e.getValue().get(row), e.getKey()))))
83+
.mapToObj(row -> (Select<Record>) DSL.select(Tools.map(v.entrySet(), e -> patchDefault0(e.getValue().get(row), e.getKey()))))
8384
.reduce(Select::unionAll)
84-
.orElse(null);
85+
.orElseThrow();
8586
}
8687

8788
private void toSQL92Values(Context<?> ctx) {

jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbIndexDefinition.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package tech.ydb.jooq.codegen;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import org.jooq.SortOrder;
47
import org.jooq.meta.AbstractIndexDefinition;
58
import org.jooq.meta.ColumnDefinition;
69
import org.jooq.meta.DefaultIndexColumnDefinition;
710
import org.jooq.meta.IndexColumnDefinition;
811
import org.jooq.meta.SchemaDefinition;
912
import org.jooq.meta.TableDefinition;
10-
import tech.ydb.table.description.TableIndex;
1113

12-
import java.util.ArrayList;
13-
import java.util.List;
14+
import tech.ydb.table.description.TableIndex;
1415

1516
public class YdbIndexDefinition extends AbstractIndexDefinition {
1617
private final TableIndex tableIndex;
@@ -29,6 +30,9 @@ protected List<IndexColumnDefinition> getIndexColumns0() {
2930

3031
for (String column : columns) {
3132
ColumnDefinition columnDefinition = getTable().getColumn(column);
33+
if (columnDefinition == null) {
34+
continue;
35+
}
3236

3337
IndexColumnDefinition definition = new DefaultIndexColumnDefinition(
3438
this,

0 commit comments

Comments
 (0)