From c8e4fead2c09b9d261cea71cd252a0134d63d09e Mon Sep 17 00:00:00 2001 From: Gavin King Date: Thu, 12 Dec 2024 23:21:52 +0100 Subject: [PATCH] remove some unused deprecated operations --- .../java/org/hibernate/mapping/Column.java | 36 ------------------- .../produce/function/ArgumentsValidator.java | 10 ------ 2 files changed, 46 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java index 954bbb4b1ce..ca1dcba9cd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java @@ -640,46 +640,10 @@ public java.util.List getCheckConstraints() { return unmodifiableList( checkConstraints ); } - @Deprecated(since = "6.2") - public String getCheckConstraint() { - if ( checkConstraints.isEmpty() ) { - return null; - } - else if ( checkConstraints.size() > 1 ) { - throw new IllegalStateException( "column has multiple check constraints" ); - } - else { - return checkConstraints.get(0).getConstraint(); - } - } - - @Deprecated(since = "6.2") - public void setCheckConstraint(String constraint) { - if ( constraint != null ) { - if ( !checkConstraints.isEmpty() ) { - throw new IllegalStateException( "column already has a check constraint" ); - } - checkConstraints.add( new CheckConstraint( constraint ) ); - } - } - public boolean hasCheckConstraint() { return !checkConstraints.isEmpty(); } - @Deprecated(since = "6.2") - public String checkConstraint() { - if ( checkConstraints.isEmpty() ) { - return null; - } - else if ( checkConstraints.size() > 1 ) { - throw new IllegalStateException( "column has multiple check constraints" ); - } - else { - return checkConstraints.get(0).constraintString(); - } - } - @Override public String getTemplate(Dialect dialect, TypeConfiguration typeConfiguration, SqmFunctionRegistry registry) { return safeInterning( diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java index fa52c9db066..d9312238cd8 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/produce/function/ArgumentsValidator.java @@ -4,7 +4,6 @@ */ package org.hibernate.query.sqm.produce.function; -import org.hibernate.query.spi.QueryEngine; import org.hibernate.query.sqm.tree.SqmTypedNode; import org.hibernate.sql.ast.tree.SqlAstNode; import org.hibernate.type.spi.TypeConfiguration; @@ -20,15 +19,6 @@ * @see ArgumentTypesValidator */ public interface ArgumentsValidator { - /** - * Perform validation that may be done using the {@link SqmTypedNode} tree and assigned Java types. - * - * @deprecated Use {@link #validate(List, String, TypeConfiguration)} - */ - @Deprecated(since = "6.2") - default void validate(List> arguments, String functionName, QueryEngine queryEngine) { - validate( arguments, functionName, queryEngine.getTypeConfiguration() ); - } /** * Perform validation that may be done using the {@link SqmTypedNode} tree and assigned Java types.