HHH-19449 consistently use static imports

gavinking · gavinking · commit 7277038d134e · 2025-05-12T12:38:25.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BasicDomainType.java
@@ -8,6 +8,8 @@
 
 import org.hibernate.type.OutputableType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * Hibernate extension to the JPA {@link BasicType} contract.
  *
@@ -17,7 +19,7 @@ public interface BasicDomainType<J>
 		extends ReturnableType<J>, BasicType<J>, OutputableType<J> {
 	@Override
 	default PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractDiscriminatorSqmPathSource.java
@@ -10,6 +10,7 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 
 import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
 import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;
 
 /**
@@ -30,7 +31,7 @@ public SqmPathSource<?> findSubPathSource(String name) {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java
@@ -14,6 +14,8 @@
 import org.hibernate.type.BasicType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * {@link SqmPathSource} implementation for {@link AnyDiscriminator}
  *
@@ -48,7 +50,7 @@ public SqmPathSource<?> findSubPathSource(String name) {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java
@@ -19,6 +19,7 @@
 
 import java.util.List;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
 import static org.hibernate.metamodel.mapping.internal.AnyDiscriminatorPart.determineDiscriminatorConverter;
 
 /**
@@ -92,7 +93,7 @@ private NavigableRole resolveNavigableRole(Any bootAnyMapping) {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.ENTITY;
+		return ENTITY;
 	}
 
 	@Override
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
@@ -20,6 +20,8 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.descriptor.java.ObjectArrayJavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
+
 /**
  * @author Christian Beikov
  */
@@ -89,7 +91,7 @@ public JavaType<Object[]> getExpressibleJavaType() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.EMBEDDABLE;
+		return EMBEDDABLE;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java
@@ -12,6 +12,8 @@
 import org.hibernate.query.sqm.tree.domain.SqmPath;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * @author Steve Ebersole
  */
@@ -62,7 +64,7 @@ public SqmPath<J> createSqmPath(SqmPath<?> lhs, SqmPathSource<?> intermediatePat
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java
@@ -18,6 +18,9 @@
 import org.hibernate.query.sqm.tree.domain.SqmEmbeddableDomainType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
+
 /**
  * Implementation of {@link jakarta.persistence.metamodel.EmbeddableType}.
  *
@@ -50,7 +53,7 @@ public Class<J> getBindableJavaType() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.EMBEDDABLE;
+		return EMBEDDABLE;
 	}
 
 	@Override
@@ -109,6 +112,6 @@ public SqmPath<J> createSqmPath(SqmPath<?> lhs, SqmPathSource<?> intermediatePat
 
 	@Override
 	public BindableType getBindableType() {
-		return BindableType.SINGULAR_ATTRIBUTE;
+		return SINGULAR_ATTRIBUTE;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java
@@ -31,6 +31,8 @@
 import org.hibernate.query.sqm.tree.domain.SqmEntityDomainType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Bindable.BindableType.ENTITY_TYPE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
 import static org.hibernate.metamodel.model.domain.internal.DomainModelHelper.isCompatible;
 
 /**
@@ -237,12 +239,12 @@ else if ( EntityIdentifierMapping.matchesRoleName( name ) ) {
 
 	@Override
 	public BindableType getBindableType() {
-		return BindableType.ENTITY_TYPE;
+		return ENTITY_TYPE;
 	}
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.ENTITY;
+		return ENTITY;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java
@@ -16,6 +16,9 @@
 import org.hibernate.query.sqm.tree.domain.SqmPersistentAttribute;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Bindable.BindableType.ENTITY_TYPE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.MAPPED_SUPERCLASS;
+
 /**
  * Implementation of {@link jakarta.persistence.metamodel.MappedSuperclassType}.
  *
@@ -117,12 +120,12 @@ else if ( EntityIdentifierMapping.matchesRoleName( name ) ) {
 
 	@Override
 	public BindableType getBindableType() {
-		return BindableType.ENTITY_TYPE;
+		return ENTITY_TYPE;
 	}
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.MAPPED_SUPERCLASS;
+		return MAPPED_SUPERCLASS;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -167,6 +167,7 @@
 import jakarta.persistence.metamodel.Bindable;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
 import static java.util.Arrays.asList;
 import static org.hibernate.internal.util.collections.CollectionHelper.determineProperSizing;
 import static org.hibernate.query.internal.QueryHelper.highestPrecedenceType;
@@ -1655,7 +1656,7 @@ public MultiValueParameterType(Class<T> type) {
 
 		@Override
 		public PersistenceType getPersistenceType() {
-			return PersistenceType.BASIC;
+			return BASIC;
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmBasicValuedSimplePath.java
@@ -25,6 +25,7 @@
 import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
 import static java.util.Arrays.asList;
 
 /**
@@ -79,7 +80,7 @@ public SqmBindable<T> getExpressible() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmEmbeddedValuedSimplePath.java
@@ -17,6 +17,8 @@
 import org.hibernate.spi.NavigablePath;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
+
 /**
  * @author Steve Ebersole
  */
@@ -73,7 +75,7 @@ public SqmBindable<T> getExpressible() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.EMBEDDABLE;
+		return EMBEDDABLE;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmMapEntryReference.java
@@ -22,6 +22,8 @@
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
+
 
 /**
  * Represents the reference to a Map attribute's {@link Map.Entry} entries
@@ -86,7 +88,7 @@ public JpaSelection<Map.Entry<K, V>> alias(String name) {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.EMBEDDABLE;
+		return EMBEDDABLE;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java
@@ -34,6 +34,8 @@
 import java.util.TreeSet;
 import java.util.function.Consumer;
 
+import static jakarta.persistence.metamodel.Bindable.BindableType.ENTITY_TYPE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
 import static java.util.Collections.unmodifiableMap;
 import static java.util.Comparator.comparing;
 
@@ -154,7 +156,7 @@ public SqmDomainType<T> getPathType() {
 
 	@Override
 	public BindableType getBindableType() {
-		return BindableType.ENTITY_TYPE;
+		return ENTITY_TYPE;
 	}
 
 	@Override
@@ -164,7 +166,7 @@ public Class<T> getJavaType() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.ENTITY;
+		return ENTITY;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/NullSqmExpressible.java
@@ -8,6 +8,8 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.type.descriptor.java.JavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * @author Steve Ebersole
  */
@@ -19,7 +21,7 @@ public class NullSqmExpressible implements SqmBindable<Object> {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmEnumLiteral.java
@@ -20,6 +20,8 @@
 import org.hibernate.query.sqm.tree.domain.SqmDomainType;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * Specialized SQM literal defined by an enum reference.  E.g.
  * {@code ".. where p.sex = Sex.MALE"}
@@ -69,7 +71,7 @@ public SqmBindable<E> getExpressible() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmFieldLiteral.java
@@ -30,6 +30,8 @@
 import jakarta.persistence.criteria.Expression;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * @author Steve Ebersole
  */
@@ -63,13 +65,12 @@ public SqmFieldLiteral(
 		this.fieldJavaType = fieldJavaType;
 		this.fieldName = fieldName;
 		this.nodeBuilder = nodeBuilder;
-
 		this.expressible = this;
 	}
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	private static <T> T extractValue(Field field) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tuple/internal/AnonymousTupleType.java
@@ -37,6 +37,8 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import static jakarta.persistence.metamodel.Bindable.BindableType.ENTITY_TYPE;
+import static jakarta.persistence.metamodel.Type.PersistenceType.ENTITY;
 import static org.hibernate.internal.util.collections.CollectionHelper.linkedMapOfSize;
 
 
@@ -238,12 +240,14 @@ public JavaType<T> getExpressibleJavaType() {
 
 	@Override
 	public BindableType getBindableType() {
-		return BindableType.ENTITY_TYPE;
+		// TODO: should this be SINGULAR_ATTRIBUTE
+		return ENTITY_TYPE;
 	}
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.ENTITY;
+		// TODO: should this be EMBEDDABLE
+		return ENTITY;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java b/hibernate-core/src/main/java/org/hibernate/type/BasicTypeReference.java
@@ -9,6 +9,8 @@
 import org.hibernate.query.sqm.SqmBindable;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;
+
 /**
  * A basic type reference.
  *
@@ -60,7 +62,7 @@ public Class<T> getJavaType() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.BASIC;
+		return BASIC;
 	}
 
 	public int getSqlTypeCode() {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
@@ -39,6 +39,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.spi.CompositeTypeImplementor;
 
+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;
 import static org.hibernate.internal.util.ReflectHelper.isRecord;
 import static org.hibernate.internal.util.StringHelper.unqualify;
 import static org.hibernate.metamodel.mapping.EntityDiscriminatorMapping.DISCRIMINATOR_ROLE_NAME;
@@ -157,7 +158,7 @@ public final boolean isComponentType() {
 
 	@Override
 	public PersistenceType getPersistenceType() {
-		return PersistenceType.EMBEDDABLE;
+		return EMBEDDABLE;
 	}
 
 	public Class<?> getReturnedClass() {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`import org.hibernate.type.OutputableType;`
`10`	`10`
	`11`	`+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;`
	`12`	`+`
`11`	`13`	`/**`
`12`	`14`	`* Hibernate extension to the JPA {@link BasicType} contract.`
`13`	`15`	`*`
`@@ -17,7 +19,7 @@ public interface BasicDomainType<J>`
`17`	`19`	`extends ReturnableType<J>, BasicType<J>, OutputableType<J> {`
`18`	`20`	`@Override`
`19`	`21`	`default PersistenceType getPersistenceType() {`
`20`		`- return PersistenceType.BASIC;`
	`22`	`+ return BASIC;`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`	`import org.hibernate.type.BasicType;`
`15`	`15`	`import org.hibernate.type.descriptor.java.JavaType;`
`16`	`16`
	`17`	`+import static jakarta.persistence.metamodel.Type.PersistenceType.BASIC;`
	`18`	`+`
`17`	`19`	`/**`
`18`	`20`	`* {@link SqmPathSource} implementation for {@link AnyDiscriminator}`
`19`	`21`	`*`
`@@ -48,7 +50,7 @@ public SqmPathSource<?> findSubPathSource(String name) {`
`48`	`50`
`49`	`51`	`@Override`
`50`	`52`	`public PersistenceType getPersistenceType() {`
`51`		`- return PersistenceType.BASIC;`
	`53`	`+ return BASIC;`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,9 @@`
`18`	`18`	`import org.hibernate.query.sqm.tree.domain.SqmEmbeddableDomainType;`
`19`	`19`	`import org.hibernate.type.descriptor.java.JavaType;`
`20`	`20`
	`21`	`+import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE;`
	`22`	`+import static jakarta.persistence.metamodel.Type.PersistenceType.EMBEDDABLE;`
	`23`	`+`
`21`	`24`	`/**`
`22`	`25`	`* Implementation of {@link jakarta.persistence.metamodel.EmbeddableType}.`
`23`	`26`	`*`
`@@ -50,7 +53,7 @@ public Class<J> getBindableJavaType() {`
`50`	`53`
`51`	`54`	`@Override`
`52`	`55`	`public PersistenceType getPersistenceType() {`
`53`		`- return PersistenceType.EMBEDDABLE;`
	`56`	`+ return EMBEDDABLE;`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`@Override`
`@@ -109,6 +112,6 @@ public SqmPath<J> createSqmPath(SqmPath<?> lhs, SqmPathSource<?> intermediatePat`
`109`	`112`
`110`	`113`	`@Override`
`111`	`114`	`public BindableType getBindableType() {`
`112`		`- return BindableType.SINGULAR_ATTRIBUTE;`
	`115`	`+ return SINGULAR_ATTRIBUTE;`
`113`	`116`	`}`
`114`	`117`	`}`