[hibernate-commits] [hibernate/hibernate-orm] 6299ce: fix up lots of errors in generic typing related to...

Branch: refs/heads/main Home: https://github.com/hibernate/hibernate-orm Commit: 6299ceb61d9e08b56f9877e576237babff676f34 https://github.com/hibernate/hibernate-orm/commit/6299ceb61d9e08b56f9877e... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2023-07-03 (Mon, 03 Jul 2023) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java M hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java M hibernate-core/src/main/java/org/hibernate/graph/internal/AttributeNodeImpl.java M hibernate-core/src/main/java/org/hibernate/graph/internal/parse/PathQualifierType.java M hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityCollectionPart.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AnyDiscriminatorPart.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicEntityIdentifierMappingImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/IdClassEmbeddable.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InverseNonAggregatedIdentifierMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/NonAggregatedIdentifierMappingImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingleAttributeIdentifierMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddableTypeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEntityValuedModelPart.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java M hibernate-core/src/main/java/org/hibernate/query/hql/internal/QualifiedJoinPathConsumer.java M hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/query/results/ResultsHelper.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java M hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java M hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java M hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java M hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmFrom.java M hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java M hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java M hibernate-core/src/main/java/org/hibernate/spi/EntityIdentifierNavigablePath.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultCreationState.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedResultImpl.java M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java M hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java M hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/AttributePathTests.java M hibernate-core/src/test/java/org/hibernate/orm/test/spi/path/NavigablePathTests.java Log Message: ----------- fix up lots of errors in generic typing related to DomainTypes... ...and reduce coupling to JpaMetamodel. This is useful for tools like Query Validator which need to instantiate these metamodel objects in a "mocked" environment. It will also make it possible for the Metamodel Generator to generate static references to these metamodel objects. Commit: 617ce3206ed23dadc1daafe160e735f0fef5e96e https://github.com/hibernate/hibernate-orm/commit/617ce3206ed23dadc1daafe... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2023-07-03 (Mon, 03 Jul 2023) Changed paths: M hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java M hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java M hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java M hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java M hibernate-core/src/main/java/org/hibernate/graph/spi/GraphHelper.java M hibernate-core/src/main/java/org/hibernate/graph/spi/GraphImplementor.java M hibernate-core/src/main/java/org/hibernate/graph/spi/RootGraphImplementor.java M hibernate-core/src/main/java/org/hibernate/graph/spi/SubGraphImplementor.java M hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/ValueContext.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AnyMappingDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractPluralAttribute.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyDiscriminatorSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingDomainTypeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BagAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/BasicSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EmbeddedSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityDiscriminatorSqmPath.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntitySqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/ListAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/NonAggregatedCompositeSqmPathSource.java A hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PathHelper.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SetAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/SingularAttributeImpl.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSimpleSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmAssociationPathSource.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleType.java M hibernate-core/src/main/java/org/hibernate/query/sqm/SqmPathSource.java M hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/SqmPolymorphicRootDescriptor.java M hibernate-core/src/main/java/org/hibernate/spi/NavigablePath.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/EntityResultGraphNode.java M hibernate-core/src/test/java/org/hibernate/orm/test/graph/EntityGraphsTest.java Log Message: ----------- cleanup more generic typing issues around paths and graphs simplify the whole appliesTo() thing which was convoluted and overly-complex Commit: b6eabdf17d3ed4c612dc758171bf5f03db7e45c5 https://github.com/hibernate/hibernate-orm/commit/b6eabdf17d3ed4c612dc758... Author: Gavin King <gavin(a)hibernate.org&gt; Date: 2023-07-03 (Mon, 03 Jul 2023) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadataImpl.java M hibernate-core/src/main/java/org/hibernate/metamodel/internal/SingularAttributeMetadataImpl.java Log Message: ----------- add missing @Override annotations and Extract a function Compare: https://github.com/hibernate/hibernate-orm/compare/4adafc275773...b6eabdf...