diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java index 0127cec8f9..f9c603940d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java @@ -189,7 +189,6 @@ public abstract class AbstractCompositeIdentifierMapping @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -209,14 +208,13 @@ public abstract class AbstractCompositeIdentifierMapping ); span += fkDescriptor.forEachJdbcValue( identifier, - clause, span + offset, valuesConsumer, session ); } else { - span += attributeMapping.forEachJdbcValue( o, clause, span + offset, valuesConsumer, session ); + span += attributeMapping.forEachJdbcValue( o, span + offset, valuesConsumer, session ); } } return span; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java index 881a658f3f..68e2221ff6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java @@ -12,7 +12,6 @@ import java.util.List; import org.hibernate.Incubating; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; -import org.hibernate.sql.ast.Clause; /** * Contract for things at the domain mapping level that can be bound @@ -116,15 +115,13 @@ public interface Bindable extends JdbcMappingContainer { */ default int forEachDisassembledJdbcValue( Object value, - Clause clause, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return forEachDisassembledJdbcValue( value, clause, 0, valuesConsumer, session ); + return forEachDisassembledJdbcValue( value, 0, valuesConsumer, session ); } int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session); @@ -137,19 +134,17 @@ public interface Bindable extends JdbcMappingContainer { */ default int forEachJdbcValue( Object value, - Clause clause, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return forEachJdbcValue( value, clause, 0, valuesConsumer, session ); + return forEachJdbcValue( value, 0, valuesConsumer, session ); } default int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return forEachDisassembledJdbcValue( disassemble( value, session ), clause, offset, valuesConsumer, session ); + return forEachDisassembledJdbcValue( disassemble( value, session ), offset, valuesConsumer, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java index a19e9d00af..abdf4041c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableValuedModelPart.java @@ -69,11 +69,10 @@ public interface EmbeddableValuedModelPart extends ValuedModelPart, Fetchable, F @Override default int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return getEmbeddableTypeDescriptor().forEachJdbcValue( value, clause, offset, valuesConsumer, session ); + return getEmbeddableTypeDescriptor().forEachJdbcValue( value, offset, valuesConsumer, session ); } @Override @@ -89,13 +88,11 @@ public interface EmbeddableValuedModelPart extends ValuedModelPart, Fetchable, F @Override default int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { return getEmbeddableTypeDescriptor().forEachDisassembledJdbcValue( value, - clause, offset, valuesConsumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java index 14b1e50946..d68749b917 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java @@ -31,7 +31,6 @@ import org.hibernate.persister.entity.AttributeMappingsList; import org.hibernate.spi.NavigablePath; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; import org.hibernate.sql.ast.spi.SqlAstCreationContext; @@ -171,7 +170,6 @@ public interface EntityMappingType @Override int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session); @@ -179,11 +177,10 @@ public interface EntityMappingType @Override default int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { - return forEachDisassembledJdbcValue( disassemble( value, session ), clause, offset, consumer, session ); + return forEachDisassembledJdbcValue( disassemble( value, session ), offset, consumer, session ); } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java index 374e0074cc..91517245ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityValuedModelPart.java @@ -12,7 +12,6 @@ import java.util.function.Consumer; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; @@ -101,20 +100,18 @@ public interface EntityValuedModelPart extends FetchableContainer { @Override default int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return getEntityMappingType().forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return getEntityMappingType().forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override default int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { - return getEntityMappingType().forEachJdbcValue( value, clause, offset, consumer, session ); + return getEntityMappingType().forEachJdbcValue( value, offset, consumer, session ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java index 1e051a6d4d..dcf036a518 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java @@ -21,7 +21,6 @@ import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.entity.DiscriminatorType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -202,7 +201,6 @@ public abstract class AbstractDiscriminatorMapping implements EntityDiscriminato @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java index b7fc951114..259563b6e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java @@ -25,7 +25,6 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -210,7 +209,6 @@ public class AnyDiscriminatorPart implements BasicValuedModelPart, FetchOptions, @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java index 52c3ff325f..7b00bba531 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyKeyPart.java @@ -23,7 +23,6 @@ import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -260,7 +259,6 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -281,7 +279,6 @@ public class AnyKeyPart implements BasicValuedModelPart, FetchOptions { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java index d00ef21ffa..cfa0c1a296 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicAttributeMapping.java @@ -11,7 +11,6 @@ import java.util.function.BiConsumer; import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.mapping.GeneratorCreator; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.AttributeMetadata; import org.hibernate.metamodel.mapping.BasicValuedModelPart; @@ -26,7 +25,6 @@ import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -378,7 +376,6 @@ public class BasicAttributeMapping @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java index 9414ca4d8f..64b786fd54 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java @@ -30,7 +30,6 @@ import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -372,11 +371,10 @@ public class BasicEntityIdentifierMappingImpl implements BasicEntityIdentifierMa @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return idType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return idType.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java index d32eb0ff7a..f85ab3fce0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java @@ -25,7 +25,6 @@ import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.EntityIdentifierNavigablePath; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.PluralTableGroup; @@ -312,7 +311,6 @@ public class BasicValuedCollectionPart @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java index 0dbe26f474..fffa73e0de 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CollectionIdentifierDescriptorImpl.java @@ -21,7 +21,6 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlAstCreationState; @@ -305,10 +304,9 @@ public class CollectionIdentifierDescriptorImpl implements CollectionIdentifierD @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return type.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return type.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java index 77f7bb14b8..1ef0637536 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CompoundNaturalIdMapping.java @@ -35,7 +35,6 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.AssemblerCreationState; @@ -381,7 +380,6 @@ public class CompoundNaturalIdMapping extends AbstractNaturalIdMapping implement @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -392,7 +390,7 @@ public class CompoundNaturalIdMapping extends AbstractNaturalIdMapping implement int span = 0; for ( int i = 0; i < attributes.size(); i++ ) { final SingularAttributeMapping attribute = attributes.get( i ); - span += attribute.forEachDisassembledJdbcValue( incoming[ i ], clause, span + offset, valuesConsumer, session ); + span += attribute.forEachDisassembledJdbcValue( incoming[ i ], span + offset, valuesConsumer, session ); } return span; } @@ -400,7 +398,6 @@ public class CompoundNaturalIdMapping extends AbstractNaturalIdMapping implement @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -412,7 +409,7 @@ public class CompoundNaturalIdMapping extends AbstractNaturalIdMapping implement int span = 0; for ( int i = 0; i < attributes.size(); i++ ) { final SingularAttributeMapping attribute = attributes.get( i ); - span += attribute.forEachJdbcValue( incoming[ i ], clause, span + offset, valuesConsumer, session ); + span += attribute.forEachJdbcValue( incoming[ i ], span + offset, valuesConsumer, session ); } return span; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java index 3c29a93afe..0b81b9877c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedAssociationAttributeMapping.java @@ -33,7 +33,6 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; @@ -265,7 +264,6 @@ public class DiscriminatedAssociationAttributeMapping @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java index 321e5479d7..926076deb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/DiscriminatedCollectionPart.java @@ -26,7 +26,6 @@ import org.hibernate.metamodel.mapping.SelectableMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBaseGenerator; @@ -263,13 +262,11 @@ public class DiscriminatedCollectionPart implements DiscriminatedAssociationMode @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { return discriminatorMapping.getDiscriminatorPart().forEachDisassembledJdbcValue( value, - clause, offset, valuesConsumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java index 1d92070dc3..f8680c8afb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddableMappingTypeImpl.java @@ -54,7 +54,6 @@ import org.hibernate.persister.entity.AttributeMappingsList; import org.hibernate.persister.internal.MutableAttributeMappingList; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupProducer; import org.hibernate.sql.results.graph.DomainResult; @@ -750,7 +749,6 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { @@ -762,7 +760,7 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme continue; } final Object o = attributeMapping.getPropertyAccess().getGetter().get( value ); - span += attributeMapping.forEachJdbcValue( o, clause, span + offset, consumer, session ); + span += attributeMapping.forEachJdbcValue( o, span + offset, consumer, session ); } return span; } @@ -770,7 +768,6 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -778,7 +775,7 @@ public class EmbeddableMappingTypeImpl extends AbstractEmbeddableMapping impleme int span = 0; for ( int i = 0; i < attributeMappings.size(); i++ ) { final AttributeMapping mapping = attributeMappings.get( i ); - span += mapping.forEachDisassembledJdbcValue( values[i], clause, span + offset, valuesConsumer, session ); + span += mapping.forEachDisassembledJdbcValue( values[i], span + offset, valuesConsumer, session ); } return span; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java index def51160cc..c1a19fd1d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java @@ -29,7 +29,6 @@ import org.hibernate.metamodel.mapping.SelectableMappings; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -589,11 +588,10 @@ public class EmbeddedForeignKeyDescriptor implements ForeignKeyDescriptor { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return targetSide.getModelPart().forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return targetSide.getModelPart().forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java index ba2f269acc..b41f035249 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java @@ -17,7 +17,6 @@ import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResultCreationState; @@ -147,13 +146,11 @@ public class EmbeddedIdentifierMappingImpl @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { return getEmbeddableTypeDescriptor().forEachDisassembledJdbcValue( value, - clause, offset, valuesConsumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java index e3069542e2..4bdd1a4513 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityRowIdMappingImpl.java @@ -17,7 +17,6 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -28,7 +27,6 @@ import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.BasicType; import org.hibernate.type.descriptor.java.JavaType; -import org.hibernate.type.spi.TypeConfiguration; /** * @author Nathan Xu @@ -117,11 +115,10 @@ public class EntityRowIdMappingImpl implements EntityRowIdMapping { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return rowIdType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return rowIdType.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java index 666a0769d1..df811ad8f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityVersionMappingImpl.java @@ -23,7 +23,6 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -316,11 +315,10 @@ public class EntityVersionMappingImpl implements EntityVersionMapping, FetchOpti @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return versionBasicType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return versionBasicType.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java index 2367a3edaf..a016c50901 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java @@ -42,7 +42,6 @@ import org.hibernate.persister.internal.MutableAttributeMappingList; import org.hibernate.property.access.internal.PropertyAccessStrategyMapImpl; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupProducer; import org.hibernate.sql.results.graph.DomainResult; @@ -405,7 +404,6 @@ public class IdClassEmbeddable extends AbstractEmbeddableMapping implements Iden @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -417,7 +415,7 @@ public class IdClassEmbeddable extends AbstractEmbeddableMapping implements Iden continue; } final Object o = attributeMapping.getPropertyAccess().getGetter().get( value ); - span += attributeMapping.forEachJdbcValue( o, clause, span + offset, valuesConsumer, session ); + span += attributeMapping.forEachJdbcValue( o, span + offset, valuesConsumer, session ); } return span; } @@ -438,7 +436,6 @@ public class IdClassEmbeddable extends AbstractEmbeddableMapping implements Iden @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java index 8ab205fa87..54dce4c5eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java @@ -136,11 +136,10 @@ public class InverseNonAggregatedIdentifierMapping extends EmbeddedAttributeMapp @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return identifierValueMapper.forEachJdbcValue( value, clause, offset, valuesConsumer, session ); + return identifierValueMapper.forEachJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java index f5c91b9977..272ce66516 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java @@ -157,11 +157,10 @@ public class NonAggregatedIdentifierMappingImpl extends AbstractCompositeIdentif @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return identifierValueMapper.forEachJdbcValue( value, clause, offset, valuesConsumer, session ); + return identifierValueMapper.forEachJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java index 73f7358075..d0711aae9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/PluralAttributeMappingImpl.java @@ -42,7 +42,6 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.Joinable; import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; @@ -936,11 +935,10 @@ public class PluralAttributeMappingImpl @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return elementDescriptor.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return elementDescriptor.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java index 6329f514d4..26fb8c9464 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleForeignKeyDescriptor.java @@ -34,7 +34,6 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -452,7 +451,6 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -505,7 +503,6 @@ public class SimpleForeignKeyDescriptor implements ForeignKeyDescriptor, BasicVa @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java index 7ce2e8b9c6..089e12d9ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java @@ -27,7 +27,6 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; @@ -241,21 +240,19 @@ public class SimpleNaturalIdMapping extends AbstractNaturalIdMapping implements @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return attribute.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return attribute.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return attribute.forEachJdbcValue( value, clause, offset, valuesConsumer, session ); + return attribute.forEachJdbcValue( value, offset, valuesConsumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java index 54c29242f6..01c1032fb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java @@ -58,7 +58,6 @@ import org.hibernate.property.access.spi.PropertyAccess; import org.hibernate.spi.EntityIdentifierNavigablePath; import org.hibernate.spi.NavigablePath; import org.hibernate.spi.TreatedNavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; @@ -2050,17 +2049,15 @@ public class ToOneAttributeMapping @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return foreignKeyDescriptor.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return foreignKeyDescriptor.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { @@ -2069,7 +2066,6 @@ public class ToOneAttributeMapping foreignKeyDescriptor.getAssociationKeyFromSide( value, sideNature.inverse(), session ), session ), - clause, offset, consumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java index 0d038a19f5..cdcbb8f1ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/VirtualIdEmbeddable.java @@ -30,7 +30,6 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.AttributeMappingsList; import org.hibernate.persister.internal.MutableAttributeMappingList; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.from.TableGroupProducer; import org.hibernate.sql.results.graph.DomainResult; @@ -297,7 +296,6 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -309,7 +307,7 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id continue; } final Object o = attributeMapping.getPropertyAccess().getGetter().get( value ); - span += attributeMapping.forEachJdbcValue( o, clause, span + offset, valuesConsumer, session ); + span += attributeMapping.forEachJdbcValue( o, span + offset, valuesConsumer, session ); } return span; } @@ -356,7 +354,6 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -364,7 +361,7 @@ public class VirtualIdEmbeddable extends AbstractEmbeddableMapping implements Id int span = 0; for ( int i = 0; i < attributeMappings.size(); i++ ) { final AttributeMapping mapping = attributeMappings.get( i ); - span += mapping.forEachDisassembledJdbcValue( values[i], clause, span + offset, valuesConsumer, session ); + span += mapping.forEachDisassembledJdbcValue( values[i], span + offset, valuesConsumer, session ); } return span; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java index e30849d701..8666001702 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java @@ -18,7 +18,6 @@ import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.query.ReturnableType; import org.hibernate.metamodel.model.domain.TupleType; import org.hibernate.query.sqm.SqmExpressible; -import org.hibernate.sql.ast.Clause; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.java.ObjectArrayJavaType; @@ -98,7 +97,6 @@ public class ArrayTupleType implements TupleType, @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java index 6d5f5743f9..dc0428eb59 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/TupleMappingModelExpressible.java @@ -10,7 +10,6 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; -import org.hibernate.sql.ast.Clause; /** * @author Christian Beikov @@ -45,14 +44,13 @@ public class TupleMappingModelExpressible implements MappingModelExpressible { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { final Object[] values = (Object[]) value; int span = 0; for ( int i = 0; i < components.length; i++ ) { - span += components[i].forEachDisassembledJdbcValue( values[i], clause, span + offset, valuesConsumer, session ); + span += components[i].forEachDisassembledJdbcValue( values[i], span + offset, valuesConsumer, session ); } return span; } @@ -60,7 +58,6 @@ public class TupleMappingModelExpressible implements MappingModelExpressible { @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -69,7 +66,6 @@ public class TupleMappingModelExpressible implements MappingModelExpressible { for ( int i = 0; i < components.length; i++ ) { span += components[i].forEachDisassembledJdbcValue( components[i].disassemble( values[i], session ), - clause, span + offset, valuesConsumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index ff6fa3298f..2cbab87d66 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -224,7 +224,6 @@ import org.hibernate.sql.Delete; import org.hibernate.sql.SimpleSelect; import org.hibernate.sql.Template; import org.hibernate.sql.Update; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SimpleFromClauseAccessImpl; import org.hibernate.sql.ast.spi.SqlAliasBase; @@ -5779,13 +5778,11 @@ public abstract class AbstractEntityPersister @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { return getIdentifierMapping().forEachDisassembledJdbcValue( value, - clause, offset, valuesConsumer, session @@ -5795,7 +5792,6 @@ public abstract class AbstractEntityPersister @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { @@ -5809,7 +5805,6 @@ public abstract class AbstractEntityPersister } return identifierMapping.forEachDisassembledJdbcValue( identifier, - clause, offset, consumer, session diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java index b590a600a7..8ccedfca47 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/EntityTableMapping.java @@ -227,7 +227,6 @@ public class EntityTableMapping implements TableMapping { SharedSessionContractImplementor session) { identifierPart.forEachJdbcValue( domainValue, - null, (selectionIndex, jdbcValue, jdbcMapping) -> valueConsumer.consume( jdbcValue, keyColumns.get( selectionIndex ) diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java index 9d3671eada..ae10fd0c4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java @@ -22,7 +22,6 @@ import org.hibernate.metamodel.mapping.SelectableConsumer; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; @@ -265,7 +264,6 @@ public class AnonymousTupleBasicValuedModelPart implements ModelPart, MappingTyp @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -290,7 +288,11 @@ public class AnonymousTupleBasicValuedModelPart implements ModelPart, MappingTyp } @Override - public int forEachJdbcValue(Object value, Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { + public int forEachJdbcValue( + Object value, + int offset, + JdbcValuesConsumer valuesConsumer, + SharedSessionContractImplementor session) { valuesConsumer.consume( offset, value, getJdbcMapping() ); return getJdbcTypeCount(); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java index 62f9ba5b75..94590b658f 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddableValuedModelPart.java @@ -420,7 +420,6 @@ public class AnonymousTupleEmbeddableValuedModelPart implements EmbeddableValued @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -428,7 +427,7 @@ public class AnonymousTupleEmbeddableValuedModelPart implements EmbeddableValued int span = 0; int i = 0; for ( ModelPart mapping : modelParts.values() ) { - span += mapping.forEachDisassembledJdbcValue( values[i], clause, span + offset, valuesConsumer, session ); + span += mapping.forEachDisassembledJdbcValue( values[i], span + offset, valuesConsumer, session ); i++; } return span; @@ -437,7 +436,6 @@ public class AnonymousTupleEmbeddableValuedModelPart implements EmbeddableValued @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { @@ -446,7 +444,7 @@ public class AnonymousTupleEmbeddableValuedModelPart implements EmbeddableValued int i = 0; for ( ModelPart attributeMapping : modelParts.values() ) { final Object o = values[i]; - span += attributeMapping.forEachJdbcValue( o, clause, span + offset, consumer, session ); + span += attributeMapping.forEachJdbcValue( o, span + offset, consumer, session ); i++; } return span; diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java index ad998257dd..318c48dbb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java @@ -47,7 +47,6 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.AttributeMappingsList; import org.hibernate.query.sqm.ComparisonOperator; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstJoinType; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlAliasBase; @@ -552,21 +551,19 @@ public class AnonymousTupleEntityValuedModelPart @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return delegate.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return delegate.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer consumer, SharedSessionContractImplementor session) { - return delegate.forEachJdbcValue( value, clause, offset, consumer, session ); + return delegate.forEachJdbcValue( value, offset, consumer, session ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java index 3f34ec73dc..bc6ea4f675 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleTableGroupProducer.java @@ -40,7 +40,6 @@ import org.hibernate.query.sqm.SqmExpressible; import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.query.sqm.tree.select.SqmSelectableNode; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.FromClauseAccess; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.LazyTableGroup; @@ -382,7 +381,6 @@ public class AnonymousTupleTableGroupProducer implements TableGroupProducer, Map @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java index e2d8741f89..b2c44bdccd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java @@ -5040,7 +5040,6 @@ public abstract class BaseSqmToSqlAstConverter extends Base final List list = new ArrayList<>( embeddableValuedModelPart.getJdbcTypeCount() ); embeddableValuedModelPart.forEachJdbcValue( literal.getLiteralValue(), - null, (selectionIndex, value, jdbcMapping) -> list.add( new QueryLiteral<>( value, (BasicValuedMapping) jdbcMapping ) ), null @@ -5088,7 +5087,6 @@ public abstract class BaseSqmToSqlAstConverter extends Base final List list = new ArrayList<>( associationKeyPart.getJdbcTypeCount() ); associationKeyPart.forEachJdbcValue( associationKey, - null, (selectionIndex, value, jdbcMapping) -> list.add( new QueryLiteral<>( value, (BasicValuedMapping) jdbcMapping ) ), null diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java index afb0191e88..6df71f559f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/EntityTypeLiteral.java @@ -16,7 +16,6 @@ import org.hibernate.persister.entity.DiscriminatorType; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Queryable; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.results.graph.DomainResult; @@ -73,21 +72,19 @@ public class EntityTypeLiteral @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return discriminatorType.forEachDisassembledJdbcValue( value, clause, offset, valuesConsumer, session ); + return discriminatorType.forEachDisassembledJdbcValue( value, offset, valuesConsumer, session ); } @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { - return discriminatorType.forEachJdbcValue( value, clause, offset, valuesConsumer, session ); + return discriminatorType.forEachJdbcValue( value, offset, valuesConsumer, session ); } diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java index 8e6555944f..dc0f0a1c06 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java @@ -16,7 +16,6 @@ import org.hibernate.mapping.IndexedConsumer; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; @@ -109,7 +108,6 @@ public class JdbcLiteral implements Literal, MappingModelExpressible, Doma @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -120,7 +118,6 @@ public class JdbcLiteral implements Literal, MappingModelExpressible, Doma @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java index 62b51976ba..014db851da 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/AbstractJdbcParameter.java @@ -15,7 +15,6 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressible; import org.hibernate.metamodel.mapping.SqlExpressible; import org.hibernate.query.BindableType; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.JdbcParameter; @@ -152,7 +151,6 @@ public abstract class AbstractJdbcParameter @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { @@ -163,7 +161,6 @@ public abstract class AbstractJdbcParameter @Override public int forEachJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java index b203fb7a43..2a4a6c4f6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcParameterBindings.java @@ -91,7 +91,6 @@ public interface JdbcParameterBindings { SharedSessionContractImplementor session) { return bindable.forEachJdbcValue( value, - clause, offset, (selectionIndex, jdbcValue, type) -> { addBinding( diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java index 9ade9b0487..2b9a03853c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/BasicType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BasicType.java @@ -18,12 +18,10 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.metamodel.model.domain.BasicDomainType; -import org.hibernate.sql.ast.Clause; import org.hibernate.type.descriptor.ValueBinder; import org.hibernate.type.descriptor.ValueExtractor; import org.hibernate.type.descriptor.java.JavaType; import org.hibernate.type.descriptor.jdbc.JdbcLiteralFormatter; -import org.hibernate.type.descriptor.jdbc.JdbcType; /** * Marker interface for basic types. @@ -114,7 +112,6 @@ public interface BasicType extends Type, BasicDomainType, MappingType, Bas @Override default int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java index 6ecf0340d7..690ea4eb39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java @@ -66,7 +66,6 @@ import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; @@ -197,7 +196,6 @@ public class GoofyPersisterClassProvider implements PersisterClassResolver { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java index 110e52a936..d1f63899ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java @@ -64,7 +64,6 @@ import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; @@ -223,7 +222,6 @@ public class PersisterClassProviderTest { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java index 9f9ef8d3fe..d98973a8ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java @@ -61,7 +61,6 @@ import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableInsertStrategy; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.spi.NavigablePath; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; @@ -184,7 +183,6 @@ public class CustomPersister implements EntityPersister { @Override public int forEachDisassembledJdbcValue( Object value, - Clause clause, int offset, JdbcValuesConsumer valuesConsumer, SharedSessionContractImplementor session) {