From feacaf14f4fe7f2062752879b0939306eae94ae7 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Fri, 8 Nov 2019 14:03:47 +0000 Subject: [PATCH] fix rebase compilation errors --- .../mapping/internal/AbstractEntityDiscriminatorMapping.java | 2 +- .../mapping/internal/EntityDiscriminatorMappingImpl.java | 2 +- .../internal/JoinedSubclassDiscriminatorMappingImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java index 7f0f4e3eb5..a28d64798c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.model.convert.spi.BasicValueConverter; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.NavigablePath; -import org.hibernate.query.sqm.sql.SqlAstCreationState; +import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.internal.domain.basic.BasicFetch; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityDiscriminatorMappingImpl.java index 3ed612d7c6..d1b05ecee9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityDiscriminatorMappingImpl.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.mapping.internal; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.sqm.sql.SqlExpressionResolver; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.from.TableGroup; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/JoinedSubclassDiscriminatorMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/JoinedSubclassDiscriminatorMappingImpl.java index b2820e8f79..31b157ffdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/JoinedSubclassDiscriminatorMappingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/JoinedSubclassDiscriminatorMappingImpl.java @@ -9,7 +9,7 @@ package org.hibernate.metamodel.mapping.internal; import java.util.List; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.query.sqm.sql.SqlExpressionResolver; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.CaseSearchedExpression; import org.hibernate.sql.ast.tree.expression.ColumnReference;