Skip to content

Commit 2277867

Browse files
committed
Reverted boot3 compatible dialect provider
1 parent 0dbd5a4 commit 2277867

File tree

5 files changed

+11
-18
lines changed

5 files changed

+11
-18
lines changed

spring-data-jdbc-ydb/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
## Overview
88

9-
This project is an extension for Spring Data JDBC
9+
This project is an extension for Spring Data JDBC
1010
that provides support for working with [YDB](https://ydb.tech).
1111

1212
### Features
1313

14-
- Full support for basic operations with Spring Data JDBC
14+
- Full support for basic operations with Spring Data JDBC
1515
- Supported VIEW INDEX statement from @ViewIndex annotation on method your Repository
1616
- @YdbType explicitly specifies the YDB data type (Json example in String type)
1717

@@ -22,7 +22,7 @@ that provides support for working with [YDB](https://ydb.tech).
2222
To use this Spring Data JDBC YDB Dialect, you'll need:
2323

2424
- Java 17 or above.
25-
- Spring Data JDBC 3+
25+
- Spring Data JDBC 3.5+
2626
- [YDB JDBC Driver](https://github.com/ydb-platform/ydb-jdbc-driver)
2727
- Access to a YDB Database instance
2828

@@ -35,7 +35,7 @@ For Maven, add the following dependency to your pom.xml:
3535
<groupId>tech.ydb.dialects</groupId>
3636
<artifactId>spring-data-jdbc-ydb</artifactId>
3737
<!-- Set actual version -->
38-
<version>${spring.data.jdbc.ydb.version}</version>
38+
<version>${spring.data.jdbc.ydb.version}</version>
3939
</dependency>
4040
```
4141

spring-data-jdbc-ydb/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,6 @@
165165
</plugins>
166166
</build>
167167
<profiles>
168-
<!-- <profile>
169-
<id>spring-boot2</id>
170-
<properties>
171-
<spring.version>2.7.18</spring.version>
172-
</properties>
173-
</profile>-->
174168
<profile>
175169
<id>spring-boot3</id>
176170
<properties>

spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/AbstractYdbJdbcConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import org.springframework.context.annotation.Import;
55
import org.springframework.context.annotation.Lazy;
66
import org.springframework.data.jdbc.core.convert.DefaultJdbcTypeFactory;
7+
import org.springframework.data.jdbc.core.convert.JdbcArrayColumns;
78
import org.springframework.data.jdbc.core.convert.JdbcConverter;
89
import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
910
import org.springframework.data.jdbc.core.convert.RelationResolver;
10-
import org.springframework.data.jdbc.core.dialect.JdbcArrayColumns;
1111
import org.springframework.data.jdbc.core.dialect.JdbcDialect;
1212
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
1313
import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
@@ -25,7 +25,7 @@
2525
public class AbstractYdbJdbcConfiguration extends AbstractJdbcConfiguration {
2626

2727
// Spring Boot 4 support
28-
@SuppressWarnings("override")
28+
@SuppressWarnings({"override", "removal"})
2929
public JdbcConverter jdbcConverter(
3030
JdbcMappingContext mappingContext,
3131
NamedParameterJdbcOperations operations,
@@ -41,7 +41,7 @@ public JdbcConverter jdbcConverter(
4141
}
4242

4343
// Spring Boot 3 support
44-
@SuppressWarnings("override")
44+
@SuppressWarnings({"override", "removal"})
4545
public JdbcConverter jdbcConverter(
4646
JdbcMappingContext mappingContext,
4747
NamedParameterJdbcOperations operations,

spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/YdbDialectProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import java.util.Locale;
66
import java.util.Optional;
77

8-
import org.springframework.data.jdbc.core.dialect.DialectResolver;
9-
import org.springframework.data.jdbc.core.dialect.JdbcDialect;
8+
import org.springframework.data.jdbc.repository.config.DialectResolver;
109
import org.springframework.data.relational.core.dialect.Dialect;
1110
import org.springframework.jdbc.core.ConnectionCallback;
1211
import org.springframework.jdbc.core.JdbcOperations;
@@ -16,6 +15,7 @@
1615
/**
1716
* @author Madiyar Nurgazin
1817
*/
18+
@SuppressWarnings("removal") // Spring Boot 3 support
1919
public class YdbDialectProvider extends DialectResolver.DefaultDialectProvider {
2020
@Override
2121
public Optional<Dialect> getDialect(JdbcOperations operations) {
@@ -30,7 +30,7 @@ public Optional<Dialect> getDialect(JdbcOperations operations) {
3030
return super.getDialect(operations);
3131
}
3232

33-
private static JdbcDialect getDialect(Connection connection) throws SQLException {
33+
private static Dialect getDialect(Connection connection) throws SQLException {
3434
if ("ydb".contains(connection.getMetaData().getDatabaseProductName().toLowerCase(Locale.ENGLISH))) {
3535
return YdbDialect.INSTANCE;
3636
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
org.springframework.data.jdbc.core.dialect.DialectResolver$JdbcDialectProvider=tech.ydb.data.repository.config.YdbDialectProvider
2-
1+
org.springframework.data.jdbc.repository.config.DialectResolver$JdbcDialectProvider=tech.ydb.data.repository.config.YdbDialectProvider

0 commit comments

Comments
 (0)