GH-2031 Introduced new JDBC dialect counterparts

Author: mipo256

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcDb2Dialect.java

@@ -33,7 +33,7 @@
  * @author Christoph Strobl
  * @since 2.3
  */
-public class JdbcDb2Dialect extends Db2Dialect {
+public class JdbcDb2Dialect extends Db2Dialect implements JdbcDialect {
 
 	public static JdbcDb2Dialect INSTANCE = new JdbcDb2Dialect();
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcDialect.java

@@ -22,6 +22,7 @@
  * {@link org.springframework.data.relational.core.dialect.ArrayColumns} that offer JDBC specific functionality.
  *
  * @author Jens Schauder
+ * @author Mikhail Polivakha
  * @since 2.3
  */
 public interface JdbcDialect extends Dialect {
@@ -33,6 +34,7 @@ public interface JdbcDialect extends Dialect {
 	 * @return the JDBC specific array support object that describes how array-typed columns are supported by this
 	 *         dialect.
 	 */
-	@Override
-	JdbcArrayColumns getArraySupport();
+	default JdbcArrayColumns getArraySupport() {
+		return JdbcArrayColumns.Unsupported.INSTANCE;
+	}
 }

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcH2Dialect.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.jdbc.core.dialect;
+
+import org.springframework.data.relational.core.dialect.H2Dialect;
+
+/**
+ * JDBC specific H2 Dialect.
+ *
+ * @author Mikhail Polivakha
+ */
+public class JdbcH2Dialect extends H2Dialect implements JdbcDialect {
+
+	public static JdbcH2Dialect INSTANCE = new JdbcH2Dialect();
+}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcHsqlDbDialect.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.jdbc.core.dialect;
+
+import org.springframework.data.relational.core.dialect.HsqlDbDialect;
+
+/**
+ * JDBC specific HsqlDB Dialect.
+ *
+ * @author Mikhail Polivakha
+ */
+public class JdbcHsqlDbDialect extends HsqlDbDialect implements JdbcDialect {
+
+	public static JdbcHsqlDbDialect INSTANCE = new JdbcHsqlDbDialect();
+}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcMariaDbDialect.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.jdbc.core.dialect;
+
+import org.springframework.data.relational.core.dialect.MariaDbDialect;
+import org.springframework.data.relational.core.sql.IdentifierProcessing;
+
+/**
+ * JDBC specific MariaDb Dialect.
+ *
+ * @author Mikhail Polivakha
+ */
+public class JdbcMariaDbDialect extends MariaDbDialect implements JdbcDialect {
+
+	public JdbcMariaDbDialect(IdentifierProcessing identifierProcessing) {
+		super(identifierProcessing);
+	}
+}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcMySqlDialect.java

@@ -38,9 +38,12 @@
  *
  * @author Jens Schauder
  * @author Christoph Strobl
+ * @author Mikhail Polivakha
  * @since 2.3
  */
-public class JdbcMySqlDialect extends MySqlDialect {
+public class JdbcMySqlDialect extends MySqlDialect implements JdbcDialect {
+
+	public static JdbcMySqlDialect INSTANCE = new JdbcMySqlDialect();
 
 	public JdbcMySqlDialect(IdentifierProcessing identifierProcessing) {
 		super(identifierProcessing);

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcOracleDialect.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.jdbc.core.dialect;
+
+import org.springframework.data.relational.core.dialect.OracleDialect;
+
+/**
+ * JDBC specific Oracle Dialect.
+ *
+ * @author Mikhail Polivakha
+ */
+public class JdbcOracleDialect extends OracleDialect implements JdbcDialect {
+
+	public static JdbcOracleDialect INSTANCE = new JdbcOracleDialect();
+}

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialect.java

@@ -35,7 +35,7 @@
  * @author Mikhail Polivakha
  * @since 2.3
  */
-public class JdbcSqlServerDialect extends SqlServerDialect {
+public class JdbcSqlServerDialect extends SqlServerDialect implements JdbcDialect {
 
 	public static JdbcSqlServerDialect INSTANCE = new JdbcSqlServerDialect();
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java

@@ -29,14 +29,15 @@
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.dao.NonTransientDataAccessException;
 import org.springframework.data.jdbc.core.dialect.JdbcDb2Dialect;
+import org.springframework.data.jdbc.core.dialect.JdbcDialect;
+import org.springframework.data.jdbc.core.dialect.JdbcH2Dialect;
+import org.springframework.data.jdbc.core.dialect.JdbcHsqlDbDialect;
+import org.springframework.data.jdbc.core.dialect.JdbcMariaDbDialect;
 import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect;
+import org.springframework.data.jdbc.core.dialect.JdbcOracleDialect;
 import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect;
 import org.springframework.data.jdbc.core.dialect.JdbcSqlServerDialect;
 import org.springframework.data.relational.core.dialect.Dialect;
-import org.springframework.data.relational.core.dialect.H2Dialect;
-import org.springframework.data.relational.core.dialect.HsqlDbDialect;
-import org.springframework.data.relational.core.dialect.MariaDbDialect;
-import org.springframework.data.relational.core.dialect.OracleDialect;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 import org.springframework.data.util.Optionals;
 import org.springframework.jdbc.core.ConnectionCallback;
@@ -50,6 +51,7 @@
  * available {@link JdbcDialectProvider extensions}.
  *
  * @author Jens Schauder
+ * @author Mikhail Polivakha
  * @since 2.0
  * @see Dialect
  * @see SpringFactoriesLoader
@@ -109,23 +111,23 @@ public Optional<Dialect> getDialect(JdbcOperations operations) {
 		}
 
 		@Nullable
-		private static Dialect getDialect(Connection connection) throws SQLException {
+		private static JdbcDialect getDialect(Connection connection) throws SQLException {
 
 			DatabaseMetaData metaData = connection.getMetaData();
 
 			String name = metaData.getDatabaseProductName().toLowerCase(Locale.ENGLISH);
 
 			if (name.contains("hsql")) {
-				return HsqlDbDialect.INSTANCE;
+				return JdbcHsqlDbDialect.INSTANCE;
 			}
 			if (name.contains("h2")) {
-				return H2Dialect.INSTANCE;
+				return JdbcH2Dialect.INSTANCE;
 			}
 			if (name.contains("mysql")) {
 				return new JdbcMySqlDialect(getIdentifierProcessing(metaData));
 			}
 			if (name.contains("mariadb")) {
-				return new MariaDbDialect(getIdentifierProcessing(metaData));
+				return new JdbcMariaDbDialect(getIdentifierProcessing(metaData));
 			}
 			if (name.contains("postgresql")) {
 				return JdbcPostgresDialect.INSTANCE;
@@ -137,7 +139,7 @@ private static Dialect getDialect(Connection connection) throws SQLException {
 				return JdbcDb2Dialect.INSTANCE;
 			}
 			if (name.contains("oracle")) {
-				return OracleDialect.INSTANCE;
+				return JdbcOracleDialect.INSTANCE;
 			}
 
 			LOG.info(String.format("Couldn't determine Dialect for \"%s\"", name));

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java

@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.jdbc.core.dialect.JdbcHsqlDbDialect;
 import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
 import org.springframework.data.relational.core.conversion.IdValueSource;
 import org.springframework.data.relational.core.dialect.Dialect;
@@ -58,7 +59,7 @@ class DefaultDataAccessStrategyUnitTests {
 	void before() {
 
 		DelegatingDataAccessStrategy relationResolver = new DelegatingDataAccessStrategy();
-		Dialect dialect = HsqlDbDialect.INSTANCE;
+		Dialect dialect = JdbcHsqlDbDialect.INSTANCE;
 		converter = new MappingJdbcConverter(context, relationResolver, new JdbcCustomConversions(),
 				new DefaultJdbcTypeFactory(jdbcOperations));
 		accessStrategy = new DataAccessStrategyFactory( //