dev: ydb jdbc driver make provided & remove org.jetbrains (#152)

ydb-platform · Sep 3, 2024 · 157f7b6 · 157f7b6
1 parent 276fb5d
commit 157f7b6
Show file tree

Hide file tree

Showing 72 changed files with 1,467 additions and 1,640 deletions.
diff --git a/jooq-dialect/pom.xml b/jooq-dialect/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>tech.ydb.dialects</groupId>
     <artifactId>jooq-ydb-dialect</artifactId>
-    <version>1.0.0-RC0</version>
+    <version>1.0.0-RC1</version>
 
     <name>YDB JOOQ Dialect module</name>
     <description>YDB JOOQ Dialect module</description>
@@ -36,6 +36,12 @@
             <name>Ilya Kriushenkov</name>
             <email>[email protected]</email>
         </developer>
+        <developer>
+            <name>Kirill Kurdyukov</name>
+            <email>[email protected]</email>
+            <organization>YDB</organization>
+            <organizationUrl>https://ydb.tech/</organizationUrl>
+        </developer>
     </developers>
 
     <properties>
@@ -47,7 +53,7 @@
         <jooq.version>3.19.0</jooq.version>
 
         <ydb.sdk.version>2.2.6</ydb.sdk.version>
-        <ydb.jdbc.version>2.1.5</ydb.jdbc.version>
+        <ydb.jdbc.version>2.2.3</ydb.jdbc.version>
     </properties>
 
     <dependencies>
@@ -63,18 +69,13 @@
             <version>${jooq.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>24.1.0</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>tech.ydb.jdbc</groupId>
-            <artifactId>ydb-jdbc-driver-shaded</artifactId>
+            <artifactId>ydb-jdbc-driver</artifactId>
             <version>${ydb.jdbc.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-junit5-support</artifactId>

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/YDB.java b/jooq-dialect/src/main/java/tech/ydb/jooq/YDB.java
diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/YdbDSLContext.java b/jooq-dialect/src/main/java/tech/ydb/jooq/YdbDSLContext.java
diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/YdbFunction.java b/jooq-dialect/src/main/java/tech/ydb/jooq/YdbFunction.java
diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/DateBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/DateBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class DateBinding extends AbstractBinding<LocalDate, LocalDate> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Date);
 
-    @NotNull
     @Override
     public Converter<LocalDate, LocalDate> converter() {
         return new IdentityConverter<>(LocalDate.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/DatetimeBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/DatetimeBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class DatetimeBinding extends AbstractBinding<LocalDateTime, LocalD
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Datetime);
 
-    @NotNull
     @Override
     public Converter<LocalDateTime, LocalDateTime> converter() {
         return new IdentityConverter<>(LocalDateTime.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java
@@ -1,25 +1,22 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
+import java.sql.SQLException;
+import java.time.Duration;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
 import org.jooq.impl.AbstractBinding;
 import org.jooq.types.YearToSecond;
+import static tech.ydb.jooq.binding.BindingTools.indexType;
 import tech.ydb.table.values.PrimitiveType;
 import tech.ydb.table.values.PrimitiveValue;
 
-import java.sql.SQLException;
-import java.time.Duration;
-
-import static tech.ydb.jooq.binding.BindingTools.indexType;
-
 @SuppressWarnings("resource")
 public final class IntervalBinding extends AbstractBinding<YearToSecond, Duration> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Interval);
 
-    @NotNull
+
     @Override
     public Converter<YearToSecond, Duration> converter() {
         return new IntervalConverter();
@@ -51,13 +48,11 @@ public YearToSecond to(Duration userObject) {
             return YearToSecond.valueOf(userObject);
         }
 
-        @NotNull
         @Override
         public Class<YearToSecond> fromType() {
             return YearToSecond.class;
         }
 
-        @NotNull
         @Override
         public Class<Duration> toType() {
             return Duration.class;

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class JsonBinding extends AbstractBinding<JSON, JSON> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Json);
 
-    @NotNull
     @Override
     public Converter<JSON, JSON> converter() {
         return new IdentityConverter<>(JSON.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonDocumentBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/JsonDocumentBinding.java
@@ -1,25 +1,21 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
+import java.sql.SQLException;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
 import org.jooq.JSONB;
 import org.jooq.impl.AbstractBinding;
 import org.jooq.impl.IdentityConverter;
+import static tech.ydb.jooq.binding.BindingTools.indexType;
 import tech.ydb.table.values.PrimitiveType;
 import tech.ydb.table.values.PrimitiveValue;
 
-import java.sql.SQLException;
-
-import static tech.ydb.jooq.binding.BindingTools.indexType;
-
 @SuppressWarnings("resource")
 public final class JsonDocumentBinding extends AbstractBinding<JSONB, JSONB> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.JsonDocument);
 
-    @NotNull
     @Override
     public Converter<JSONB, JSONB> converter() {
         return new IdentityConverter<>(JSONB.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java
@@ -1,26 +1,22 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
+import java.sql.SQLException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
 import org.jooq.impl.AbstractBinding;
+import static tech.ydb.jooq.binding.BindingTools.indexType;
 import tech.ydb.table.values.PrimitiveType;
 import tech.ydb.table.values.PrimitiveValue;
 
-import java.sql.SQLException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-
-import static tech.ydb.jooq.binding.BindingTools.indexType;
-
 @SuppressWarnings("resource")
 public final class TimestampBinding extends AbstractBinding<LocalDateTime, Instant> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Timestamp);
 
-    @NotNull
     @Override
     public Converter<LocalDateTime, Instant> converter() {
         return new TimestampConverter();
@@ -52,13 +48,11 @@ public LocalDateTime to(Instant userObject) {
             return LocalDateTime.ofInstant(userObject, ZoneOffset.UTC);
         }
 
-        @NotNull
         @Override
         public Class<LocalDateTime> fromType() {
             return LocalDateTime.class;
         }
 
-        @NotNull
         @Override
         public Class<Instant> toType() {
             return Instant.class;

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDateBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDateBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class TzDateBinding extends AbstractBinding<ZonedDateTime, ZonedDat
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.TzDate);
 
-    @NotNull
     @Override
     public Converter<ZonedDateTime, ZonedDateTime> converter() {
         return new IdentityConverter<>(ZonedDateTime.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDatetimeBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzDatetimeBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class TzDatetimeBinding extends AbstractBinding<ZonedDateTime, Zone
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.TzDatetime);
 
-    @NotNull
     @Override
     public Converter<ZonedDateTime, ZonedDateTime> converter() {
         return new IdentityConverter<>(ZonedDateTime.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzTimestampBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TzTimestampBinding.java
@@ -1,25 +1,21 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
+import java.sql.SQLException;
+import java.time.ZonedDateTime;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
 import org.jooq.impl.AbstractBinding;
 import org.jooq.impl.IdentityConverter;
+import static tech.ydb.jooq.binding.BindingTools.indexType;
 import tech.ydb.table.values.PrimitiveType;
 import tech.ydb.table.values.PrimitiveValue;
 
-import java.sql.SQLException;
-import java.time.ZonedDateTime;
-
-import static tech.ydb.jooq.binding.BindingTools.indexType;
-
 @SuppressWarnings("resource")
 public final class TzTimestampBinding extends AbstractBinding<ZonedDateTime, ZonedDateTime> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.TzTimestamp);
 
-    @NotNull
     @Override
     public Converter<ZonedDateTime, ZonedDateTime> converter() {
         return new IdentityConverter<>(ZonedDateTime.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint16Binding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint16Binding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint16Binding extends AbstractBinding<UShort, UShort> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Uint16);
 
-    @NotNull
     @Override
     public Converter<UShort, UShort> converter() {
         return new IdentityConverter<>(UShort.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint32Binding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint32Binding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint32Binding extends AbstractBinding<UInteger, UInteger> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Uint32);
 
-    @NotNull
     @Override
     public Converter<UInteger, UInteger> converter() {
         return new IdentityConverter<>(UInteger.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint64Binding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint64Binding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint64Binding extends AbstractBinding<ULong, ULong> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Uint64);
 
-    @NotNull
     @Override
     public Converter<ULong, ULong> converter() {
         return new IdentityConverter<>(ULong.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint8Binding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Uint8Binding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -19,7 +18,6 @@ public final class Uint8Binding extends AbstractBinding<UByte, UByte> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Uint8);
 
-    @NotNull
     @Override
     public Converter<UByte, UByte> converter() {
         return new IdentityConverter<>(UByte.class);

diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java
@@ -1,6 +1,5 @@
 package tech.ydb.jooq.binding;
 
-import org.jetbrains.annotations.NotNull;
 import org.jooq.BindingGetResultSetContext;
 import org.jooq.BindingSetStatementContext;
 import org.jooq.Converter;
@@ -18,7 +17,6 @@ public final class YsonBinding extends AbstractBinding<Object, YSON> {
 
     private static final int INDEX_TYPE = indexType(PrimitiveType.Yson);
 
-    @NotNull
     @Override
     public Converter<Object, YSON> converter() {
         return new YsonConverter();
@@ -50,13 +48,12 @@ public Object to(YSON userObject) {
             return userObject;
         }
 
-        @NotNull
+
         @Override
         public Class<Object> fromType() {
             return Object.class;
         }
 
-        @NotNull
         @Override
         public Class<YSON> toType() {
             return YSON.class;