remove deprecated/obsolete Dialect-related stuff

mbladel · Dec 1, 2024 · d5b7289 · d5b7289
1 parent 2a4f430
commit d5b7289
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 60 deletions.
diff --git a/...te-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/...te-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java
@@ -25,6 +25,7 @@
 import org.hibernate.LockOptions;
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.boot.model.TypeContributions;
+import org.hibernate.community.dialect.sequence.LegacyDB2SequenceSupport;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.DB2GetObjectExtractor;
 import org.hibernate.dialect.DB2StructJdbcType;
@@ -47,7 +48,6 @@
 import org.hibernate.dialect.pagination.LegacyDB2LimitHandler;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.sequence.DB2SequenceSupport;
-import org.hibernate.dialect.sequence.LegacyDB2SequenceSupport;
 import org.hibernate.dialect.sequence.SequenceSupport;
 import org.hibernate.dialect.unique.AlterTableUniqueIndexDelegate;
 import org.hibernate.dialect.unique.SkipNullableUniqueDelegate;

diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java
@@ -7,8 +7,8 @@
 import org.hibernate.boot.model.FunctionContributions;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.function.CommonFunctionFactory;
-import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
 import org.hibernate.dialect.identity.DB2IdentityColumnSupport;
+import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.pagination.FetchLimitHandler;
 import org.hibernate.dialect.pagination.LegacyDB2LimitHandler;
@@ -129,7 +129,7 @@ public LimitHandler getLimitHandler() {
 	public IdentityColumnSupport getIdentityColumnSupport() {
 		return getVersion().isSameOrAfter(7, 3)
 				? DB2IdentityColumnSupport.INSTANCE
-				: DB2390IdentityColumnSupport.INSTANCE;
+				: DB2zIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/...e-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java
@@ -9,7 +9,7 @@
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.TimeZoneSupport;
 import org.hibernate.dialect.function.CommonFunctionFactory;
-import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
+import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
 import org.hibernate.dialect.identity.IdentityColumnSupport;
 import org.hibernate.dialect.pagination.FetchLimitHandler;
 import org.hibernate.dialect.pagination.LimitHandler;
@@ -146,7 +146,7 @@ public LimitHandler getLimitHandler() {
 
 	@Override
 	public IdentityColumnSupport getIdentityColumnSupport() {
-		return DB2390IdentityColumnSupport.INSTANCE;
+		return DB2zIdentityColumnSupport.INSTANCE;
 	}
 
 	@Override

diff --git a/...munity-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/...munity-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java
@@ -199,7 +199,6 @@ private static boolean isAnsiNull(DatabaseMetaData databaseMetaData) {
 		return false;
 	}
 
-	@Override
 	public boolean isAnsiNullOn() {
 		return ansiNull;
 	}

diff --git a/...alects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/...alects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java
@@ -393,7 +393,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 			}
 		}
 		// I think intersect is only supported in 16.0 SP3
-		if ( getDialect().isAnsiNullOn() ) {
+		if ( ( (SybaseASELegacyDialect) getDialect() ).isAnsiNullOn() ) {
 			if ( isLob ) {
 				switch ( operator ) {
 					case DISTINCT_FROM:

diff --git a/...ct/sequence/LegacyDB2SequenceSupport.java → ...ct/sequence/LegacyDB2SequenceSupport.java b/...ct/sequence/LegacyDB2SequenceSupport.java → ...ct/sequence/LegacyDB2SequenceSupport.java
@@ -2,18 +2,16 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.dialect.sequence;
+package org.hibernate.community.dialect.sequence;
 
 import org.hibernate.MappingException;
+import org.hibernate.dialect.sequence.SequenceSupport;
 
 /**
  * Sequence support for {@link org.hibernate.dialect.DB2Dialect}.
  *
  * @author Gavin King
- *
- * @deprecated use {@code DB2SequenceSupport}
  */
-@Deprecated(since="6.4")
 public class LegacyDB2SequenceSupport implements SequenceSupport {
 
 	public static final SequenceSupport INSTANCE = new LegacyDB2SequenceSupport();
@@ -42,4 +40,4 @@ public String getSequencePreviousValString(String sequenceName) throws MappingEx
 	public String getDropSequenceString(String sequenceName) {
 		return "drop sequence " + sequenceName + " restrict";
 	}
-}
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -3820,17 +3820,6 @@ public boolean supportsNullPrecedence() {
 		return true;
 	}
 
-	/**
-	 * A setting specific to {@link SybaseASEDialect}.
-	 *
-	 * @deprecated This is only called from {@link SybaseASESqlAstTranslator}
-	 *             so it doesn't need to be declared here.
-	 */
-	@Deprecated(since = "6")
-	public boolean isAnsiNullOn() {
-		return true;
-	}
-
 	/**
 	 * Does this dialect/database require casting of non-string arguments
 	 * in the {@code concat()} function?

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
@@ -1052,11 +1052,6 @@ public boolean supportsNullPrecedence() {
 		return wrapped.supportsNullPrecedence();
 	}
 
-	@Override
-	@Deprecated(since = "6")
-	public boolean isAnsiNullOn() {
-		return wrapped.isAnsiNullOn();
-	}
 
 	@Override
 	public boolean requiresCastForConcatenatingNonStrings() {

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
@@ -237,7 +237,6 @@ private int pageSize(DialectResolutionInfo info) {
 		return getInt( SYBASE_PAGE_SIZE, info.getConfigurationValues(), MAX_PAGE_SIZE );
 	}
 
-	@Override
 	public boolean isAnsiNullOn() {
 		return ansiNull;
 	}

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
@@ -377,7 +377,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 			}
 		}
 		// I think intersect is only supported in 16.0 SP3
-		if ( getDialect().isAnsiNullOn() ) {
+		if ( ( (SybaseASEDialect) getDialect() ).isAnsiNullOn() ) {
 			if ( isLob ) {
 				switch ( operator ) {
 					case DISTINCT_FROM:

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java