Skip to content

Commit 9225b85

Browse files
committed
HHH-16972 move the new intrerfaces into the correct package
put them in org.hibernate.query.sqm.tree.domain
1 parent bbd4666 commit 9225b85

File tree

84 files changed

+63
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+63
-101
lines changed

hibernate-core/src/main/java/org/hibernate/dialect/function/GenerateSeriesSetReturningFunctionTypeResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.hibernate.metamodel.mapping.SelectablePath;
1414
import org.hibernate.metamodel.mapping.SqlTypedMapping;
1515
import org.hibernate.metamodel.mapping.internal.SelectableMappingImpl;
16-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
16+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1717
import org.hibernate.query.sqm.tuple.internal.AnonymousTupleType;
1818
import org.hibernate.query.sqm.SqmExpressible;
1919
import org.hibernate.query.sqm.produce.function.SetReturningFunctionTypeResolver;

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
import org.hibernate.persister.entity.EntityPersister;
5858
import org.hibernate.property.access.internal.PropertyAccessMapImpl;
5959
import org.hibernate.property.access.spi.Getter;
60-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
60+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
6161
import org.hibernate.type.AnyType;
6262
import org.hibernate.type.BasicType;
6363
import org.hibernate.type.CollectionType;

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
*/
55
package org.hibernate.metamodel.model.domain;
66

7-
import java.util.Objects;
87
import jakarta.persistence.metamodel.BasicType;
98

10-
import org.hibernate.HibernateException;
119
import org.hibernate.query.OutputableType;
1210

1311
/**
@@ -21,8 +19,4 @@ public interface BasicDomainType<J>
2119
default PersistenceType getPersistenceType() {
2220
return PersistenceType.BASIC;
2321
}
24-
25-
default boolean areEqual(J x, J y) throws HibernateException {
26-
return Objects.equals( x, y );
27-
}
2822
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/DomainType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55
package org.hibernate.metamodel.model.domain;
66

7+
import org.hibernate.Internal;
78
import org.hibernate.query.BindableType;
89
import org.hibernate.type.descriptor.java.JavaType;
910

@@ -36,6 +37,7 @@ public interface DomainType<J> extends BindableType<J> {
3637
*/
3738
String getTypeName();
3839

40+
@Internal
3941
default int getTupleLength() {
4042
return 1;
4143
}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.hibernate.metamodel.model.domain.DomainType;
1515
import org.hibernate.metamodel.model.domain.ManagedDomainType;
1616
import org.hibernate.metamodel.model.domain.PersistentAttribute;
17-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
17+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1818
import org.hibernate.type.descriptor.java.JavaType;
1919

2020
/**

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.hibernate.metamodel.model.domain.DomainType;
88
import org.hibernate.metamodel.model.domain.ReturnableType;
99
import org.hibernate.query.sqm.SqmPathSource;
10-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
10+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1111

1212
import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE;
1313
import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractIdentifiableType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
2828
import org.hibernate.query.sqm.SqmPathSource;
2929
import org.hibernate.query.sqm.tree.domain.SqmSingularPersistentAttribute;
30-
import org.hibernate.query.sqm.tree.from.SqmEmbeddableDomainType;
30+
import org.hibernate.query.sqm.tree.domain.SqmEmbeddableDomainType;
3131
import org.hibernate.type.descriptor.java.JavaType;
3232
import org.hibernate.type.descriptor.java.spi.PrimitiveJavaType;
3333

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import org.hibernate.metamodel.model.domain.DomainType;
88
import org.hibernate.query.sqm.SqmPathSource;
9-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
9+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1010
import org.hibernate.type.descriptor.java.JavaType;
1111

1212
/**

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.hibernate.metamodel.model.domain.NavigableRole;
1111
import org.hibernate.metamodel.model.domain.SimpleDomainType;
1212
import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
13-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
13+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1414
import org.hibernate.type.AnyType;
1515
import org.hibernate.type.BasicType;
1616
import org.hibernate.type.MetaType;

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ArrayTupleType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.hibernate.metamodel.UnsupportedMappingException;
1414
import org.hibernate.metamodel.mapping.JdbcMapping;
1515
import org.hibernate.metamodel.mapping.MappingModelExpressible;
16-
import org.hibernate.query.sqm.tree.from.SqmDomainType;
16+
import org.hibernate.query.sqm.tree.domain.SqmDomainType;
1717
import org.hibernate.query.sqm.tuple.TupleType;
1818
import org.hibernate.metamodel.model.domain.ReturnableType;
1919
import org.hibernate.query.sqm.SqmExpressible;

0 commit comments

Comments
 (0)