Skip to content

Commit 157f7b6

Browse files
KirillKurdyukovKirillKurdyukov
authored
dev: ydb jdbc driver make provided & remove org.jetbrains (#152)
1 parent 276fb5d commit 157f7b6

File tree

72 files changed

+1467
-1640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1467
-1640
lines changed

‎jooq-dialect/pom.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>tech.ydb.dialects</groupId>
66
<artifactId>jooq-ydb-dialect</artifactId>
7-
<version>1.0.0-RC0</version>
7+
<version>1.0.0-RC1</version>
88

99
<name>YDB JOOQ Dialect module</name>
1010
<description>YDB JOOQ Dialect module</description>
@@ -36,6 +36,12 @@
3636
<name>Ilya Kriushenkov</name>
3737
<email>[email protected]</email>
3838
</developer>
39+
<developer>
40+
<name>Kirill Kurdyukov</name>
41+
<email>[email protected]</email>
42+
<organization>YDB</organization>
43+
<organizationUrl>https://ydb.tech/</organizationUrl>
44+
</developer>
3945
</developers>
4046

4147
<properties>
@@ -47,7 +53,7 @@
4753
<jooq.version>3.19.0</jooq.version>
4854

4955
<ydb.sdk.version>2.2.6</ydb.sdk.version>
50-
<ydb.jdbc.version>2.1.5</ydb.jdbc.version>
56+
<ydb.jdbc.version>2.2.3</ydb.jdbc.version>
5157
</properties>
5258

5359
<dependencies>
@@ -63,18 +69,13 @@
6369
<version>${jooq.version}</version>
6470
<scope>provided</scope>
6571
</dependency>
66-
<dependency>
67-
<groupId>org.jetbrains</groupId>
68-
<artifactId>annotations</artifactId>
69-
<version>24.1.0</version>
70-
<scope>compile</scope>
71-
</dependency>
7272
<dependency>
7373
<groupId>tech.ydb.jdbc</groupId>
74-
<artifactId>ydb-jdbc-driver-shaded</artifactId>
74+
<artifactId>ydb-jdbc-driver</artifactId>
7575
<version>${ydb.jdbc.version}</version>
76-
<scope>compile</scope>
76+
<scope>provided</scope>
7777
</dependency>
78+
7879
<dependency>
7980
<groupId>tech.ydb.test</groupId>
8081
<artifactId>ydb-junit5-support</artifactId>

‎jooq-dialect/src/main/java/tech/ydb/jooq/YDB.java

Lines changed: 19 additions & 104 deletions
Large diffs are not rendered by default.

‎jooq-dialect/src/main/java/tech/ydb/jooq/YdbDSLContext.java

Lines changed: 52 additions & 53 deletions
Large diffs are not rendered by default.

‎jooq-dialect/src/main/java/tech/ydb/jooq/YdbFunction.java

Lines changed: 318 additions & 519 deletions
Large diffs are not rendered by default.

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/DateBinding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class DateBinding extends AbstractBinding<LocalDate, LocalDate> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Date);
2120

22-
@NotNull
2321
@Override
2422
public Converter<LocalDate, LocalDate> converter() {
2523
return new IdentityConverter<>(LocalDate.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/DatetimeBinding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class DatetimeBinding extends AbstractBinding<LocalDateTime, LocalD
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Datetime);
2120

22-
@NotNull
2321
@Override
2422
public Converter<LocalDateTime, LocalDateTime> converter() {
2523
return new IdentityConverter<>(LocalDateTime.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
3+
import java.sql.SQLException;
4+
import java.time.Duration;
45
import org.jooq.BindingGetResultSetContext;
56
import org.jooq.BindingSetStatementContext;
67
import org.jooq.Converter;
78
import org.jooq.impl.AbstractBinding;
89
import org.jooq.types.YearToSecond;
10+
import static tech.ydb.jooq.binding.BindingTools.indexType;
911
import tech.ydb.table.values.PrimitiveType;
1012
import tech.ydb.table.values.PrimitiveValue;
1113

12-
import java.sql.SQLException;
13-
import java.time.Duration;
14-
15-
import static tech.ydb.jooq.binding.BindingTools.indexType;
16-
1714
@SuppressWarnings("resource")
1815
public final class IntervalBinding extends AbstractBinding<YearToSecond, Duration> {
1916

2017
private static final int INDEX_TYPE = indexType(PrimitiveType.Interval);
2118

22-
@NotNull
19+
2320
@Override
2421
public Converter<YearToSecond, Duration> converter() {
2522
return new IntervalConverter();
@@ -51,13 +48,11 @@ public YearToSecond to(Duration userObject) {
5148
return YearToSecond.valueOf(userObject);
5249
}
5350

54-
@NotNull
5551
@Override
5652
public Class<YearToSecond> fromType() {
5753
return YearToSecond.class;
5854
}
5955

60-
@NotNull
6156
@Override
6257
public Class<Duration> toType() {
6358
return Duration.class;

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonBinding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class JsonBinding extends AbstractBinding<JSON, JSON> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Json);
2120

22-
@NotNull
2321
@Override
2422
public Converter<JSON, JSON> converter() {
2523
return new IdentityConverter<>(JSON.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonDocumentBinding.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
3+
import java.sql.SQLException;
44
import org.jooq.BindingGetResultSetContext;
55
import org.jooq.BindingSetStatementContext;
66
import org.jooq.Converter;
77
import org.jooq.JSONB;
88
import org.jooq.impl.AbstractBinding;
99
import org.jooq.impl.IdentityConverter;
10+
import static tech.ydb.jooq.binding.BindingTools.indexType;
1011
import tech.ydb.table.values.PrimitiveType;
1112
import tech.ydb.table.values.PrimitiveValue;
1213

13-
import java.sql.SQLException;
14-
15-
import static tech.ydb.jooq.binding.BindingTools.indexType;
16-
1714
@SuppressWarnings("resource")
1815
public final class JsonDocumentBinding extends AbstractBinding<JSONB, JSONB> {
1916

2017
private static final int INDEX_TYPE = indexType(PrimitiveType.JsonDocument);
2118

22-
@NotNull
2319
@Override
2420
public Converter<JSONB, JSONB> converter() {
2521
return new IdentityConverter<>(JSONB.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
3+
import java.sql.SQLException;
4+
import java.time.Instant;
5+
import java.time.LocalDateTime;
6+
import java.time.ZoneOffset;
47
import org.jooq.BindingGetResultSetContext;
58
import org.jooq.BindingSetStatementContext;
69
import org.jooq.Converter;
710
import org.jooq.impl.AbstractBinding;
11+
import static tech.ydb.jooq.binding.BindingTools.indexType;
812
import tech.ydb.table.values.PrimitiveType;
913
import tech.ydb.table.values.PrimitiveValue;
1014

11-
import java.sql.SQLException;
12-
import java.time.Instant;
13-
import java.time.LocalDateTime;
14-
import java.time.ZoneOffset;
15-
16-
import static tech.ydb.jooq.binding.BindingTools.indexType;
17-
1815
@SuppressWarnings("resource")
1916
public final class TimestampBinding extends AbstractBinding<LocalDateTime, Instant> {
2017

2118
private static final int INDEX_TYPE = indexType(PrimitiveType.Timestamp);
2219

23-
@NotNull
2420
@Override
2521
public Converter<LocalDateTime, Instant> converter() {
2622
return new TimestampConverter();
@@ -52,13 +48,11 @@ public LocalDateTime to(Instant userObject) {
5248
return LocalDateTime.ofInstant(userObject, ZoneOffset.UTC);
5349
}
5450

55-
@NotNull
5651
@Override
5752
public Class<LocalDateTime> fromType() {
5853
return LocalDateTime.class;
5954
}
6055

61-
@NotNull
6256
@Override
6357
public Class<Instant> toType() {
6458
return Instant.class;

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDateBinding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class TzDateBinding extends AbstractBinding<ZonedDateTime, ZonedDat
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.TzDate);
2120

22-
@NotNull
2321
@Override
2422
public Converter<ZonedDateTime, ZonedDateTime> converter() {
2523
return new IdentityConverter<>(ZonedDateTime.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDatetimeBinding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class TzDatetimeBinding extends AbstractBinding<ZonedDateTime, Zone
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.TzDatetime);
2120

22-
@NotNull
2321
@Override
2422
public Converter<ZonedDateTime, ZonedDateTime> converter() {
2523
return new IdentityConverter<>(ZonedDateTime.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzTimestampBinding.java

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

3-
import org.jetbrains.annotations.NotNull;
3+
import java.sql.SQLException;
4+
import java.time.ZonedDateTime;
45
import org.jooq.BindingGetResultSetContext;
56
import org.jooq.BindingSetStatementContext;
67
import org.jooq.Converter;
78
import org.jooq.impl.AbstractBinding;
89
import org.jooq.impl.IdentityConverter;
10+
import static tech.ydb.jooq.binding.BindingTools.indexType;
911
import tech.ydb.table.values.PrimitiveType;
1012
import tech.ydb.table.values.PrimitiveValue;
1113

12-
import java.sql.SQLException;
13-
import java.time.ZonedDateTime;
14-
15-
import static tech.ydb.jooq.binding.BindingTools.indexType;
16-
1714
@SuppressWarnings("resource")
1815
public final class TzTimestampBinding extends AbstractBinding<ZonedDateTime, ZonedDateTime> {
1916

2017
private static final int INDEX_TYPE = indexType(PrimitiveType.TzTimestamp);
2118

22-
@NotNull
2319
@Override
2420
public Converter<ZonedDateTime, ZonedDateTime> converter() {
2521
return new IdentityConverter<>(ZonedDateTime.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint16Binding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint16Binding extends AbstractBinding<UShort, UShort> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Uint16);
2120

22-
@NotNull
2321
@Override
2422
public Converter<UShort, UShort> converter() {
2523
return new IdentityConverter<>(UShort.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint32Binding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint32Binding extends AbstractBinding<UInteger, UInteger> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Uint32);
2120

22-
@NotNull
2321
@Override
2422
public Converter<UInteger, UInteger> converter() {
2523
return new IdentityConverter<>(UInteger.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint64Binding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint64Binding extends AbstractBinding<ULong, ULong> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Uint64);
2120

22-
@NotNull
2321
@Override
2422
public Converter<ULong, ULong> converter() {
2523
return new IdentityConverter<>(ULong.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint8Binding.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint8Binding extends AbstractBinding<UByte, UByte> {
1918

2019
private static final int INDEX_TYPE = indexType(PrimitiveType.Uint8);
2120

22-
@NotNull
2321
@Override
2422
public Converter<UByte, UByte> converter() {
2523
return new IdentityConverter<>(UByte.class);

‎jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package tech.ydb.jooq.binding;
22

3-
import org.jetbrains.annotations.NotNull;
43
import org.jooq.BindingGetResultSetContext;
54
import org.jooq.BindingSetStatementContext;
65
import org.jooq.Converter;
@@ -18,7 +17,6 @@ public final class YsonBinding extends AbstractBinding<Object, YSON> {
1817

1918
private static final int INDEX_TYPE = indexType(PrimitiveType.Yson);
2019

21-
@NotNull
2220
@Override
2321
public Converter<Object, YSON> converter() {
2422
return new YsonConverter();
@@ -50,13 +48,12 @@ public Object to(YSON userObject) {
5048
return userObject;
5149
}
5250

53-
@NotNull
51+
5452
@Override
5553
public Class<Object> fromType() {
5654
return Object.class;
5755
}
5856

59-
@NotNull
6057
@Override
6158
public Class<YSON> toType() {
6259
return YSON.class;

0 commit comments

Comments
 (0)