From d5b72896869dc802f33baf869707bdca36bf920c Mon Sep 17 00:00:00 2001 From: Gavin King Date: Sun, 1 Dec 2024 14:59:04 +0100 Subject: [PATCH] remove deprecated/obsolete Dialect-related stuff --- .../community/dialect/DB2LegacyDialect.java | 2 +- .../community/dialect/DB2iLegacyDialect.java | 4 ++-- .../community/dialect/DB2zLegacyDialect.java | 4 ++-- .../dialect/SybaseASELegacyDialect.java | 1 - .../SybaseASELegacySqlAstTranslator.java | 2 +- .../sequence/LegacyDB2SequenceSupport.java | 8 +++----- .../java/org/hibernate/dialect/Dialect.java | 11 ----------- .../dialect/DialectDelegateWrapper.java | 5 ----- .../org/hibernate/dialect/SybaseASEDialect.java | 1 - .../dialect/SybaseASESqlAstTranslator.java | 2 +- .../identity/DB2390IdentityColumnSupport.java | 13 ------------- .../dialect/unique/DefaultUniqueDelegate.java | 17 ----------------- 12 files changed, 10 insertions(+), 60 deletions(-) rename {hibernate-core/src/main/java/org/hibernate => hibernate-community-dialects/src/main/java/org/hibernate/community}/dialect/sequence/LegacyDB2SequenceSupport.java (90%) delete mode 100644 hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java delete mode 100644 hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java index f0ca40a7ba..b49e1397de 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacyDialect.java @@ -25,6 +25,7 @@ import java.util.TimeZone; 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.DB2LimitHandler; 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/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java index 9fa4984643..134d3b710b 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacyDialect.java @@ -7,8 +7,8 @@ package org.hibernate.community.dialect; 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 class DB2iLegacyDialect extends DB2LegacyDialect { public IdentityColumnSupport getIdentityColumnSupport() { return getVersion().isSameOrAfter(7, 3) ? DB2IdentityColumnSupport.INSTANCE - : DB2390IdentityColumnSupport.INSTANCE; + : DB2zIdentityColumnSupport.INSTANCE; } @Override diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java index b074d94899..c1bbbd2a3a 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/DB2zLegacyDialect.java @@ -9,7 +9,7 @@ import org.hibernate.boot.model.FunctionContributions; 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 class DB2zLegacyDialect extends DB2LegacyDialect { @Override public IdentityColumnSupport getIdentityColumnSupport() { - return DB2390IdentityColumnSupport.INSTANCE; + return DB2zIdentityColumnSupport.INSTANCE; } @Override diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java index a16fbc6d87..824d960678 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java @@ -199,7 +199,6 @@ public class SybaseASELegacyDialect extends SybaseLegacyDialect { return false; } - @Override public boolean isAnsiNullOn() { return ansiNull; } diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java index 3dcf6a6eda..f73bd2b351 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java @@ -393,7 +393,7 @@ public class SybaseASELegacySqlAstTranslator extends Ab } } // 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/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/LegacyDB2SequenceSupport.java similarity index 90% rename from hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java rename to hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/sequence/LegacyDB2SequenceSupport.java index bdff0fc874..6081681da6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/sequence/LegacyDB2SequenceSupport.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/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 class LegacyDB2SequenceSupport implements SequenceSupport { public String getDropSequenceString(String sequenceName) { return "drop sequence " + sequenceName + " restrict"; } -} +} \ No newline at end of file diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 552c25ba26..2328a266b9 100644 --- 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 abstract class Dialect implements ConversionContext, TypeContributor, Fun 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 index cc18a0e641..a760f32ee6 100644 --- 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 class DialectDelegateWrapper extends Dialect { 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 index fb89fb4585..37073c932a 100644 --- 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 @@ public class SybaseASEDialect extends SybaseDialect { 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 index e404008198..de03702249 100644 --- 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 @@ public class SybaseASESqlAstTranslator extends Abstract } } // 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 deleted file mode 100644 index 4f767b701a..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/identity/DB2390IdentityColumnSupport.java +++ /dev/null @@ -1,13 +0,0 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.dialect.identity; - -/** - * @author Jan Schatteman - * @deprecated use {@code DB2zIdentityColumnSupport} - */ -@Deprecated(since="6.4") -public class DB2390IdentityColumnSupport extends DB2zIdentityColumnSupport { -} 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 deleted file mode 100644 index 275c2f66e1..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/DefaultUniqueDelegate.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * SPDX-License-Identifier: LGPL-2.1-or-later - * Copyright Red Hat Inc. and Hibernate Authors - */ -package org.hibernate.dialect.unique; - -import org.hibernate.dialect.Dialect; - -/** - * @deprecated use {@link org.hibernate.dialect.unique.AlterTableUniqueDelegate} - */ -@Deprecated(since="6.2", forRemoval = true) -public class DefaultUniqueDelegate extends AlterTableUniqueDelegate { - public DefaultUniqueDelegate(Dialect dialect) { - super(dialect); - } -}