From 089a3f86ae6460530c5a91e7e3480cfdc5d78a86 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 22 Sep 2021 17:52:06 -0500 Subject: [PATCH] HHH-14837 - Move to Jakarta EE preliminary transformation; only `javax.persistence.*` settings supported atm --- build.gradle | 7 +- documentation/documentation.gradle | 9 +- .../guides/tutorial_annotations.adoc | 8 +- .../quickstart/guides/tutorial_envers.adoc | 2 +- .../quickstart/guides/tutorial_jpa.adoc | 11 +- .../hibernate/tutorial/annotations/Event.java | 16 +- .../em/EntityManagerIllustrationTest.java | 6 +- .../java/org/hibernate/tutorial/em/Event.java | 16 +- .../test/resources/META-INF/persistence.xml | 8 +- .../envers/EnversIllustrationTest.java | 6 +- .../org/hibernate/tutorial/envers/Event.java | 16 +- .../test/resources/META-INF/persistence.xml | 8 +- .../osgitest/DataPointServiceImpl.java | 2 +- .../hibernate/osgitest/entity/DataPoint.java | 6 +- .../osgitest/DataPointServiceImpl.java | 2 +- .../org/hibernate/osgitest/HibernateUtil.java | 6 +- .../hibernate/osgitest/entity/DataPoint.java | 6 +- .../hibernate/osgitest/entity/DataPoint.java | 6 +- .../topical/bootstrap/JpaBootstrapping.adoc | 8 +- .../metamodelgen/MetamodelGenerator.adoc | 4 +- .../userguide/Hibernate_User_Guide.adoc | 2 - .../userguide/appendices/Annotations.adoc | 2 +- .../userguide/appendices/Configurations.adoc | 96 +-- .../chapters/bootstrap/Bootstrap.adoc | 10 +- .../bootstrap/extras/persistence-external.xml | 8 +- .../chapters/bootstrap/extras/persistence.xml | 8 +- .../userguide/chapters/caching/Caching.adoc | 4 +- .../chapters/domain/associations.adoc | 2 +- .../chapters/domain/basic_types.adoc | 6 +- .../userguide/chapters/domain/entity.adoc | 6 +- ...ection-immutability-update-example.log.txt | 4 +- .../chapters/domain/identifiers.adoc | 20 +- .../chapters/domain/inheritance.adoc | 2 +- .../userguide/chapters/envers/Envers.adoc | 4 +- .../userguide/chapters/events/Events.adoc | 6 +- .../userguide/chapters/fetching/Fetching.adoc | 2 +- .../chapters/jdbc/Database_Access.adoc | 3 +- .../userguide/chapters/locking/Locking.adoc | 14 +- .../chapters/pc/PersistenceContext.adoc | 16 +- .../chapters/query/criteria/Criteria.adoc | 44 +- .../userguide/chapters/query/hql/HQL.adoc | 18 +- .../chapters/query/native/Native.adoc | 8 +- .../org/hibernate/userguide/model/Call.java | 12 +- .../userguide/model/CreditCardPayment.java | 2 +- .../org/hibernate/userguide/model/Image.java | 10 +- .../hibernate/userguide/model/Partner.java | 10 +- .../hibernate/userguide/model/Payment.java | 12 +- .../org/hibernate/userguide/model/Person.java | 54 +- .../org/hibernate/userguide/model/Phone.java | 36 +- .../userguide/model/WireTransferPayment.java | 2 +- documentation/src/main/javadoc/overview.html | 2 +- .../BidirectionalTwoOneToManyMapsIdTest.java | 20 +- .../CompositeIdAssociationTest.java | 10 +- ...vedIdentifierPrimaryKeyJoinColumnTest.java | 10 +- .../associations/DerivedIdentifierTest.java | 10 +- .../associations/JoinColumnOrFormulaTest.java | 12 +- .../associations/JoinFormulaTest.java | 8 +- .../ManyToManyBidirectionalTest.java | 12 +- ...ToManyBidirectionalWithLinkEntityTest.java | 14 +- .../ManyToManyUnidirectionalTest.java | 12 +- .../userguide/associations/ManyToOneTest.java | 14 +- .../userguide/associations/NotFoundTest.java | 16 +- .../OneToManyBidirectionalTest.java | 14 +- .../OneToManyUnidirectionalTest.java | 12 +- .../OneToOneBidirectionalLazyTest.java | 16 +- .../OneToOneBidirectionalTest.java | 18 +- .../associations/OneToOneMapsIdTest.java | 10 +- .../OneToOnePrimaryKeyJoinColumnTest.java | 10 +- .../OneToOneUnidirectionalTest.java | 12 +- .../UnidirectionalManyToManyRemoveTest.java | 12 +- .../associations/any/IntegerProperty.java | 8 +- .../associations/any/PropertyHolder.java | 10 +- .../associations/any/PropertyRepository.java | 12 +- .../associations/any/StringProperty.java | 8 +- .../hibernate/userguide/batch/BatchTest.java | 4 +- .../userguide/bootstrap/BootstrapTest.java | 30 +- .../caching/FirstLevelCacheTest.java | 22 +- .../caching/NonStrictReadWriteCacheTest.java | 47 +- .../caching/SecondLevelCacheTest.java | 26 +- .../userguide/collections/ArrayTest.java | 4 +- .../collections/BasicTypeCollectionTest.java | 4 +- .../BasicTypeElementCollectionTest.java | 6 +- ...cTypeOrderColumnElementCollectionTest.java | 8 +- .../BidirectionalBagOrphanRemovalTest.java | 12 +- .../collections/BidirectionalBagTest.java | 12 +- .../BidirectionalComparatorSortedSetTest.java | 12 +- .../collections/BidirectionalMapTest.java | 18 +- .../BidirectionalOrderByListTest.java | 14 +- .../BidirectionalOrderColumnListTest.java | 14 +- .../collections/BidirectionalSetTest.java | 12 +- .../BidirectionalSortedSetTest.java | 12 +- .../collections/ElementCollectionMapTest.java | 18 +- .../EmbeddableTypeElementCollectionTest.java | 10 +- .../collections/MapKeyClassTest.java | 20 +- .../userguide/collections/MapKeyTypeTest.java | 18 +- .../OrderColumnListIndexBaseTest.java | 14 +- .../collections/OrderedBySQLTest.java | 14 +- .../userguide/collections/QueueTest.java | 10 +- .../collections/UnidirectionalBagTest.java | 10 +- ...UnidirectionalComparatorSortedSetTest.java | 10 +- .../collections/UnidirectionalMapTest.java | 22 +- .../UnidirectionalOrderColumnListTest.java | 12 +- .../UnidirectionalOrderedByListTest.java | 12 +- .../collections/UnidirectionalSetTest.java | 10 +- .../UnidirectionalSortedSetTest.java | 10 +- .../userguide/criteria/CriteriaTest.java | 24 +- .../envers/CustomRevisionEntityTest.java | 14 +- .../userguide/envers/DefaultAuditTest.java | 12 +- ...ityTypeChangeAuditDefaultTrackingTest.java | 14 +- .../envers/EntityTypeChangeAuditTest.java | 20 +- ...angeAuditTrackingRevisionListenerTest.java | 22 +- .../envers/ModifiedFlagsAuditTest.java | 12 +- .../envers/QueryAuditAdressCountryTest.java | 16 +- .../userguide/envers/QueryAuditTest.java | 16 +- .../QueryAuditWithModifiedFlagTest.java | 14 +- .../envers/ValidityStrategyAuditTest.java | 12 +- .../userguide/events/BaseEntity.java | 2 +- .../events/DefaultEntityListenerTest.java | 10 +- .../userguide/events/InterceptorTest.java | 8 +- .../userguide/events/ListenerTest.java | 20 +- .../userguide/fetching/BatchFetchingTest.java | 10 +- .../fetching/DirectVsQueryFetchingTest.java | 8 +- .../userguide/fetching/FetchModeJoinTest.java | 12 +- .../fetching/FetchModeSelectTest.java | 12 +- .../fetching/FetchModeSubselectTest.java | 12 +- .../userguide/fetching/FetchingTest.java | 22 +- .../userguide/fetching/GraphFetchingTest.java | 26 +- .../userguide/fetching/GraphParsingTest.java | 20 +- .../fetching/LazyCollectionTest.java | 14 +- .../fetching/ProfileFetchingTest.java | 14 +- .../userguide/flush/AlwaysFlushTest.java | 14 +- .../userguide/flush/AutoFlushTest.java | 12 +- .../userguide/flush/CommitFlushTest.java | 16 +- .../userguide/flush/FlushOrderTest.java | 4 +- .../flush/HibernateAutoFlushTest.java | 12 +- .../userguide/flush/ManualFlushTest.java | 14 +- .../org/hibernate/userguide/hql/HQLTest.java | 10 +- .../PostgreSQLFunctionSelectClauseTest.java | 6 +- .../PostgreSQLFunctionWhereClauseTest.java | 4 +- .../userguide/hql/SelectDistinctTest.java | 18 +- .../CollectionImmutabilityTest.java | 8 +- .../immutability/EntityImmutabilityTest.java | 4 +- .../DiscriminatorNotNullSingleTableTest.java | 10 +- ...iminatorOptionsNotNullSingleTableTest.java | 10 +- .../JoinTablePrimaryKeyJoinColumnTest.java | 10 +- .../userguide/inheritance/JoinTableTest.java | 8 +- .../inheritance/MappedSuperclassTest.java | 6 +- .../SingleTableDiscriminatorFormulaTest.java | 10 +- .../inheritance/SingleTableTest.java | 8 +- .../inheritance/TablePerClassTest.java | 8 +- .../ExplicitPolymorphismTest.java | 6 +- .../org/hibernate/userguide/jmx/JmxTest.java | 4 +- .../locking/ExplicitLockingTest.java | 24 +- .../userguide/locking/OptimisticLockTest.java | 8 +- .../locking/OptimisticLockTypeAllTest.java | 6 +- .../locking/OptimisticLockTypeDirtyTest.java | 6 +- .../locking/OptimisticLockingInstantTest.java | 10 +- .../locking/OptimisticLockingTest.java | 12 +- .../OptimisticLockingTimestampTest.java | 10 +- .../userguide/locking/VersionSourceTest.java | 6 +- .../access/ElementCollectionAccessTest.java | 18 +- .../mapping/access/EmbeddableAccessTest.java | 12 +- .../mapping/access/FieldAccessTest.java | 4 +- .../access/PropertyAccessOverrideTest.java | 10 +- .../mapping/access/PropertyAccessTest.java | 4 +- .../mapping/basic/AutoQuotingTest.java | 4 +- .../mapping/basic/BigDecimalMappingTests.java | 6 +- .../mapping/basic/BigIntegerMappingTests.java | 6 +- .../mapping/basic/BitSetConverterTests.java | 12 +- .../mapping/basic/BitSetImplicitTests.java | 6 +- .../BitSetJavaTypeRegistrationTests.java | 8 +- .../mapping/basic/BitSetJavaTypeTests.java | 8 +- .../basic/BitSetJdbcTypeCodeTests.java | 8 +- .../BitSetJdbcTypeRegistrationTests.java | 6 +- .../mapping/basic/BitSetJdbcTypeTests.java | 6 +- .../mapping/basic/BitSetTypeDefTest.java | 4 +- .../mapping/basic/BitSetTypeTest.java | 4 +- .../mapping/basic/BitSetUserTypeTest.java | 14 +- .../mapping/basic/BlobByteArrayTest.java | 6 +- .../userguide/mapping/basic/BlobTest.java | 6 +- .../mapping/basic/BooleanMappingTests.java | 10 +- .../mapping/basic/ByteArrayMappingTests.java | 8 +- .../mapping/basic/ByteMappingTests.java | 6 +- .../CalendarWithTemporalTimestampTest.java | 12 +- .../basic/CharacterArrayMappingTests.java | 8 +- ...haracterArrayNationalizedMappingTests.java | 8 +- .../mapping/basic/CharacterMappingTests.java | 6 +- .../mapping/basic/ClassMappingTests.java | 6 +- .../mapping/basic/ClobCharArrayTest.java | 6 +- .../mapping/basic/ClobStringTest.java | 6 +- .../userguide/mapping/basic/ClobTest.java | 6 +- .../mapping/basic/ColumnTransformerTest.java | 4 +- .../mapping/basic/CurrencyMappingTests.java | 6 +- .../mapping/basic/DatePrecisionTests.java | 14 +- .../basic/DateWithTemporalDateTest.java | 12 +- .../basic/DateWithTemporalTimeTest.java | 12 +- .../basic/DateWithTemporalTimestampTest.java | 12 +- .../mapping/basic/DoubleMappingTests.java | 6 +- .../mapping/basic/DurationMappingTests.java | 6 +- .../basic/EnumerationConverterTest.java | 10 +- .../basic/EnumerationCustomTypeTest.java | 4 +- .../mapping/basic/ExplicitBasicTypeTest.java | 6 +- .../basic/ExplicitColumnNamingTest.java | 6 +- .../mapping/basic/ExplicitTypeTest.java | 4 +- .../mapping/basic/FloatMappingTests.java | 6 +- .../userguide/mapping/basic/FormulaTest.java | 4 +- .../mapping/basic/ImplicitBasicTypeTest.java | 4 +- .../mapping/basic/InstantLiteralTest.java | 8 +- .../mapping/basic/InstantMappingTests.java | 6 +- .../mapping/basic/IntegerMappingTests.java | 6 +- .../mapping/basic/JpaQuotingTest.java | 6 +- .../mapping/basic/LocalDateMappingTests.java | 6 +- .../basic/LocalDateTimeMappingTests.java | 6 +- .../LocalDateTimeWithTemporalTimeTest.java | 8 +- .../mapping/basic/LocalTimeMappingTests.java | 8 +- .../mapping/basic/LocaleMappingTests.java | 6 +- .../mapping/basic/LongMappingTests.java | 6 +- .../mapping/basic/NClobCharArrayTest.java | 6 +- .../mapping/basic/NClobStringTest.java | 6 +- .../userguide/mapping/basic/NClobTest.java | 8 +- .../mapping/basic/NationalizedTest.java | 4 +- .../basic/OffsetDateTimeMappingTests.java | 8 +- .../mapping/basic/OffsetTimeMappingTests.java | 6 +- .../userguide/mapping/basic/ParentTest.java | 10 +- .../basic/PhoneTypeEnumeratedOrdinalTest.java | 10 +- .../basic/PhoneTypeEnumeratedStringTest.java | 10 +- .../userguide/mapping/basic/QuotingTest.java | 6 +- .../mapping/basic/ShortMappingTests.java | 6 +- .../mapping/basic/StringMappingTests.java | 8 +- .../basic/StringNationalizedMappingTests.java | 8 +- .../mapping/basic/SubselectTest.java | 12 +- .../userguide/mapping/basic/TargetTest.java | 10 +- .../mapping/basic/TimeZoneMappingTests.java | 6 +- .../mapping/basic/TypeCategoryTest.java | 6 +- .../mapping/basic/ZoneOffsetMappingTests.java | 6 +- .../basic/ZonedDateTimeMappingTests.java | 6 +- .../mapping/converter/MoneyConverterTest.java | 8 +- .../converter/PeriodStringConverter.java | 4 +- .../mapping/converter/PeriodStringTest.java | 10 +- .../mapping/converter/hbm/MoneyConverter.java | 2 +- .../userguide/mapping/dynamic/Book.java | 6 +- .../EmbeddableImplicitOverrideTest.java | 12 +- .../embeddable/EmbeddableOverrideTest.java | 24 +- .../embeddable/NestedEmbeddableTest.java | 8 +- .../mapping/embeddable/ParentTest.java | 10 +- .../SimpleEmbeddableEquivalentTest.java | 10 +- .../embeddable/SimpleEmbeddableTest.java | 10 +- .../mapping/embeddable/TargetTest.java | 10 +- .../generated/CreationTimestampTest.java | 8 +- .../DatabaseValueGenerationTest.java | 8 +- .../mapping/generated/GeneratedTest.java | 6 +- .../mapping/generated/GeneratorTypeTest.java | 4 +- .../InMemoryValueGenerationTest.java | 8 +- .../generated/UpdateTimestampTest.java | 8 +- .../identifier/AssignedIdentifierTest.java | 4 +- .../userguide/mapping/identifier/Book.java | 4 +- .../identifier/CacheableNaturalIdTest.java | 18 +- .../identifier/CompositeNaturalIdTest.java | 8 +- .../identifier/EmbeddedIdManyToOneTest.java | 14 +- .../mapping/identifier/EmbeddedIdTest.java | 6 +- .../identifier/EntityTableCatalogTest.java | 6 +- .../identifier/EntityTableSchemaTest.java | 6 +- .../identifier/GeneratedIdentifierTest.java | 6 +- .../identifier/IdClassGeneratedValueTest.java | 8 +- .../identifier/IdClassManyToOneTest.java | 14 +- .../mapping/identifier/IdClassTest.java | 6 +- .../mapping/identifier/IdManyToOneTest.java | 10 +- .../identifier/MultipleNaturalIdTest.java | 14 +- .../identifier/MutableNaturalIdTest.java | 4 +- .../NaiveEqualsHashCodeEntityTest.java | 12 +- .../NaturalIdEqualsHashCodeEntityTest.java | 12 +- .../identifier/PooledOptimizerTest.java | 10 +- .../mapping/identifier/RowIdTest.java | 6 +- .../SequenceGeneratorConfiguredTest.java | 12 +- .../SequenceGeneratorNamedTest.java | 12 +- .../SequenceGeneratorUnnamedTest.java | 10 +- .../identifier/SimpleEntityTableTest.java | 6 +- .../mapping/identifier/SimpleEntityTest.java | 12 +- .../identifier/SimpleNaturalIdTest.java | 4 +- .../TableGeneratorConfiguredTest.java | 12 +- .../identifier/TableGeneratorUnnamedTest.java | 10 +- .../UuidCustomGeneratedValueTest.java | 6 +- .../identifier/UuidGeneratedValueTest.java | 8 +- .../mapping/identifier/composite/Event.java | 6 +- .../mapping/identifier/composite/EventId.java | 2 +- .../AbstractMultiTenancyTest.java | 4 +- .../DatabaseTimeZoneMultiTenancyTest.java | 6 +- .../userguide/osgi/jpa/HibernateUtil.java | 8 +- .../userguide/pc/BytecodeEnhancementTest.java | 14 +- .../pc/CascadeOnDeleteCollectionTest.java | 16 +- .../userguide/pc/CascadeOnDeleteTest.java | 14 +- .../userguide/pc/DynamicUpdateTest.java | 6 +- .../userguide/pc/FilterJoinTableTest.java | 16 +- .../pc/FilterSqlFragementAliasTest.java | 20 +- .../hibernate/userguide/pc/FilterTest.java | 22 +- .../userguide/pc/MultiLoadIdTest.java | 10 +- .../userguide/pc/NoDynamicUpdateTest.java | 6 +- .../userguide/pc/PersistenceContextTest.java | 18 +- .../org/hibernate/userguide/pc/Person.java | 8 +- .../org/hibernate/userguide/pc/Phone.java | 12 +- .../userguide/pc/WhereJoinTableTest.java | 10 +- .../org/hibernate/userguide/pc/WhereTest.java | 14 +- .../hibernate/userguide/persister/Author.java | 6 +- .../hibernate/userguide/persister/Book.java | 8 +- .../userguide/proxy/ProxyInterfaceTest.java | 4 +- .../hibernate/userguide/schema/CheckTest.java | 6 +- .../userguide/schema/ColumnDefaultTest.java | 4 +- .../hibernate/userguide/schema/IndexTest.java | 22 +- .../schema/SchemaGenerationTest.java | 16 +- .../schema/UniqueConstraintTest.java | 20 +- .../org/hibernate/userguide/sql/Captain.java | 6 +- .../userguide/sql/CollectionLoaderTest.java | 12 +- .../sql/CustomSQLSecondaryTableTest.java | 18 +- .../userguide/sql/CustomSQLTest.java | 12 +- .../hibernate/userguide/sql/Dimensions.java | 2 +- .../org/hibernate/userguide/sql/Identity.java | 2 +- .../sql/MySQLStoredProcedureTest.java | 4 +- ...racleCustomSQLWithStoredProcedureTest.java | 10 +- .../sql/OracleStoredProcedureTest.java | 4 +- .../org/hibernate/userguide/sql/SQLTest.java | 2 +- .../hibernate/userguide/sql/SpaceShip.java | 24 +- .../transactions/TransactionsTest.java | 6 +- .../userguide/spatial/SpatialTest.java | 4 +- gradle/java-module.gradle | 23 +- gradle/javadoc.gradle | 8 +- gradle/libraries.gradle | 69 +- .../test/agroal/AgroalSkipAutoCommitTest.java | 4 +- hibernate-c3p0/hibernate-c3p0.gradle | 11 +- .../c3p0/C3P0DefaultIsolationLevelTest.java | 4 +- .../c3p0/C3P0DifferentIsolationLevelTest.java | 4 +- .../hibernate/test/c3p0/IrrelevantEntity.java | 6 +- .../OracleSQLCallableStatementProxyTest.java | 14 +- .../test/c3p0/StatementCacheTest.java | 4 +- .../hibernate-community-dialects.gradle | 16 +- .../community/dialect/CUBRIDDialect.java | 2 +- .../community/dialect/CacheDialect.java | 2 +- .../community/dialect/FirebirdDialect.java | 4 +- .../community/dialect/IngresDialect.java | 2 +- .../community/dialect/MimerSQLDialect.java | 2 +- .../community/dialect/RDMSOS2200Dialect.java | 2 +- .../community/dialect/SQLiteDialect.java | 2 +- .../community/dialect/TeradataDialect.java | 2 +- .../community/dialect/TimesTenDialect.java | 2 +- .../dialect/InformixFunctionTest.java | 8 +- .../cache/TestInterSystemsFunctionsClass.java | 6 +- .../hibernate-core-jakarta.gradle | 232 ------ hibernate-core/hibernate-core.gradle | 45 +- .../src/main/java/org/hibernate/Cache.java | 2 +- .../main/java/org/hibernate/CacheMode.java | 4 +- .../hibernate/ConnectionAcquisitionMode.java | 2 +- .../java/org/hibernate/EmptyInterceptor.java | 0 .../main/java/org/hibernate/FetchMode.java | 2 +- .../org/hibernate/HibernateException.java | 2 +- .../java/org/hibernate/JDBCException.java | 6 +- .../LazyInitializationException.java | 4 +- .../main/java/org/hibernate/LobHelper.java | 4 +- .../src/main/java/org/hibernate/LockMode.java | 2 +- .../main/java/org/hibernate/Metamodel.java | 4 +- .../main/java/org/hibernate/ScrollMode.java | 6 +- .../src/main/java/org/hibernate/Session.java | 18 +- .../java/org/hibernate/SessionBuilder.java | 8 +- .../java/org/hibernate/SessionException.java | 0 .../java/org/hibernate/SessionFactory.java | 2 +- .../org/hibernate/SharedSessionContract.java | 10 +- .../hibernate/SimpleNaturalIdLoadAccess.java | 2 +- .../org/hibernate/StaleStateException.java | 0 .../java/org/hibernate/StatelessSession.java | 0 .../hibernate/StatelessSessionBuilder.java | 2 +- .../main/java/org/hibernate/Transaction.java | 6 +- .../internal/BulkOperationCleanupAction.java | 2 +- .../internal/EntityActionVetoException.java | 4 +- .../UnresolvedEntityInsertActions.java | 8 +- .../java/org/hibernate/action/package.html | 0 .../java/org/hibernate/annotations/Any.java | 4 +- .../annotations/AttributeAccessor.java | 16 +- .../org/hibernate/annotations/Cascade.java | 4 +- .../hibernate/annotations/CascadeType.java | 10 +- .../hibernate/annotations/CollectionId.java | 82 +- .../org/hibernate/annotations/Columns.java | 2 +- .../annotations/DiscriminatorFormula.java | 2 +- .../org/hibernate/annotations/FetchMode.java | 56 +- .../hibernate/annotations/FlushModeType.java | 2 +- .../org/hibernate/annotations/ForeignKey.java | 74 +- .../java/org/hibernate/annotations/Index.java | 2 +- .../hibernate/annotations/IndexColumn.java | 2 +- .../hibernate/annotations/JdbcTypeCode.java | 6 +- .../annotations/JoinColumnOrFormula.java | 2 +- .../hibernate/annotations/ListIndexBase.java | 4 +- .../org/hibernate/annotations/ManyToAny.java | 4 +- .../annotations/NamedNativeQueries.java | 2 +- .../annotations/NamedNativeQuery.java | 2 +- .../hibernate/annotations/NamedQueries.java | 2 +- .../org/hibernate/annotations/NamedQuery.java | 2 +- .../annotations/NoAttributeConverter.java | 2 +- .../annotations/OptimisticLockType.java | 2 +- .../org/hibernate/annotations/OrderBy.java | 4 +- .../org/hibernate/annotations/QueryHints.java | 4 +- .../org/hibernate/annotations/Source.java | 2 +- .../boot/AttributeConverterInfo.java | 2 +- .../java/org/hibernate/boot/Metadata.java | 8 +- .../org/hibernate/boot/MetadataBuilder.java | 16 +- .../org/hibernate/boot/MetadataSources.java | 40 +- .../hibernate/boot/SessionFactoryBuilder.java | 20 +- .../boot/archive/internal/ArchiveHelper.java | 2 +- .../JarFileBasedArchiveDescriptor.java | 2 +- .../JarInputStreamBasedArchiveDescriptor.java | 2 +- .../scan/internal/DisabledScanner.java | 0 .../spi/ClassFileArchiveEntryHandler.java | 8 +- .../cfgxml/internal/JaxbCfgProcessor.java | 12 +- .../boot/cfgxml/spi/MappingReference.java | 10 +- .../DefaultCustomEntityDirtinessStrategy.java | 2 +- .../internal/IdGeneratorInterpreterImpl.java | 10 +- .../InFlightMetadataCollectorImpl.java | 10 +- .../boot/internal/MetadataBuilderImpl.java | 6 +- .../NamedProcedureCallDefinitionImpl.java | 8 +- .../SessionFactoryOptionsBuilder.java | 2 +- .../boot/jaxb/internal/AbstractBinder.java | 6 +- ...ontextProvidingValidationEventHandler.java | 6 +- .../boot/jaxb/internal/MappingBinder.java | 4 +- .../boot/jaxb/internal/XmlSources.java | 2 +- .../stax/FilteringXMLEventReader.java | 6 +- .../internal/stax/JpaOrmXmlEventReader.java | 26 +- .../boot/jaxb/internal/stax/LocalSchema.java | 4 +- .../stax/LocalXmlResourceResolver.java | 197 ++--- .../internal/AccessTypeMarshalling.java | 2 +- .../internal/ConstraintModeMarshalling.java | 2 +- .../DiscriminatorTypeMarshalling.java | 2 +- .../mapping/internal/EnumTypeMarshalling.java | 2 +- .../internal/FetchTypeMarshalling.java | 2 +- .../internal/GenerationTypeMarshalling.java | 2 +- .../internal/InheritanceTypeMarshalling.java | 2 +- .../internal/LockModeTypeMarshalling.java | 2 +- .../internal/ParameterModeMarshalling.java | 2 +- .../internal/TemporalTypeMarshalling.java | 2 +- .../jaxb/mapping/spi/CollectionAttribute.java | 4 +- .../jaxb/mapping/spi/FetchableAttribute.java | 2 +- .../boot/jaxb/mapping/spi/ManagedType.java | 2 +- .../boot/jaxb/mapping/spi/NamedQuery.java | 2 +- .../jaxb/mapping/spi/PersistentAttribute.java | 2 +- .../model/IdGeneratorStrategyInterpreter.java | 10 +- .../hibernate/boot/model/TypeDefinition.java | 6 +- .../internal/AbstractConverterDescriptor.java | 4 +- .../ClassBasedConverterDescriptor.java | 2 +- .../InstanceBasedConverterDescriptor.java | 2 +- .../boot/model/convert/package-info.java | 2 +- .../convert/spi/ConverterDescriptor.java | 2 +- .../boot/model/naming/EntityNaming.java | 2 +- .../naming/ImplicitBasicColumnNameSource.java | 2 +- .../ImplicitCollectionTableNameSource.java | 2 +- .../naming/ImplicitJoinColumnNameSource.java | 4 +- .../naming/ImplicitJoinTableNameSource.java | 2 +- .../ImplicitMapKeyColumnNameSource.java | 8 +- .../model/naming/ImplicitNamingStrategy.java | 10 +- ...mplicitNamingStrategyJpaCompliantImpl.java | 2 +- .../model/naming/NamingStrategyHelper.java | 12 +- .../model/naming/ObjectNameNormalizer.java | 10 +- .../internal/InferredBasicValueResolver.java | 10 +- .../internal/NamedConverterResolution.java | 2 +- .../process/internal/ScanningCoordinator.java | 2 +- .../process/internal/VersionResolution.java | 2 +- .../process/spi/MetadataBuildingProcess.java | 4 +- ...AnnotationMetadataSourceProcessorImpl.java | 14 +- .../source/internal/hbm/AttributesHelper.java | 2 +- .../internal/hbm/FetchProfileBinder.java | 2 +- .../internal/hbm/FilterDefinitionBinder.java | 2 +- .../source/internal/hbm/NamedQueryBinder.java | 4 +- .../hbm/RelationalValueSourceHelper.java | 14 +- .../source/spi/CompositeIdentifierSource.java | 4 +- .../source/spi/IdentifiableTypeSource.java | 2 +- .../IdentifierSourceAggregatedComposite.java | 4 +- ...dentifierSourceNonAggregatedComposite.java | 4 +- .../model/source/spi/JpaCallbackSource.java | 14 +- .../boot/model/source/spi/MapsIdSource.java | 4 +- .../boot/model/source/spi/Orderable.java | 2 +- .../spi/PluralAttributeMapKeySource.java | 2 +- .../query/HbmResultSetMappingDescriptor.java | 10 +- .../boot/query/NamedHqlQueryDefinition.java | 2 +- .../query/NamedNativeQueryDefinition.java | 2 +- .../query/NamedProcedureCallDefinition.java | 2 +- .../query/SqlResultSetMappingDescriptor.java | 16 +- .../registry/StandardServiceRegistry.java | 2 +- .../StandardServiceRegistryBuilder.java | 4 +- ...tDelegatingMetadataBuilderImplementor.java | 4 +- ...ractDelegatingMetadataBuildingOptions.java | 2 +- .../hibernate/boot/spi/BootstrapContext.java | 6 +- .../boot/spi/InFlightMetadataCollector.java | 2 +- .../boot/spi/MetadataBuildingOptions.java | 10 +- .../boot/spi/MetadataContributor.java | 2 +- .../boot/spi/SessionFactoryOptions.java | 2 +- .../hibernate/boot/xsd/ConfigXsdSupport.java | 20 +- .../hibernate/boot/xsd/MappingXsdSupport.java | 43 +- .../BiDirectionalAssociationHandler.java | 12 +- .../internal/bytebuddy/EnhancerImpl.java | 8 +- .../bytebuddy/FieldAccessEnhancer.java | 2 +- .../bytebuddy/InlineDirtyCheckingHandler.java | 6 +- .../PersistentAttributeTransformer.java | 2 +- .../spi/DefaultEnhancementContext.java | 18 +- .../enhance/spi/EnhancementContext.java | 2 +- .../enhance/spi/LazyPropertyInitializer.java | 0 .../bytecode/spi/ClassTransformer.java | 2 +- .../cache/internal/EnabledCaching.java | 2 +- .../java/org/hibernate/cache/package.html | 0 .../org/hibernate/cache/spi/FilterKey.java | 0 .../java/org/hibernate/cache/spi/Region.java | 2 +- .../hibernate/cache/spi/RegionFactory.java | 2 +- .../spi/access/CachedDomainDataAccess.java | 4 +- .../cache/spi/entry/CacheEntryStructure.java | 0 .../cache/spi/entry/CollectionCacheEntry.java | 0 .../cache/spi/entry/StructuredCacheEntry.java | 0 .../entry/StructuredCollectionCacheEntry.java | 0 .../spi/entry/StructuredMapCacheEntry.java | 0 .../spi/entry/UnstructuredCacheEntry.java | 0 .../hibernate/cache/spi/entry/package.html | 0 .../CollectionNonStrictReadWriteAccess.java | 2 +- .../spi/support/CollectionReadOnlyAccess.java | 2 +- .../support/CollectionReadWriteAccess.java | 4 +- .../EntityNonStrictReadWriteAccess.java | 2 +- .../spi/support/EntityReadOnlyAccess.java | 2 +- .../spi/support/EntityReadWriteAccess.java | 4 +- .../NaturalIdNonStrictReadWriteAccess.java | 2 +- .../spi/support/NaturalIdReadOnlyAccess.java | 2 +- .../spi/support/NaturalIdReadWriteAccess.java | 4 +- .../hibernate/cfg/AbstractPropertyHolder.java | 22 +- .../java/org/hibernate/cfg/AccessType.java | 6 +- .../org/hibernate/cfg/AnnotationBinder.java | 140 ++-- .../cfg/AttributeConversionInfo.java | 6 +- .../cfg/AttributeConverterDefinition.java | 6 +- .../org/hibernate/cfg/AvailableSettings.java | 98 +-- .../java/org/hibernate/cfg/BinderHelper.java | 20 +- .../hibernate/cfg/ClassPropertyHolder.java | 12 +- .../cfg/CollectionPropertyHolder.java | 20 +- .../hibernate/cfg/CollectionSecondPass.java | 6 +- .../org/hibernate/cfg/ColumnsBuilder.java | 18 +- .../cfg/ComponentPropertyHolder.java | 14 +- .../java/org/hibernate/cfg/Configuration.java | 20 +- .../java/org/hibernate/cfg/Ejb3Column.java | 10 +- .../cfg/Ejb3DiscriminatorColumn.java | 4 +- .../org/hibernate/cfg/Ejb3JoinColumn.java | 6 +- .../java/org/hibernate/cfg/IndexColumn.java | 2 +- .../org/hibernate/cfg/InheritanceState.java | 16 +- .../org/hibernate/cfg/JPAIndexHolder.java | 2 +- .../org/hibernate/cfg/OneToOneSecondPass.java | 8 +- .../org/hibernate/cfg/PropertyContainer.java | 16 +- .../org/hibernate/cfg/PropertyHolder.java | 8 +- .../hibernate/cfg/PropertyInferredData.java | 2 +- .../main/java/org/hibernate/cfg/Settings.java | 2 +- .../java/org/hibernate/cfg/ToOneBinder.java | 4 +- .../hibernate/cfg/UniqueConstraintHolder.java | 2 +- .../cfg/annotations/BasicValueBinder.java | 28 +- .../cfg/annotations/CollectionBinder.java | 48 +- .../cfg/annotations/CustomizableColumns.java | 2 +- .../cfg/annotations/EntityBinder.java | 28 +- .../hibernate/cfg/annotations/ListBinder.java | 2 +- .../hibernate/cfg/annotations/MapBinder.java | 20 +- .../annotations/MapKeyColumnDelegator.java | 4 +- .../MapKeyJoinColumnDelegator.java | 8 +- .../NamedEntityGraphDefinition.java | 2 +- .../cfg/annotations/PropertyBinder.java | 10 +- .../cfg/annotations/QueryBinder.java | 14 +- .../cfg/annotations/QueryHintDefinition.java | 6 +- .../ResultsetMappingSecondPass.java | 2 +- .../cfg/annotations/TableBinder.java | 18 +- .../JPAXMLOverriddenAnnotationReader.java | 184 ++--- .../JPAXMLOverriddenMetadataProvider.java | 14 +- .../reflection/internal/XMLContext.java | 4 +- .../BeanValidationEventListener.java | 12 +- .../BeanValidationIntegrator.java | 2 +- .../beanvalidation/GroupsPerOperation.java | 2 +- .../HibernateTraversableResolver.java | 4 +- .../cfg/beanvalidation/TypeSafeActivator.java | 20 +- .../cfg/beanvalidation/ValidationMode.java | 2 +- .../main/java/org/hibernate/cfg/package.html | 0 .../java/org/hibernate/classic/package.html | 0 .../AbstractPersistentCollection.java | 4 +- .../internal/PersistentArrayHolder.java | 4 +- .../collection/internal/PersistentBag.java | 2 +- .../collection/internal/PersistentList.java | 4 +- .../collection/internal/PersistentMap.java | 22 +- .../collection/internal/PersistentSet.java | 8 +- .../internal/PersistentSortedMap.java | 2 +- .../org/hibernate/collection/package.html | 0 .../context/internal/JTASessionContext.java | 8 +- .../internal/ThreadLocalSessionContext.java | 8 +- .../dialect/AbstractHANADialect.java | 6 +- .../hibernate/dialect/CockroachDialect.java | 2 +- .../org/hibernate/dialect/DB2Dialect.java | 2 +- .../org/hibernate/dialect/DB2zDialect.java | 2 +- .../org/hibernate/dialect/DerbyDialect.java | 4 +- .../java/org/hibernate/dialect/Dialect.java | 86 +-- .../java/org/hibernate/dialect/H2Dialect.java | 2 +- .../org/hibernate/dialect/HSQLDialect.java | 2 +- .../org/hibernate/dialect/MySQLDialect.java | 2 +- .../org/hibernate/dialect/OracleDialect.java | 6 +- .../hibernate/dialect/PostgreSQLDialect.java | 2 +- .../dialect/PostgresPlusDialect.java | 2 +- .../hibernate/dialect/SQLServerDialect.java | 2 +- .../org/hibernate/dialect/SpannerDialect.java | 2 +- .../hibernate/dialect/SybaseASEDialect.java | 2 +- .../org/hibernate/dialect/SybaseDialect.java | 2 +- .../dialect/function/DB2FormatEmulation.java | 2 +- .../InsertSubstringOverlayEmulation.java | 2 +- .../function/SQLServerFormatEmulation.java | 2 +- .../hibernate/dialect/function/package.html | 0 .../identity/IdentityColumnSupport.java | 2 +- .../PessimisticReadSelectLockingStrategy.java | 4 +- ...PessimisticWriteSelectLockingStrategy.java | 4 +- .../dialect/lock/SelectLockingStrategy.java | 4 +- .../java/org/hibernate/dialect/package.html | 0 .../pagination/AbstractLimitHandler.java | 2 +- .../dialect/unique/DB2UniqueDelegate.java | 2 +- .../dialect/unique/UniqueDelegate.java | 2 +- .../hibernate/engine/HibernateIterator.java | 2 +- .../engine/internal/AbstractEntityEntry.java | 4 +- .../hibernate/engine/internal/Cascade.java | 4 +- .../engine/internal/EntityEntryContext.java | 2 +- .../engine/internal/ImmutableEntityEntry.java | 2 +- .../internal/ImmutableEntityEntryFactory.java | 2 +- .../hibernate/engine/internal/JoinHelper.java | 0 .../engine/internal/MutableEntityEntry.java | 2 +- .../internal/MutableEntityEntryFactory.java | 2 +- .../internal/StatefulPersistenceContext.java | 4 +- .../engine/internal/UnsavedValueFactory.java | 0 .../org/hibernate/engine/jdbc/BlobProxy.java | 2 +- .../org/hibernate/engine/jdbc/ClobProxy.java | 2 +- .../engine/jdbc/ContextualLobCreator.java | 2 +- .../org/hibernate/engine/jdbc/NClobProxy.java | 2 +- .../engine/jdbc/ReaderInputStream.java | 0 .../engine/jdbc/SerializableBlobProxy.java | 2 +- .../engine/jdbc/SerializableClobProxy.java | 6 +- .../engine/jdbc/SerializableNClobProxy.java | 6 +- .../engine/jdbc/batch/spi/Batch.java | 2 +- .../DatasourceConnectionProviderImpl.java | 2 +- .../DriverManagerConnectionProviderImpl.java | 2 +- ...asedMultiTenantConnectionProviderImpl.java | 2 +- .../connections/spi/JdbcConnectionAccess.java | 4 +- .../jdbc/cursor/spi/RefCursorSupport.java | 12 +- .../spi/BasicSQLExceptionConverter.java | 2 +- .../internal/DefaultSchemaNameResolver.java | 2 +- .../env/internal/JdbcEnvironmentImpl.java | 2 +- .../env/internal/LobCreatorBuilderImpl.java | 12 +- ...lifiedObjectNameFormatterStandardImpl.java | 2 +- .../engine/jdbc/env/spi/IdentifierHelper.java | 4 +- .../engine/jdbc/env/spi/JdbcEnvironment.java | 4 +- .../engine/jdbc/env/spi/SQLStateType.java | 2 +- .../jdbc/env/spi/SchemaNameResolver.java | 4 +- .../jdbc/internal/BasicFormatterImpl.java | 0 .../jdbc/internal/DDLFormatterImpl.java | 0 .../jdbc/internal/LobCreatorBuilder.java | 4 +- .../engine/jdbc/spi/JdbcCoordinator.java | 2 +- .../engine/jdbc/spi/ResultSetReturn.java | 6 +- .../engine/jdbc/spi/StatementPreparer.java | 4 +- .../hibernate/engine/jdbc/spi/TypeInfo.java | 2 +- .../engine/jdbc/spi/TypeSearchability.java | 10 +- .../java/org/hibernate/engine/package.html | 0 .../org/hibernate/engine/spi/ActionQueue.java | 12 +- .../hibernate/engine/spi/AssociationKey.java | 0 .../hibernate/engine/spi/CascadeStyle.java | 0 .../hibernate/engine/spi/CascadingAction.java | 0 .../engine/spi/CascadingActions.java | 2 +- .../hibernate/engine/spi/CollectionEntry.java | 2 +- .../hibernate/engine/spi/CollectionKey.java | 2 +- .../org/hibernate/engine/spi/EntityEntry.java | 2 +- .../engine/spi/EntityEntryExtraState.java | 4 +- .../engine/spi/EntityEntryFactory.java | 4 +- .../hibernate/engine/spi/EntityUniqueKey.java | 0 .../hibernate/engine/spi/ExecutableList.java | 4 +- .../hibernate/engine/spi/IdentifierValue.java | 0 .../engine/spi/LoadQueryInfluencers.java | 4 +- .../org/hibernate/engine/spi/Mapping.java | 2 +- .../hibernate/engine/spi/QueryParameters.java | 4 +- .../engine/spi/SessionBuilderImplementor.java | 2 +- .../engine/spi/SessionDelegatorBaseImpl.java | 18 +- .../spi/SessionFactoryDelegatingImpl.java | 10 +- .../engine/spi/SessionFactoryImplementor.java | 8 +- .../engine/spi/SessionImplementor.java | 8 +- .../spi/SharedSessionContractImplementor.java | 10 +- .../hibernate/engine/spi/SubselectFetch.java | 0 .../org/hibernate/engine/spi/TypedValue.java | 2 +- .../hibernate/engine/spi/VersionValue.java | 0 .../internal/SynchronizationRegistryImpl.java | 2 +- .../transaction/internal/TransactionImpl.java | 2 +- .../internal/jta/JtaStatusHelper.java | 10 +- .../internal/AbstractJtaPlatform.java | 10 +- .../internal/AtomikosJtaPlatform.java | 4 +- .../internal/BitronixJtaPlatform.java | 4 +- .../BorlandEnterpriseServerJtaPlatform.java | 4 +- .../internal/JBossAppServerJtaPlatform.java | 4 +- .../internal/JBossStandAloneJtaPlatform.java | 4 +- .../platform/internal/JOTMJtaPlatform.java | 4 +- .../platform/internal/JOnASJtaPlatform.java | 4 +- .../platform/internal/JRun4JtaPlatform.java | 4 +- .../internal/JtaPlatformInitiator.java | 2 +- .../internal/JtaSynchronizationStrategy.java | 2 +- .../jta/platform/internal/NoJtaPlatform.java | 12 +- .../platform/internal/OC4JJtaPlatform.java | 4 +- .../platform/internal/OrionJtaPlatform.java | 4 +- .../platform/internal/ResinJtaPlatform.java | 4 +- .../internal/SapNetWeaverJtaPlatform.java | 4 +- .../platform/internal/SunOneJtaPlatform.java | 4 +- .../SynchronizationRegistryAccess.java | 2 +- ...nRegistryBasedSynchronizationStrategy.java | 4 +- .../internal/TransactionManagerAccess.java | 2 +- ...onManagerBasedSynchronizationStrategy.java | 4 +- .../WebSphereExtendedJtaPlatform.java | 16 +- .../internal/WebSphereJtaPlatform.java | 4 +- .../internal/WebSphereLibertyJtaPlatform.java | 14 +- .../internal/WeblogicJtaPlatform.java | 8 +- .../WildFlyStandAloneJtaPlatform.java | 4 +- .../jta/platform/spi/JtaPlatform.java | 10 +- .../spi/SynchronizationRegistry.java | 4 +- ...aultInitializeCollectionEventListener.java | 0 .../internal/DefaultLoadEventListener.java | 20 +- .../internal/DefaultPersistEventListener.java | 0 .../EntityCopyAllowedLoggedObserver.java | 2 +- .../internal/EntityCopyAllowedObserver.java | 2 +- .../event/internal/MergeContext.java | 14 +- .../org/hibernate/event/internal/package.html | 0 .../java/org/hibernate/event/package.html | 0 .../org/hibernate/event/spi/EventSource.java | 0 .../hibernate/event/spi/FlushEntityEvent.java | 0 .../event/spi/FlushEntityEventListener.java | 0 .../event/spi/InitializeCollectionEvent.java | 0 .../InitializeCollectionEventListener.java | 0 .../org/hibernate/event/spi/MergeEvent.java | 0 .../event/spi/MergeEventListener.java | 0 .../org/hibernate/event/spi/PersistEvent.java | 0 .../event/spi/PersistEventListener.java | 0 .../hibernate/event/spi/PreDeleteEvent.java | 0 .../hibernate/event/spi/PreInsertEvent.java | 0 .../hibernate/event/spi/PreUpdateEvent.java | 0 .../event/spi/SaveOrUpdateEvent.java | 0 .../event/spi/SaveOrUpdateEventListener.java | 0 .../hibernate/exception/DataException.java | 0 .../java/org/hibernate/exception/package.html | 0 .../spi/SQLExceptionConversionDelegate.java | 2 +- .../exception/spi/SQLExceptionConverter.java | 2 +- .../spi/SQLExceptionConverterFactory.java | 2 +- .../org/hibernate/graph/AttributeNode.java | 4 +- .../CannotBecomeEntityGraphException.java | 2 +- .../org/hibernate/graph/EntityGraphs.java | 12 +- .../main/java/org/hibernate/graph/Graph.java | 6 +- .../java/org/hibernate/graph/GraphParser.java | 14 +- .../java/org/hibernate/graph/RootGraph.java | 8 +- .../java/org/hibernate/graph/SubGraph.java | 6 +- .../graph/internal/RootGraphImpl.java | 2 +- .../graph/spi/AttributeNodeImplementor.java | 2 +- .../id/AbstractPostInsertGenerator.java | 0 .../hibernate/id/EntityIdentifierNature.java | 4 +- .../org/hibernate/id/IdentifierGenerator.java | 2 +- .../id/IdentifierGeneratorHelper.java | 2 +- .../id/PostInsertIdentifierGenerator.java | 0 .../id/PostInsertIdentityPersister.java | 0 .../org/hibernate/id/SelectGenerator.java | 0 .../id/enhanced/PooledOptimizer.java | 2 +- .../main/java/org/hibernate/id/package.html | 0 .../internal/AbstractSessionImpl.java | 0 .../AbstractSharedSessionContract.java | 12 +- .../hibernate/internal/CoreMessageLogger.java | 4 +- .../internal/EntityManagerMessageLogger.java | 2 +- .../internal/ExceptionConverterImpl.java | 20 +- .../internal/ExceptionMapperStandardImpl.java | 2 +- .../internal/FastSessionServices.java | 6 +- .../internal/SessionFactoryImpl.java | 14 +- .../internal/SessionFactoryRegistry.java | 2 +- .../org/hibernate/internal/SessionImpl.java | 26 +- .../internal/StatelessSessionImpl.java | 2 +- .../internal/log/DeprecationLogger.java | 2 +- .../internal/log/UrlMessageBundle.java | 6 +- .../hibernate/internal/util/Cloneable.java | 0 .../hibernate/internal/util/ConfigHelper.java | 4 +- .../internal/util/LockModeConverter.java | 6 +- .../hibernate/internal/util/MarkerObject.java | 0 .../internal/util/ReflectHelper.java | 4 +- .../internal/util/SerializationHelper.java | 2 +- .../hibernate/internal/util/ValueHolder.java | 2 +- .../util/collections/ArrayHelper.java | 8 +- .../collections/BoundedConcurrentHashMap.java | 20 +- .../util/collections/CollectionHelper.java | 0 .../ConcurrentReferenceHashMap.java | 22 +- .../util/collections/IdentityMap.java | 10 +- .../util/collections/SingletonIterator.java | 0 .../util/compare/CalendarComparator.java | 0 .../util/compare/ComparableComparator.java | 0 .../util/config/ConfigurationHelper.java | 6 +- .../hibernate/jdbc/AbstractReturningWork.java | 2 +- .../java/org/hibernate/jdbc/AbstractWork.java | 2 +- .../java/org/hibernate/jdbc/WorkExecutor.java | 4 +- .../main/java/org/hibernate/jdbc/package.html | 0 .../org/hibernate/jpa/AvailableSettings.java | 4 +- .../hibernate/jpa/HibernateEntityManager.java | 6 +- .../jpa/HibernateEntityManagerFactory.java | 8 +- .../jpa/HibernatePersistenceProvider.java | 12 +- .../EntityManagerFactoryBuilderImpl.java | 12 +- .../hibernate/jpa/boot/internal/Helper.java | 2 +- .../ParsedPersistenceXmlDescriptor.java | 8 +- .../PersistenceUnitInfoDescriptor.java | 8 +- .../boot/internal/PersistenceXmlParser.java | 8 +- .../org/hibernate/jpa/boot/spi/Bootstrap.java | 4 +- .../boot/spi/EntityManagerFactoryBuilder.java | 2 +- .../boot/spi/PersistenceUnitDescriptor.java | 8 +- .../jpa/boot/spi/ProviderChecker.java | 4 +- .../internal/CallbackBuilderLegacyImpl.java | 12 +- .../event/internal/CallbackRegistryImpl.java | 2 +- .../jpa/event/internal/CallbacksFactory.java | 2 +- .../hibernate/jpa/event/spi/CallbackType.java | 14 +- .../event/spi/jpa/ExtendedBeanManager.java | 2 +- .../ExceptionMapperLegacyJpaImpl.java | 4 +- .../jpa/internal/PersistenceUnitUtilImpl.java | 8 +- .../jpa/internal/util/CacheModeHelper.java | 4 +- .../internal/util/ConfigurationHelper.java | 8 +- .../internal/util/FlushModeTypeHelper.java | 4 +- .../jpa/internal/util/LockModeTypeHelper.java | 2 +- .../jpa/internal/util/LockOptionsHelper.java | 4 +- .../PersistenceUnitTransactionTypeHelper.java | 4 +- .../internal/util/PersistenceUtilHelper.java | 16 +- .../org/hibernate/jpa/spi/JpaCompliance.java | 18 +- .../jpa/spi/NativeQueryTupleTransformer.java | 4 +- .../org/hibernate/jpa/spi/ParameterBind.java | 2 +- .../jpa/spi/ParameterRegistration.java | 12 +- .../internal/LoaderSqlAstCreationState.java | 4 +- .../java/org/hibernate/loader/package.html | 0 .../org/hibernate/lob/ReaderInputStream.java | 2 +- .../java/org/hibernate/mapping/Backref.java | 0 .../org/hibernate/mapping/BasicValue.java | 6 +- .../org/hibernate/mapping/Collection.java | 8 +- .../java/org/hibernate/mapping/Column.java | 2 +- .../java/org/hibernate/mapping/Component.java | 6 +- .../org/hibernate/mapping/IndexBackref.java | 0 .../java/org/hibernate/mapping/KeyValue.java | 0 .../java/org/hibernate/mapping/OneToOne.java | 2 +- .../hibernate/mapping/PersistentClass.java | 6 +- .../java/org/hibernate/mapping/RootClass.java | 2 +- .../org/hibernate/mapping/Selectable.java | 0 .../org/hibernate/mapping/SimpleValue.java | 2 +- .../mapping/SingleTableSubclass.java | 0 .../java/org/hibernate/mapping/Table.java | 4 +- .../org/hibernate/mapping/TableOwner.java | 2 +- .../java/org/hibernate/mapping/UniqueKey.java | 2 +- .../java/org/hibernate/mapping/package.html | 0 .../metamodel/AttributeClassification.java | 2 +- .../metamodel/CollectionClassification.java | 2 +- .../metamodel/ValueClassification.java | 2 +- .../metamodel/internal/AttributeFactory.java | 12 +- .../metamodel/internal/MetadataContext.java | 8 +- .../mapping/EmbeddableValuedModelPart.java | 6 +- .../metamodel/mapping/ModelPart.java | 2 +- .../metamodel/mapping/SelectableMappings.java | 2 +- .../EmbeddedIdentifierMappingImpl.java | 2 +- .../internal/MappingModelCreationHelper.java | 2 +- .../NonAggregatedIdentifierMappingImpl.java | 2 +- .../ordering/OrderByFragmentTranslator.java | 2 +- .../mapping/ordering/ast/ColumnReference.java | 2 +- .../mapping/ordering/package-info.java | 2 +- .../metamodel/model/convert/Converters.java | 2 +- .../internal/JpaAttributeConverterImpl.java | 2 +- .../internal/NamedEnumValueConverter.java | 2 +- .../internal/OrdinalEnumValueConverter.java | 2 +- .../convert/spi/BasicValueConverter.java | 2 +- .../convert/spi/JpaAttributeConverter.java | 2 +- .../domain/AbstractIdentifiableType.java | 10 +- .../model/domain/AbstractManagedType.java | 16 +- .../AllowableTemporalParameterType.java | 2 +- .../model/domain/BagPersistentAttribute.java | 2 +- .../model/domain/BasicDomainType.java | 2 +- .../model/domain/EmbeddableDomainType.java | 2 +- .../model/domain/EmbeddedDomainType.java | 2 +- .../model/domain/EntityDomainType.java | 2 +- .../model/domain/IdentifiableDomainType.java | 4 +- .../metamodel/model/domain/JpaMetamodel.java | 10 +- .../model/domain/ListPersistentAttribute.java | 2 +- .../model/domain/ManagedDomainType.java | 2 +- .../model/domain/MapPersistentAttribute.java | 2 +- .../domain/MappedSuperclassDomainType.java | 2 +- .../model/domain/PersistentAttribute.java | 2 +- .../domain/PluralPersistentAttribute.java | 2 +- .../model/domain/SetPersistentAttribute.java | 2 +- .../model/domain/SimpleDomainType.java | 2 +- .../domain/SingularPersistentAttribute.java | 2 +- .../domain/internal/AbstractAttribute.java | 2 +- .../internal/AnyMappingSqmPathSource.java | 2 +- .../domain/internal/AttributeContainer.java | 2 +- .../domain/internal/EmbeddableTypeImpl.java | 2 +- .../model/domain/internal/EntityTypeImpl.java | 2 +- .../domain/internal/JpaMetamodelImpl.java | 18 +- .../model/domain/internal/MapMember.java | 0 .../domain/internal/MappingMetamodelImpl.java | 10 +- .../internal/PluralAttributeBuilder.java | 4 +- .../metamodel/model/domain/package-info.java | 2 +- .../metamodel/spi/MetamodelImplementor.java | 2 +- .../src/main/java/org/hibernate/package.html | 0 .../org/hibernate/param/ParameterBinder.java | 2 +- .../collection/CollectionPersister.java | 2 +- .../persister/collection/package.html | 0 .../entity/AbstractEntityPersister.java | 2 +- .../entity/BasicEntityPropertyMapping.java | 0 .../persister/entity/DiscriminatorType.java | 4 +- .../persister/entity/EntityPersister.java | 8 +- .../hibernate/persister/entity/package.html | 0 .../java/org/hibernate/persister/package.html | 0 .../java/org/hibernate/pretty/package.html | 0 .../hibernate/procedure/ProcedureCall.java | 8 +- .../hibernate/procedure/ProcedureOutputs.java | 8 +- .../internal/FunctionReturnImpl.java | 2 +- .../NamedCallableQueryMementoImpl.java | 2 +- .../procedure/internal/ProcedureCallImpl.java | 26 +- .../internal/ProcedureParameterImpl.java | 2 +- .../ProcedureParameterMetadataImpl.java | 2 +- .../StandardCallableStatementSupport.java | 2 +- .../spi/ProcedureCallImplementor.java | 8 +- .../internal/PropertyAccessMixedImpl.java | 4 +- .../org/hibernate/proxy/LazyInitializer.java | 2 +- .../org/hibernate/proxy/ProxyFactory.java | 2 +- .../java/org/hibernate/proxy/package.html | 0 .../java/org/hibernate/query/JpaTuple.java | 2 +- .../java/org/hibernate/query/NativeQuery.java | 18 +- .../hibernate/query/ParameterMetadata.java | 2 +- .../main/java/org/hibernate/query/Query.java | 16 +- .../org/hibernate/query/QueryParameter.java | 2 +- .../org/hibernate/query/QueryProducer.java | 22 +- .../query/QueryTypeMismatchException.java | 2 +- .../org/hibernate/query/TemporalUnit.java | 2 +- .../org/hibernate/query/TupleTransformer.java | 2 +- .../criteria/HibernateCriteriaBuilder.java | 28 +- .../hibernate/query/criteria/JpaCoalesce.java | 4 +- .../query/criteria/JpaCollectionJoin.java | 6 +- .../query/criteria/JpaCompoundSelection.java | 2 +- .../query/criteria/JpaCriteriaBase.java | 2 +- .../query/criteria/JpaCriteriaDelete.java | 2 +- .../query/criteria/JpaCriteriaQuery.java | 14 +- .../query/criteria/JpaCriteriaUpdate.java | 2 +- .../query/criteria/JpaExpression.java | 2 +- .../hibernate/query/criteria/JpaFetch.java | 8 +- .../query/criteria/JpaFetchParent.java | 10 +- .../org/hibernate/query/criteria/JpaFrom.java | 2 +- .../query/criteria/JpaInPredicate.java | 2 +- .../org/hibernate/query/criteria/JpaJoin.java | 8 +- .../hibernate/query/criteria/JpaListJoin.java | 6 +- .../hibernate/query/criteria/JpaMapJoin.java | 6 +- .../hibernate/query/criteria/JpaOrder.java | 2 +- .../criteria/JpaParameterExpression.java | 2 +- .../org/hibernate/query/criteria/JpaPath.java | 10 +- .../query/criteria/JpaPathSource.java | 2 +- .../query/criteria/JpaPredicate.java | 2 +- .../query/criteria/JpaQueryStructure.java | 8 +- .../query/criteria/JpaQueryableCriteria.java | 2 +- .../org/hibernate/query/criteria/JpaRoot.java | 2 +- .../query/criteria/JpaSearchedCase.java | 4 +- .../query/criteria/JpaSelectCriteria.java | 8 +- .../query/criteria/JpaSelection.java | 2 +- .../hibernate/query/criteria/JpaSetJoin.java | 6 +- .../query/criteria/JpaSimpleCase.java | 4 +- .../hibernate/query/criteria/JpaSubQuery.java | 10 +- .../query/criteria/JpaTupleElement.java | 2 +- .../FullyQualifiedReflectivePathTerminal.java | 2 +- .../internal/NamedHqlQueryMementoImpl.java | 0 .../query/internal/BindingTypeHelper.java | 2 +- .../query/internal/NamedQueryHelper.java | 4 +- .../query/internal/ParameterMetadataImpl.java | 4 +- .../query/internal/QueryOptionsImpl.java | 4 +- .../internal/QueryParameterBindingImpl.java | 2 +- .../internal/ResultMementoBasicStandard.java | 2 +- .../named/NamedResultSetMappingMemento.java | 2 +- .../query/procedure/ProcedureParameter.java | 2 +- .../org/hibernate/query/results/Builders.java | 6 +- .../query/results/ResultSetMapping.java | 4 +- ...pleteResultBuilderBasicValuedStandard.java | 2 +- .../CompleteResultBuilderInstantiation.java | 2 +- .../query/results/complete/package-info.java | 2 +- .../DynamicResultBuilderBasicConverted.java | 2 +- .../hibernate/query/results/package-info.java | 2 +- .../hibernate/query/spi/AbstractQuery.java | 16 +- .../query/spi/DelegatingQueryOptions.java | 4 +- .../query/spi/MutableQueryOptions.java | 4 +- .../spi/ParameterMetadataImplementor.java | 2 +- .../org/hibernate/query/spi/QueryOptions.java | 6 +- .../query/spi/QueryOptionsAdapter.java | 4 +- .../query/spi/QueryParameterBinding.java | 2 +- .../spi/QueryParameterBindingValidator.java | 2 +- .../query/spi/QueryParameterBindings.java | 2 +- .../query/spi/QueryParameterListBinding.java | 2 +- .../query/sql/internal/NativeQueryImpl.java | 18 +- .../sql/spi/NamedNativeQueryMemento.java | 2 +- .../query/sql/spi/NativeQueryImplementor.java | 12 +- .../org/hibernate/query/sqm/NodeBuilder.java | 24 +- .../hibernate/query/sqm/SqmPathSource.java | 4 +- .../PatternBasedSqmFunctionDescriptor.java | 0 .../internal/ConcreteSqmSelectQueryPlan.java | 8 +- .../query/sqm/internal/QuerySqmImpl.java | 8 +- .../sqm/internal/SqmCriteriaNodeBuilder.java | 28 +- .../sqm/internal/SqmMappingModelHelper.java | 2 +- .../org/hibernate/query/sqm/package-info.java | 2 +- .../sqm/sql/BaseSqmToSqlAstConverter.java | 2 +- .../AbstractSqmRestrictedDmlStatement.java | 8 +- .../hibernate/query/sqm/tree/SqmJoinType.java | 14 +- .../sqm/tree/delete/SqmDeleteStatement.java | 4 +- .../tree/domain/AbstractSqmAttributeJoin.java | 6 +- .../sqm/tree/domain/AbstractSqmFrom.java | 18 +- .../sqm/tree/domain/AbstractSqmPath.java | 8 +- .../tree/domain/AbstractSqmPluralJoin.java | 2 +- .../NonAggregatedCompositeSimplePath.java | 2 +- .../query/sqm/tree/domain/SqmBagJoin.java | 4 +- .../query/sqm/tree/domain/SqmListJoin.java | 4 +- .../sqm/tree/domain/SqmMapEntryReference.java | 4 +- .../query/sqm/tree/domain/SqmMapJoin.java | 6 +- .../query/sqm/tree/domain/SqmPath.java | 6 +- .../domain/SqmPolymorphicRootDescriptor.java | 14 +- .../query/sqm/tree/domain/SqmSetJoin.java | 6 +- .../expression/AbstractSqmExpression.java | 2 +- .../tree/expression/JpaCriteriaParameter.java | 2 +- .../sqm/tree/expression/SqmCaseSearched.java | 2 +- .../sqm/tree/expression/SqmCaseSimple.java | 2 +- .../sqm/tree/expression/SqmCoalesce.java | 2 +- .../sqm/tree/expression/SqmExpression.java | 2 +- .../sqm/tree/expression/SqmFieldLiteral.java | 2 +- .../SqmJpaCriteriaParameterWrapper.java | 2 +- .../query/sqm/tree/from/SqmFrom.java | 20 +- .../query/sqm/tree/from/SqmJoin.java | 2 +- .../tree/predicate/AbstractSqmPredicate.java | 2 +- .../sqm/tree/predicate/SqmAndPredicate.java | 2 +- .../SqmBooleanExpressionPredicate.java | 2 +- .../tree/predicate/SqmGroupedPredicate.java | 2 +- .../tree/predicate/SqmInListPredicate.java | 2 +- .../predicate/SqmInSubQueryPredicate.java | 2 +- .../tree/predicate/SqmNegatedPredicate.java | 2 +- .../sqm/tree/predicate/SqmOrPredicate.java | 2 +- .../tree/select/AbstractSqmSelectQuery.java | 8 +- .../tree/select/SqmJpaCompoundSelection.java | 6 +- .../query/sqm/tree/select/SqmQuerySpec.java | 4 +- .../sqm/tree/select/SqmSelectStatement.java | 12 +- .../sqm/tree/select/SqmSelectableNode.java | 2 +- .../query/sqm/tree/select/SqmSubQuery.java | 22 +- .../sqm/tree/update/SqmUpdateStatement.java | 8 +- .../internal/CdiBasedBeanContainer.java | 2 +- .../internal/CdiBeanContainerBuilder.java | 2 +- .../CdiBeanContainerDelayedAccessImpl.java | 2 +- .../CdiBeanContainerExtendedAccessImpl.java | 2 +- .../CdiBeanContainerImmediateAccessImpl.java | 2 +- .../ContainerManagedLifecycleStrategy.java | 6 +- .../JpaCompliantLifecycleStrategy.java | 10 +- .../internal/NamedBeanQualifier.java | 4 +- .../container/spi/ExtendedBeanManager.java | 2 +- .../spi/ManagedBeanRegistryInitiator.java | 4 +- .../resource/jdbc/ResourceRegistry.java | 8 +- .../spi/LogicalConnectionImplementor.java | 2 +- ...sourceLocalTransactionCoordinatorImpl.java | 8 +- .../DdlTransactionIsolatorJtaImpl.java | 6 +- .../jta/internal/JtaIsolationDelegate.java | 8 +- .../jta/internal/JtaTransactionAdapter.java | 4 +- ...nsactionAdapterTransactionManagerImpl.java | 4 +- ...TransactionAdapterUserTransactionImpl.java | 4 +- .../JtaTransactionCoordinatorImpl.java | 6 +- .../jta/internal/StatusTranslator.java | 2 +- .../AfterCompletionAction.java | 4 +- .../synchronization/ExceptionMapper.java | 6 +- .../synchronization/ManagedFlushChecker.java | 2 +- .../RegisteredSynchronization.java | 4 +- .../SynchronizationCallbackCoordinator.java | 2 +- ...ionCallbackCoordinatorNonTrackingImpl.java | 2 +- .../SynchronizationCallbackTarget.java | 6 +- .../synchronization/package-info.java | 2 +- .../SynchronizationRegistryStandardImpl.java | 2 +- .../resource/transaction/package-info.java | 4 +- .../spi/SynchronizationRegistry.java | 2 +- .../SynchronizationRegistryImplementor.java | 6 +- .../spi/TransactionCoordinator.java | 2 +- .../internal/StandardJaccServiceImpl.java | 10 +- .../org/hibernate/sql/DerbyCaseFragment.java | 0 .../sql/ast/SqlAstNodeRenderingMode.java | 8 +- .../sql/ast/spi/AbstractSqlAstTranslator.java | 2 +- .../sql/ast/spi/SqlSelectionProducer.java | 2 +- .../sql/ast/tree/cte/CteTableGroup.java | 2 +- .../main/java/org/hibernate/sql/package.html | 0 .../internal/RowTransformerJpaTupleImpl.java | 2 +- ...StandardEntityGraphTraversalStateImpl.java | 2 +- .../results/internal/TupleElementImpl.java | 2 +- .../sql/results/internal/TupleImpl.java | 2 +- .../sql/results/internal/TupleMetadata.java | 2 +- .../hibernate/stat/CacheRegionStatistics.java | 0 .../hibernate/stat/CollectionStatistics.java | 0 .../org/hibernate/stat/EntityStatistics.java | 0 .../org/hibernate/stat/QueryStatistics.java | 0 .../stat/SecondLevelCacheStatistics.java | 0 .../org/hibernate/stat/SessionStatistics.java | 0 .../java/org/hibernate/stat/Statistics.java | 0 .../stat/internal/CategorizedStatistics.java | 0 .../stat/internal/SessionStatisticsImpl.java | 0 .../stat/internal/StatisticsImpl.java | 2 +- .../stat/internal/StatsNamedContainer.java | 2 +- .../main/java/org/hibernate/stat/package.html | 0 .../tool/hbm2ddl/SchemaValidator.java | 0 .../tool/hbm2ddl/SchemaValidatorTask.java | 0 .../org/hibernate/tool/hbm2ddl/package.html | 0 .../tool/schema/JdbcMetadaAccessStrategy.java | 4 +- .../spi/SequenceInformationExtractor.java | 2 +- .../internal/GroupedSchemaMigratorImpl.java | 2 +- .../internal/GroupedSchemaValidatorImpl.java | 2 +- .../IndividuallySchemaMigratorImpl.java | 2 +- .../IndividuallySchemaValidatorImpl.java | 2 +- ...onnectionAccessConnectionProviderImpl.java | 2 +- ...onnectionAccessProvidedConnectionImpl.java | 2 +- .../tool/schema/spi/SchemaFilterProvider.java | 2 +- .../java/org/hibernate/transform/package.html | 0 .../tuple/DynamicMapInstantiator.java | 0 .../tuple/NonIdentifierAttribute.java | 2 +- .../org/hibernate/tuple/PojoInstantiator.java | 0 .../org/hibernate/tuple/StandardProperty.java | 2 +- .../component/ComponentTuplizerFactory.java | 2 +- .../java/org/hibernate/tuple/package.html | 0 .../hibernate/type/AdaptedImmutableType.java | 0 .../main/java/org/hibernate/type/BagType.java | 2 +- .../org/hibernate/type/BigIntegerType.java | 0 .../java/org/hibernate/type/BinaryType.java | 2 +- .../java/org/hibernate/type/BooleanType.java | 2 +- .../org/hibernate/type/CalendarDateType.java | 2 +- .../org/hibernate/type/CalendarTimeType.java | 6 +- .../java/org/hibernate/type/CalendarType.java | 2 +- .../org/hibernate/type/CharArrayType.java | 2 +- .../type/CharacterArrayClobType.java | 2 +- .../type/CharacterArrayNClobType.java | 4 +- .../hibernate/type/CharacterArrayType.java | 2 +- .../org/hibernate/type/CharacterType.java | 2 +- .../java/org/hibernate/type/ClobType.java | 2 +- .../org/hibernate/type/CollectionType.java | 6 +- .../hibernate/type/CustomCollectionType.java | 4 +- .../java/org/hibernate/type/DateType.java | 2 +- .../hibernate/type/EmbeddedComponentType.java | 0 .../java/org/hibernate/type/EntityType.java | 2 +- .../java/org/hibernate/type/EnumType.java | 20 +- .../java/org/hibernate/type/InstantType.java | 2 +- .../org/hibernate/type/LocalDateTimeType.java | 2 +- .../org/hibernate/type/LocalDateType.java | 2 +- .../org/hibernate/type/LocalTimeType.java | 2 +- .../main/java/org/hibernate/type/MapType.java | 8 +- .../hibernate/type/MaterializedClobType.java | 2 +- .../java/org/hibernate/type/NClobType.java | 2 +- .../type/NumericBooleanConverter.java | 4 +- .../hibernate/type/OffsetDateTimeType.java | 2 +- .../org/hibernate/type/OffsetTimeType.java | 2 +- .../org/hibernate/type/OrderedMapType.java | 0 .../org/hibernate/type/OrderedSetType.java | 0 .../org/hibernate/type/PostgresUUIDType.java | 4 +- .../org/hibernate/type/PrimitiveType.java | 2 +- .../org/hibernate/type/SingleColumnType.java | 12 +- .../hibernate/type/StandardBasicTypes.java | 38 +- .../java/org/hibernate/type/StringType.java | 2 +- .../java/org/hibernate/type/TimeType.java | 4 +- .../org/hibernate/type/TimestampType.java | 6 +- .../hibernate/type/TrueFalseConverter.java | 4 +- .../java/org/hibernate/type/UUIDCharType.java | 2 +- .../org/hibernate/type/WrapperBinaryType.java | 2 +- .../org/hibernate/type/YesNoConverter.java | 4 +- .../org/hibernate/type/ZonedDateTimeType.java | 2 +- ...uteConverterJdbcTypeDescriptorAdapter.java | 4 +- .../AttributeConverterTypeAdapter.java | 2 +- .../converter/ConvertedValueExtractor.java | 4 +- .../descriptor/converter/package-info.java | 2 +- .../java/AbstractClassTypeDescriptor.java | 2 +- .../java/AbstractTemporalTypeDescriptor.java | 8 +- .../java/AbstractTypeDescriptor.java | 2 +- .../java/CalendarDateTypeDescriptor.java | 4 +- .../java/CalendarTimeTypeDescriptor.java | 4 +- .../java/CalendarTypeDescriptor.java | 2 +- .../type/descriptor/java/DataHelper.java | 2 +- .../descriptor/java/DateTypeDescriptor.java | 4 +- .../java/EnumJavaTypeDescriptor.java | 2 +- .../java/InstantJavaDescriptor.java | 8 +- .../java/JdbcDateTypeDescriptor.java | 4 +- .../java/JdbcTimeTypeDescriptor.java | 8 +- .../java/JdbcTimestampTypeDescriptor.java | 2 +- .../java/LocalDateJavaDescriptor.java | 2 +- .../java/LocalDateTimeJavaDescriptor.java | 8 +- .../java/LocalTimeJavaDescriptor.java | 2 +- .../descriptor/java/NClobTypeDescriptor.java | 4 +- .../java/OffsetDateTimeJavaDescriptor.java | 4 +- .../java/OffsetTimeJavaDescriptor.java | 10 +- .../java/TemporalJavaTypeDescriptor.java | 4 +- .../java/ZonedDateTimeJavaDescriptor.java | 10 +- .../type/descriptor/jdbc/BasicExtractor.java | 2 +- .../descriptor/jdbc/BinaryTypeDescriptor.java | 2 +- .../jdbc/BooleanTypeDescriptor.java | 2 +- .../descriptor/jdbc/DateTypeDescriptor.java | 2 +- .../descriptor/jdbc/JdbcTypeDescriptor.java | 2 +- .../jdbc/JdbcTypeDescriptorIndicators.java | 4 +- .../descriptor/jdbc/TimeTypeDescriptor.java | 2 +- .../jdbc/TimestampTypeDescriptor.java | 2 +- .../jdbc/TimestampWithTimeZoneDescriptor.java | 2 +- .../JdbcLiteralFormatterTemporal.java | 2 +- .../main/java/org/hibernate/type/package.html | 0 .../hibernate/type/spi/TypeConfiguration.java | 2 +- .../hibernate/usertype/EnhancedUserType.java | 0 .../usertype/UserCollectionType.java | 2 +- .../hibernate/usertype/UserVersionType.java | 0 .../java/org/hibernate/usertype/package.html | 0 ...karta.persistence.spi.PersistenceProvider} | 0 .../xsd/mapping/legacy-mapping-4.0.xsd | 4 +- .../main/xjb/hbm-configuration-bindings.xjb | 4 +- .../src/main/xjb/hbm-mapping-bindings.xjb | 4 +- .../src/main/xjb/mapping-bindings.xjb | 24 +- .../java/AnnotationMappedNoPackageEntity.java | 70 +- hibernate-core/src/test/java/from/In.java | 8 +- hibernate-core/src/test/java/in/from/Any.java | 8 +- .../java/org/hibernate/IrrelevantEntity.java | 6 +- .../internal/bytebuddy/SimpleEntity.java | 10 +- .../SkipLoadingSequenceInformationTest.java | 8 +- .../event/PreUpdateEventListenerVetoTest.java | 6 +- ...antiatdCollectionSkipDeleteOrphanTest.java | 46 +- .../spi/NativeQueryTupleTransformerTest.java | 2 +- .../BaseEntityManagerFunctionalTestCase.java | 14 +- .../test/java/org/hibernate/jpa/test/Cat.java | 26 +- .../org/hibernate/jpa/test/Distributor.java | 6 +- .../test/EntityManagerFactoryClosedTest.java | 4 +- .../hibernate/jpa/test/EntityManagerTest.java | 12 +- .../java/org/hibernate/jpa/test/Item.java | 26 +- .../java/org/hibernate/jpa/test/Kitten.java | 6 +- .../jpa/test/LastUpdateListener.java | 4 +- .../NamedQueryTransactionFailureTest.java | 2 +- .../TestingEntityManagerFactoryGenerator.java | 2 +- .../java/org/hibernate/jpa/test/Wallet.java | 4 +- .../test/joinable/ManyToOneJoinTableTest.java | 20 +- .../test/mapping/NestedEmbeddableTest.java | 40 +- .../org/hibernate/jpa/test/mapping/Phone.java | 8 +- .../AbstractJpaMetamodelPopulationTest.java | 18 +- .../hibernate/jpa/test/metamodel/Address.java | 16 +- .../hibernate/jpa/test/metamodel/Alias.java | 18 +- .../hibernate/jpa/test/metamodel/Article.java | 6 +- .../test/metamodel/BaseEmbeddedEntity.java | 4 +- .../hibernate/jpa/test/metamodel/Country.java | 4 +- .../jpa/test/metamodel/CreditCard.java | 16 +- .../jpa/test/metamodel/Customer.java | 22 +- .../jpa/test/metamodel/EmbeddedTypeTest.java | 8 +- .../hibernate/jpa/test/metamodel/Entity1.java | 10 +- .../hibernate/jpa/test/metamodel/Entity2.java | 10 +- .../hibernate/jpa/test/metamodel/Entity3.java | 6 +- .../hibernate/jpa/test/metamodel/Info.java | 12 +- .../jpa/test/metamodel/LineItem.java | 14 +- .../jpa/test/metamodel/MapEntity.java | 18 +- .../jpa/test/metamodel/MapEntityLocal.java | 4 +- .../hibernate/jpa/test/metamodel/Order.java | 18 +- .../hibernate/jpa/test/metamodel/Phone.java | 16 +- .../hibernate/jpa/test/metamodel/Product.java | 28 +- .../jpa/test/metamodel/ShelfLife.java | 4 +- .../hibernate/jpa/test/metamodel/Spouse.java | 14 +- .../hibernate/jpa/test/metamodel/Thing.java | 8 +- .../jpa/test/metamodel/ThingWithQuantity.java | 2 +- .../jpa/test/metamodel/Translation.java | 6 +- .../jpa/test/metamodel/VersionedEntity.java | 6 +- .../jpa/test/pack/cfgxmlpar/Morito.java | 6 +- .../pack/defaultpar/ApplicationServer.java | 6 +- .../pack/defaultpar/IncrementListener.java | 2 +- .../jpa/test/pack/defaultpar/Money.java | 6 +- .../jpa/test/pack/defaultpar/Mouse.java | 2 +- .../jpa/test/pack/defaultpar/Version.java | 2 +- .../defaultpar_1_0/ApplicationServer1.java | 8 +- .../defaultpar_1_0/IncrementListener1.java | 4 +- .../jpa/test/pack/defaultpar_1_0/Money1.java | 8 +- .../jpa/test/pack/defaultpar_1_0/Mouse1.java | 4 +- .../test/pack/defaultpar_1_0/Version1.java | 4 +- .../test/pack/excludehbmpar/Caipirinha.java | 6 +- .../jpa/test/pack/explicitpar/Washer.java | 2 +- .../jpa/test/pack/explodedpar/Carpet.java | 6 +- .../jpa/test/pack/externaljar/Scooter.java | 4 +- .../jpa/test/pack/overridenpar/Bug.java | 8 +- .../hibernate/jpa/test/pack/spacepar/Bug.java | 8 +- .../jpa/test/pack/war/ApplicationServer.java | 6 +- .../jpa/test/pack/war/IncrementListener.java | 2 +- .../hibernate/jpa/test/pack/war/Money.java | 6 +- .../hibernate/jpa/test/pack/war/Mouse.java | 2 +- .../hibernate/jpa/test/pack/war/Version.java | 2 +- .../jpa/test/persistenceunit/DataPoint.java | 6 +- ...TwoPersistenceUnits2LCDisabledEnabled.java | 8 +- .../persistenceunit/UnlistedDataPoint.java | 6 +- .../jpa/test/query/CachedQueryTest.java | 6 +- .../ConstructorResultNativeQueryTest.java | 26 +- .../hibernate/jpa/test/query/Contractor.java | 4 +- .../jpa/test/query/DateTimeParameterTest.java | 14 +- .../hibernate/jpa/test/query/Employee.java | 12 +- .../jpa/test/query/NamedQueryCommentTest.java | 14 +- .../jpa/test/query/NamedQueryTest.java | 16 +- .../NativeQueryOrdinalParametersTest.java | 18 +- ...ativeQueryResultTypeAutoDiscoveryTest.java | 38 +- .../test/query/NullParameterQueryTest.java | 6 +- ...racleConstructorResultNativeQueryTest.java | 24 +- .../query/QueryParametersValidationTest.java | 10 +- .../hibernate/jpa/test/query/QueryTest.java | 34 +- ...eryWithLiteralsInSelectExpressionTest.java | 12 +- .../query/ScalarResultNativeQueryTest.java | 16 +- .../jpa/test/query/TupleNativeQueryTest.java | 4 +- .../CustomAfterCompletionTest.java | 6 +- .../CustomBeforeCompletionTest.java | 6 +- .../orm/test/annotations/Company.java | 6 +- .../annotations/CreationTimestampTest.java | 8 +- ...seCreationTimestampNullableColumnTest.java | 8 +- .../orm/test/annotations/EntityTest.java | 2 +- .../orm/test/annotations/Flight.java | 28 +- ...ryCreationTimestampNullableColumnTest.java | 8 +- .../InMemoryUpdateTimestampTest.java | 6 +- .../test/annotations/JoinedSubclassTest.java | 4 +- .../hibernate/orm/test/annotations/Sky.java | 12 +- .../UpdateTimeStampInheritanceTest.java | 24 +- .../test/annotations/UpdateTimestampTest.java | 8 +- .../test/annotations/array/Competitor.java | 6 +- .../orm/test/annotations/array/Contest.java | 14 +- .../orm/test/annotations/backquotes/Bug.java | 10 +- .../test/annotations/backquotes/Category.java | 6 +- .../test/annotations/backquotes/Printer.java | 6 +- .../annotations/backquotes/PrinterCable.java | 8 +- .../basic/CollectionAsBasicTest.java | 8 +- .../annotations/beanvalidation/Address.java | 18 +- .../BeanValidationAutoTest.java | 2 +- .../BeanValidationDisabledTest.java | 2 +- .../BeanValidationGroupsTest.java | 6 +- .../BeanValidationProvidedFactoryTest.java | 12 +- .../annotations/beanvalidation/Button.java | 8 +- .../annotations/beanvalidation/Color.java | 8 +- .../annotations/beanvalidation/CupHolder.java | 10 +- .../DDLWithoutCallbackTest.java | 10 +- .../annotations/beanvalidation/Display.java | 8 +- .../beanvalidation/DisplayConnector.java | 10 +- .../HibernateTraversableResolverTest.java | 4 +- .../MergeNotNullCollectionTest.java | 16 +- ...rgeNotNullCollectionUsingIdentityTest.java | 20 +- .../annotations/beanvalidation/MinMax.java | 12 +- .../annotations/beanvalidation/Music.java | 4 +- .../beanvalidation/PowerSupply.java | 12 +- .../test/annotations/beanvalidation/Rock.java | 4 +- .../annotations/beanvalidation/Screen.java | 18 +- .../test/annotations/beanvalidation/Tv.java | 18 +- .../annotations/beanvalidation/TvOwner.java | 10 +- .../orm/test/annotations/cascade/Child.java | 12 +- .../annotations/cascade/CodedPairHolder.java | 10 +- .../cascade/CodedPairSetHolder.java | 16 +- .../orm/test/annotations/cascade/Mouth.java | 14 +- .../orm/test/annotations/cascade/Parent.java | 14 +- .../orm/test/annotations/cascade/Person.java | 10 +- .../test/annotations/cascade/PersonPair.java | 10 +- .../orm/test/annotations/cascade/Tooth.java | 12 +- .../cascade/circle/identity/A.java | 14 +- .../circle/identity/AbstractEntity.java | 14 +- .../cascade/circle/identity/B.java | 14 +- .../cascade/circle/identity/C.java | 14 +- .../cascade/circle/identity/D.java | 10 +- .../cascade/circle/identity/E.java | 6 +- .../cascade/circle/identity/F.java | 10 +- .../cascade/circle/identity/G.java | 6 +- .../cascade/circle/identity/H.java | 6 +- .../cascade/circle/sequence/A.java | 14 +- .../circle/sequence/AbstractEntity.java | 14 +- .../cascade/circle/sequence/B.java | 20 +- .../cascade/circle/sequence/C.java | 26 +- .../cascade/circle/sequence/D.java | 16 +- .../cascade/circle/sequence/E.java | 6 +- .../cascade/circle/sequence/F.java | 16 +- .../cascade/circle/sequence/G.java | 12 +- .../cascade/circle/sequence/H.java | 12 +- .../jpa/identity/AbstractEntity.java | 12 +- .../multicircle/jpa/identity/EntityB.java | 14 +- .../multicircle/jpa/identity/EntityC.java | 8 +- .../multicircle/jpa/identity/EntityD.java | 16 +- .../multicircle/jpa/identity/EntityE.java | 6 +- .../multicircle/jpa/identity/EntityF.java | 10 +- .../multicircle/jpa/identity/EntityG.java | 6 +- .../MultiCircleJpaCascadeIdentityTest.java | 2 +- .../jpa/sequence/AbstractEntity.java | 14 +- .../cascade/multicircle/jpa/sequence/B.java | 16 +- .../cascade/multicircle/jpa/sequence/C.java | 8 +- .../cascade/multicircle/jpa/sequence/D.java | 12 +- .../cascade/multicircle/jpa/sequence/E.java | 6 +- .../cascade/multicircle/jpa/sequence/F.java | 10 +- .../cascade/multicircle/jpa/sequence/G.java | 6 +- .../MultiCircleJpaCascadeSequenceTest.java | 2 +- .../nonjpa/identity/AbstractEntity.java | 12 +- .../multicircle/nonjpa/identity/EntityB.java | 8 +- .../multicircle/nonjpa/identity/EntityC.java | 6 +- .../multicircle/nonjpa/identity/EntityD.java | 10 +- .../multicircle/nonjpa/identity/EntityE.java | 6 +- .../multicircle/nonjpa/identity/EntityF.java | 8 +- .../multicircle/nonjpa/identity/EntityG.java | 6 +- .../nonjpa/sequence/AbstractEntity.java | 14 +- .../multicircle/nonjpa/sequence/B.java | 8 +- .../multicircle/nonjpa/sequence/C.java | 6 +- .../multicircle/nonjpa/sequence/D.java | 10 +- .../multicircle/nonjpa/sequence/E.java | 6 +- .../multicircle/nonjpa/sequence/F.java | 8 +- .../multicircle/nonjpa/sequence/G.java | 6 +- .../hibernate/orm/test/annotations/cid/A.java | 4 +- .../orm/test/annotations/cid/AId.java | 6 +- .../hibernate/orm/test/annotations/cid/B.java | 6 +- .../hibernate/orm/test/annotations/cid/C.java | 6 +- .../orm/test/annotations/cid/Channel.java | 6 +- .../orm/test/annotations/cid/Child.java | 12 +- .../orm/test/annotations/cid/ChildPk.java | 8 +- ...mpositeIdFkGeneratedValueIdentityTest.java | 12 +- .../cid/CompositeIdFkGeneratedValueTest.java | 28 +- .../cid/CompositeIdIdentityTest.java | 14 +- .../test/annotations/cid/CompositeIdTest.java | 6 +- .../test/annotations/cid/LittleGenius.java | 6 +- .../orm/test/annotations/cid/Order.java | 8 +- .../orm/test/annotations/cid/OrderLine.java | 6 +- .../orm/test/annotations/cid/OrderLinePk.java | 4 +- .../orm/test/annotations/cid/Parent.java | 4 +- .../orm/test/annotations/cid/ParentPk.java | 2 +- .../orm/test/annotations/cid/Presenter.java | 4 +- .../orm/test/annotations/cid/Product.java | 4 +- .../orm/test/annotations/cid/SomeEntity.java | 6 +- .../test/annotations/cid/SomeEntityId.java | 2 +- .../orm/test/annotations/cid/TvMagazin.java | 66 +- .../orm/test/annotations/cid/TvMagazinPk.java | 6 +- .../orm/test/annotations/cid/TvProgram.java | 88 +-- .../annotations/cid/TvProgramIdClass.java | 88 +-- .../annotations/cid/keymanytoone/Card.java | 10 +- .../cid/keymanytoone/CardField.java | 4 +- .../annotations/cid/keymanytoone/Key.java | 6 +- .../cid/keymanytoone/PrimaryKey.java | 4 +- .../cid/keymanytoone/association/Card.java | 6 +- .../keymanytoone/association/CardField.java | 4 +- .../cid/keymanytoone/association/Key.java | 6 +- .../keymanytoone/association/PrimaryKey.java | 4 +- .../annotations/collectionelement/Boy.java | 30 +- .../annotations/collectionelement/Brand.java | 2 +- .../annotations/collectionelement/Bug.java | 4 +- .../collectionelement/BugSystem.java | 10 +- .../collectionelement/CountryAttitude.java | 6 +- .../DefaultNamingCollectionElementTest.java | 4 +- ...ollectionElementWithLazyManyToOneTest.java | 16 +- ...beddableElementCollectionMemberOfTest.java | 16 +- .../EntityWithAnElementCollection.java | 12 +- .../collectionelement/LocalizedString.java | 6 +- .../annotations/collectionelement/Matrix.java | 12 +- .../OrderByColumnNameTest.java | 24 +- .../annotations/collectionelement/Owner.java | 12 +- .../annotations/collectionelement/Person.java | 2 +- ...imitiveArrayElementCollectionTempTest.java | 8 +- .../collectionelement/Products.java | 10 +- .../collectionelement/TestCourse.java | 10 +- .../annotations/collectionelement/Toy.java | 6 +- .../collectionelement/Widgets.java | 12 +- .../deepcollectionelements/A.java | 16 +- .../deepcollectionelements/B.java | 6 +- .../deepcollectionelements/C.java | 8 +- .../withcustomenumdef/Location.java | 156 ++-- .../embeddables/withcustomenumdef/Query.java | 12 +- .../indexedCollection/Contact.java | 2 +- .../indexedCollection/Sale.java | 14 +- .../collectionelement/ordered/Address.java | 2 +- .../collectionelement/ordered/Person.java | 14 +- .../collectionelement/recreate/Poi.java | 6 +- .../recreate/PoiArrival.java | 6 +- .../recreate/RaceExecution.java | 2 +- .../test/annotations/comment/CommentTest.java | 14 +- .../derivedidentities/e1/b/Dependent.java | 10 +- .../derivedidentities/e1/b/DependentId.java | 2 +- .../derivedidentities/e1/b/Employee.java | 4 +- .../e1/b/ExclusiveDependent.java | 10 +- .../e1/b/specjmapid/Customer.java | 24 +- .../e1/b/specjmapid/CustomerInventory.java | 28 +- .../e1/b/specjmapid/Item.java | 14 +- .../specjmapid/lazy/CustomerInventoryTwo.java | 28 +- .../e1/b/specjmapid/lazy/CustomerTwo.java | 24 +- .../derivedidentities/e1/c/Dependent.java | 6 +- .../derivedidentities/e1/c/Employee.java | 4 +- .../e4/b/FinancialHistory.java | 14 +- .../e4/b/MedicalHistory.java | 16 +- .../derivedidentities/e4/b/Person.java | 4 +- .../e5/c/MedicalHistory.java | 10 +- .../derivedidentities/e5/c/Person.java | 6 +- .../duplicatedgenerator/Flight.java | 6 +- ...beddableWithManyToMany_HHH_11302_Test.java | 28 +- ...mbeddableWithOneToMany_HHH_11302_Test.java | 28 +- ...EmbeddableWithOneToMany_HHH_8564_Test.java | 24 +- ...EmbeddableWithOneToMany_HHH_8860_Test.java | 16 +- .../embeddables/nested/Customer.java | 10 +- .../embeddables/nested/Investment.java | 4 +- .../embeddables/nested/MonetaryAmount.java | 8 +- .../nested/fieldaccess/Customer.java | 14 +- .../nested/fieldaccess/Investment.java | 4 +- .../nested/fieldaccess/MonetaryAmount.java | 8 +- ...eddableBiDirectionalSelfReferenceTest.java | 10 +- ...mbeddableWithManyToOneCircularityTest.java | 12 +- .../embedded/EmbeddableWithManyToOneTest.java | 10 +- .../embedded/many2one/Address.java | 8 +- .../embedded/many2one/Country.java | 4 +- .../annotations/embedded/many2one/Person.java | 6 +- .../annotations/embedded/one2many/Alias.java | 6 +- .../annotations/embedded/one2many/Name.java | 6 +- .../annotations/embedded/one2many/Person.java | 6 +- .../embedded/one2many/PersonName.java | 10 +- .../annotations/engine/collection/Father.java | 14 +- .../annotations/engine/collection/Mother.java | 10 +- .../annotations/engine/collection/Son.java | 12 +- .../orm/test/annotations/entity/Address.java | 8 +- .../entity/BasicHibernateAnnotationsTest.java | 2 +- .../orm/test/annotations/entity/Bid.java | 8 +- .../orm/test/annotations/entity/Car.java | 6 +- .../test/annotations/entity/CommunityBid.java | 2 +- .../annotations/entity/ContactDetails.java | 6 +- .../orm/test/annotations/entity/Doctor.java | 10 +- .../orm/test/annotations/entity/Drill.java | 14 +- .../test/annotations/entity/FirstName.java | 2 +- .../orm/test/annotations/entity/Flight.java | 10 +- .../orm/test/annotations/entity/Forest.java | 10 +- .../orm/test/annotations/entity/Forest2.java | 8 +- .../annotations/entity/FormalLastName.java | 8 +- .../orm/test/annotations/entity/LastName.java | 2 +- .../entity/LocalContactDetails.java | 6 +- .../orm/test/annotations/entity/Month.java | 10 +- .../orm/test/annotations/entity/Name.java | 8 +- .../test/annotations/entity/Narrative.java | 10 +- .../orm/test/annotations/entity/Peugot.java | 2 +- .../orm/test/annotations/entity/Player.java | 12 +- .../test/annotations/entity/PowerDrill.java | 4 +- .../orm/test/annotations/entity/Race.java | 4 +- .../orm/test/annotations/entity/Ransom.java | 8 +- .../test/annotations/entity/SoccerTeam.java | 12 +- .../orm/test/annotations/entity/Tool.java | 4 +- .../orm/test/annotations/entity/Topic.java | 10 +- .../orm/test/annotations/entity/Tree.java | 6 +- .../annotations/entity/WashingMachine.java | 6 +- .../orm/test/annotations/entity/Widget.java | 2 +- .../orm/test/annotations/entity/ZipCode.java | 4 +- .../test/annotations/entitynonentity/GSM.java | 2 +- .../entitynonentity/Interaction.java | 4 +- .../annotations/entitynonentity/Phone.java | 2 +- .../annotations/entitynonentity/Voice.java | 10 +- .../annotations/enumerated/EntityEnum.java | 20 +- .../enumerated/EnumeratedSmokeTest.java | 8 +- .../enumerated/EnumeratedTypeTest.java | 6 +- .../custom_mapkey/EntityMapEnum.java | 16 +- .../MapKeyCustomEnumTypeTest.java | 10 +- .../mapkey/SocialNetworkProfile.java | 26 +- .../annotations/enumerated/mapkey/User.java | 24 +- .../EnumeratedWithMappedSuperclassTest.java | 16 +- .../orm/test/annotations/fetch/Branch.java | 10 +- .../test/annotations/fetch/FetchingTest.java | 4 +- .../orm/test/annotations/fetch/Leaf.java | 8 +- .../orm/test/annotations/fetch/Person.java | 16 +- .../orm/test/annotations/fetch/Stay.java | 16 +- .../annotations/fetchprofile/Country.java | 8 +- .../annotations/fetchprofile/Customer.java | 12 +- .../annotations/fetchprofile/Customer2.java | 8 +- .../annotations/fetchprofile/Customer3.java | 8 +- .../annotations/fetchprofile/Customer4.java | 8 +- .../annotations/fetchprofile/Customer5.java | 8 +- .../annotations/fetchprofile/Customer6.java | 10 +- .../test/annotations/fetchprofile/Order.java | 12 +- .../fetchprofile/SupportTickets.java | 6 +- .../fetchprofile/mappedby/Address.java | 10 +- .../orm/test/annotations/fkcircularity/A.java | 4 +- .../test/annotations/fkcircularity/A_PK.java | 2 +- .../orm/test/annotations/fkcircularity/B.java | 8 +- .../orm/test/annotations/fkcircularity/C.java | 2 +- .../annotations/fkcircularity/ClassA.java | 12 +- .../annotations/fkcircularity/ClassB.java | 6 +- .../annotations/fkcircularity/ClassC.java | 6 +- .../annotations/fkcircularity/ClassD.java | 6 +- .../orm/test/annotations/fkcircularity/D.java | 4 +- .../test/annotations/fkcircularity/D_PK.java | 2 +- .../formula/JoinColumnOrFormulaTest.java | 10 +- .../JoinFormulaManyToOneLazyFetchingTest.java | 18 +- ...ulaManyToOneNotIgnoreLazyFetchingTest.java | 16 +- ...ulaOneToManyNotIgnoreLazyFetchingTest.java | 18 +- ...mulaOneToOneNotIgnoreLazyFetchingTest.java | 18 +- .../test/annotations/generics/Classes.java | 20 +- .../orm/test/annotations/generics/DNA.java | 6 +- .../orm/test/annotations/generics/Dummy.java | 8 +- .../orm/test/annotations/generics/Gene.java | 8 +- .../orm/test/annotations/generics/Item.java | 8 +- .../orm/test/annotations/generics/Paper.java | 2 +- .../test/annotations/generics/PaperType.java | 6 +- .../orm/test/annotations/generics/Price.java | 6 +- .../annotations/generics/PricedStuff.java | 2 +- .../test/annotations/generics/SomeGuy.java | 6 +- .../orm/test/annotations/generics/Stuff.java | 4 +- .../test/annotations/generics/WildEntity.java | 8 +- .../genericsinheritance/Child.java | 6 +- .../genericsinheritance/ChildHierarchy1.java | 2 +- .../genericsinheritance/ChildHierarchy2.java | 2 +- .../genericsinheritance/ChildHierarchy22.java | 2 +- .../genericsinheritance/Parent.java | 10 +- .../genericsinheritance/ParentHierarchy1.java | 2 +- .../genericsinheritance/ParentHierarchy2.java | 2 +- .../ParentHierarchy22.java | 2 +- .../test/annotations/id/AndFormulaTest.java | 4 +- .../test/annotations/id/entities/Ball.java | 12 +- .../annotations/id/entities/BreakDance.java | 10 +- .../test/annotations/id/entities/Bunny.java | 14 +- .../annotations/id/entities/Computer.java | 8 +- .../annotations/id/entities/Department.java | 6 +- .../orm/test/annotations/id/entities/Dog.java | 12 +- .../test/annotations/id/entities/FirTree.java | 2 +- .../annotations/id/entities/Footballer.java | 8 +- .../annotations/id/entities/FootballerPk.java | 4 +- .../annotations/id/entities/Furniture.java | 6 +- .../annotations/id/entities/GoalKeeper.java | 2 +- .../test/annotations/id/entities/Home.java | 6 +- .../test/annotations/id/entities/Hotel.java | 4 +- .../id/entities/MilitaryBuilding.java | 6 +- .../test/annotations/id/entities/Monkey.java | 6 +- .../test/annotations/id/entities/Phone.java | 6 +- .../id/entities/PlanetCheatSheet.java | 10 +- .../annotations/id/entities/PointyTooth.java | 14 +- .../test/annotations/id/entities/Shoe.java | 6 +- .../annotations/id/entities/SoundSystem.java | 6 +- .../test/annotations/id/entities/Store.java | 6 +- .../test/annotations/id/entities/Tower.java | 6 +- .../test/annotations/id/entities/Tree.java | 6 +- .../annotations/id/entities/TwinkleToes.java | 14 +- .../AbstractTPCAutoEntity.java | 10 +- .../id/generationmappings/AutoEntity.java | 6 +- .../CompleteSequenceEntity.java | 10 +- .../DedicatedSequenceEntity1.java | 8 +- .../DedicatedSequenceEntity2.java | 8 +- .../MinimalSequenceEntity.java | 10 +- .../MinimalTableEntity.java | 12 +- .../NewGeneratorMappingsTest.java | 2 +- .../id/generationmappings/TPCAutoEntity1.java | 2 +- .../id/sequences/entities/Ball.java | 12 +- .../id/sequences/entities/BreakDance.java | 10 +- .../id/sequences/entities/Bunny.java | 14 +- .../id/sequences/entities/Computer.java | 8 +- .../id/sequences/entities/Department.java | 10 +- .../id/sequences/entities/Dog.java | 12 +- .../id/sequences/entities/FirTree.java | 2 +- .../id/sequences/entities/Footballer.java | 8 +- .../id/sequences/entities/FootballerPk.java | 4 +- .../id/sequences/entities/Furniture.java | 6 +- .../id/sequences/entities/GoalKeeper.java | 2 +- .../entities/HibernateSequenceEntity.java | 8 +- .../id/sequences/entities/Home.java | 6 +- .../sequences/entities/MilitaryBuilding.java | 6 +- .../id/sequences/entities/Monkey.java | 6 +- .../id/sequences/entities/Phone.java | 10 +- .../sequences/entities/PlanetCheatSheet.java | 10 +- .../id/sequences/entities/PointyTooth.java | 14 +- .../id/sequences/entities/Shoe.java | 8 +- .../id/sequences/entities/SoundSystem.java | 6 +- .../id/sequences/entities/Store.java | 10 +- .../id/sequences/entities/Tower.java | 6 +- .../id/sequences/entities/Tree.java | 6 +- .../id/sequences/entities/TwinkleToes.java | 14 +- .../test/annotations/idclass/DomainAdmin.java | 14 +- .../idclass/IdClassMappedSuperclassTest.java | 8 +- .../IdClassGeneratedValueTest.java | 0 .../idclassgeneratedvalue/Multiple.java | 12 +- .../idclassgeneratedvalue/Simple.java | 6 +- .../idclassgeneratedvalue/Simple2.java | 8 +- .../identifiercollection/Passport.java | 16 +- .../identifiercollection/Stamp.java | 6 +- .../annotations/idmanytoone/BasketItems.java | 22 +- .../idmanytoone/BasketItemsPK.java | 18 +- .../test/annotations/idmanytoone/Card.java | 14 +- .../annotations/idmanytoone/CardField.java | 8 +- .../test/annotations/idmanytoone/CardKey.java | 6 +- .../test/annotations/idmanytoone/Course.java | 10 +- .../idmanytoone/CourseStudent.java | 14 +- .../annotations/idmanytoone/Customer.java | 10 +- .../annotations/idmanytoone/Customers.java | 12 +- .../idmanytoone/IdManyToOneTest.java | 10 +- .../test/annotations/idmanytoone/Project.java | 6 +- .../idmanytoone/ShoppingBaskets.java | 24 +- .../idmanytoone/ShoppingBasketsPK.java | 18 +- .../test/annotations/idmanytoone/Store.java | 10 +- .../idmanytoone/StoreCustomer.java | 12 +- .../idmanytoone/StoreCustomerPK.java | 6 +- .../test/annotations/idmanytoone/Student.java | 10 +- .../idmanytoone/alphabetical/A.java | 6 +- .../idmanytoone/alphabetical/Acces.java | 6 +- .../idmanytoone/alphabetical/B.java | 6 +- .../idmanytoone/alphabetical/BId.java | 8 +- .../idmanytoone/alphabetical/Benefserv.java | 6 +- .../idmanytoone/alphabetical/C.java | 8 +- .../idmanytoone/alphabetical/CId.java | 6 +- .../idmanytoone/alphabetical/Droitacces.java | 6 +- .../idmanytoone/alphabetical/Service.java | 4 +- .../immutable/CaptionConverter.java | 2 +- .../test/annotations/immutable/Country.java | 10 +- .../annotations/immutable/ExifConverter.java | 4 +- .../test/annotations/immutable/Foobar.java | 6 +- ...yUpdateQueryHandlingModeExceptionTest.java | 10 +- .../annotations/immutable/ImmutableTest.java | 2 +- .../orm/test/annotations/immutable/Photo.java | 8 +- .../orm/test/annotations/immutable/State.java | 6 +- .../orm/test/annotations/index/jpa/Car.java | 26 +- .../test/annotations/index/jpa/Dealer.java | 2 +- .../test/annotations/index/jpa/Importer.java | 12 +- .../annotations/indexcoll/AddressBook.java | 12 +- .../annotations/indexcoll/AddressEntry.java | 6 +- .../annotations/indexcoll/AddressEntryPk.java | 2 +- .../indexcoll/AlphabeticalDirectory.java | 6 +- .../annotations/indexcoll/Atmosphere.java | 32 +- .../test/annotations/indexcoll/Currency.java | 8 +- .../test/annotations/indexcoll/Drawer.java | 10 +- .../orm/test/annotations/indexcoll/Dress.java | 8 +- .../annotations/indexcoll/ExchangeOffice.java | 14 +- .../annotations/indexcoll/ExchangeRate.java | 14 +- .../indexcoll/ExchangeRateKey.java | 12 +- .../orm/test/annotations/indexcoll/Gas.java | 6 +- .../test/annotations/indexcoll/GasKey.java | 4 +- .../annotations/indexcoll/Generation.java | 2 +- .../indexcoll/GenerationGroup.java | 6 +- .../annotations/indexcoll/GenerationUser.java | 10 +- .../orm/test/annotations/indexcoll/News.java | 8 +- .../test/annotations/indexcoll/Newspaper.java | 10 +- .../test/annotations/indexcoll/Painter.java | 14 +- .../test/annotations/indexcoll/Painting.java | 6 +- .../annotations/indexcoll/PaintingPk.java | 2 +- .../indexcoll/PressReleaseAgency.java | 16 +- .../test/annotations/indexcoll/Software.java | 8 +- .../test/annotations/indexcoll/Trainee.java | 6 +- .../test/annotations/indexcoll/Training.java | 10 +- .../test/annotations/indexcoll/Version.java | 12 +- .../test/annotations/indexcoll/Wardrobe.java | 14 +- .../indexcoll/eager/Atmosphere.java | 34 +- .../test/annotations/inheritance/Apple.java | 2 +- .../test/annotations/inheritance/Carrot.java | 10 +- .../test/annotations/inheritance/Fruit.java | 6 +- .../annotations/inheritance/SubclassTest.java | 4 +- .../test/annotations/inheritance/Tomato.java | 8 +- .../annotations/inheritance/Vegetable.java | 8 +- .../annotations/inheritance/VegetablePk.java | 2 +- .../discriminatoroptions/BaseClass.java | 8 +- .../discriminatoroptions/BaseClass2.java | 8 +- .../discriminatoroptions/SubClass.java | 4 +- .../discriminatoroptions/SubClass2.java | 4 +- .../inheritance/joined/Account.java | 12 +- .../annotations/inheritance/joined/Alarm.java | 10 +- .../annotations/inheritance/joined/Asset.java | 16 +- .../inheritance/joined/Client.java | 12 +- .../inheritance/joined/Clothing.java | 12 +- .../inheritance/joined/Company.java | 8 +- .../inheritance/joined/Customer.java | 12 +- .../inheritance/joined/Document.java | 4 +- .../inheritance/joined/EventInformation.java | 14 +- .../annotations/inheritance/joined/File.java | 14 +- .../inheritance/joined/FinancialAsset.java | 2 +- .../inheritance/joined/Folder.java | 4 +- .../JoinedSubclassAndSecondaryTable.java | 16 +- .../joined/JoinedSubclassTest.java | 4 +- .../inheritance/joined/LegalEntity.java | 8 +- .../inheritance/joined/Parent.java | 14 +- .../inheritance/joined/Person.java | 12 +- .../annotations/inheritance/joined/Pool.java | 20 +- .../inheritance/joined/PoolAddress.java | 4 +- .../inheritance/joined/ProgramExecution.java | 10 +- .../inheritance/joined/PropertyAsset.java | 2 +- .../inheritance/joined/Sweater.java | 4 +- .../inheritance/joined/SwimmingPool.java | 2 +- .../inheritance/joined/SymbolicLink.java | 4 +- .../inheritance/mixed/Document.java | 10 +- .../annotations/inheritance/mixed/File.java | 18 +- .../annotations/inheritance/mixed/Folder.java | 6 +- .../inheritance/mixed/SubclassTest.java | 4 +- .../inheritance/mixed/SymbolicLink.java | 10 +- .../inheritance/singletable/Building.java | 12 +- .../DuplicatedDiscriminatorValueTest.java | 10 +- .../inheritance/singletable/Funk.java | 4 +- .../inheritance/singletable/House.java | 4 +- .../inheritance/singletable/Music.java | 16 +- .../inheritance/singletable/Noise.java | 4 +- .../inheritance/singletable/PaperTrash.java | 2 +- .../inheritance/singletable/Rock.java | 4 +- .../inheritance/singletable/Trash.java | 10 +- .../inheritance/union/Document.java | 6 +- .../annotations/inheritance/union/File.java | 10 +- .../annotations/inheritance/union/Folder.java | 6 +- .../inheritance/union/SubclassTest.java | 4 +- .../inheritance/union/SymbolicLink.java | 6 +- .../annotations/interfaces/ContactImpl.java | 6 +- .../test/annotations/interfaces/UserImpl.java | 8 +- .../orm/test/annotations/join/A.java | 4 +- .../orm/test/annotations/join/B.java | 12 +- .../orm/test/annotations/join/C.java | 8 +- .../orm/test/annotations/join/Cat.java | 14 +- .../orm/test/annotations/join/Death.java | 14 +- .../orm/test/annotations/join/Dog.java | 10 +- .../orm/test/annotations/join/DogPk.java | 2 +- .../orm/test/annotations/join/JoinTest.java | 12 +- .../orm/test/annotations/join/Life.java | 18 +- .../test/annotations/join/SysGroupsOrm.java | 10 +- .../orm/test/annotations/join/SysUserOrm.java | 18 +- .../annotations/join/namingstrategy/Life.java | 16 +- .../join/namingstrategy/SimpleCat.java | 8 +- .../annotations/list/ListMappingTest.java | 14 +- .../loader/LoaderWithInvalidQueryTest.java | 8 +- .../orm/test/annotations/loader/Player.java | 10 +- .../orm/test/annotations/loader/Team.java | 10 +- .../test/annotations/lob/AbstractBook.java | 6 +- .../annotations/lob/AbstractCompiledCode.java | 4 +- .../orm/test/annotations/lob/Book.java | 8 +- .../test/annotations/lob/CompiledCode.java | 6 +- .../orm/test/annotations/lob/Document.java | 12 +- .../test/annotations/lob/EntitySerialize.java | 8 +- .../orm/test/annotations/lob/ImageHolder.java | 6 +- .../annotations/lob/LongStringHolder.java | 6 +- .../lob/MaterializedBlobEntity.java | 10 +- .../test/annotations/lob/VersionedBook.java | 12 +- .../lob/VersionedCompiledCode.java | 10 +- .../lob/hhh4635/LobTestEntity.java | 10 +- .../annotations/lob/locator/LobHolder.java | 6 +- .../test/annotations/manytomany/Building.java | 10 +- .../manytomany/BuildingCompany.java | 6 +- .../orm/test/annotations/manytomany/Cat.java | 10 +- .../test/annotations/manytomany/CatPk.java | 2 +- .../orm/test/annotations/manytomany/City.java | 8 +- .../test/annotations/manytomany/Company.java | 4 +- .../annotations/manytomany/ContactInfo.java | 6 +- .../annotations/manytomany/Contractor.java | 2 +- .../test/annotations/manytomany/Employee.java | 18 +- .../test/annotations/manytomany/Employer.java | 18 +- .../test/annotations/manytomany/Friend.java | 14 +- .../test/annotations/manytomany/Group.java | 12 +- .../annotations/manytomany/GroupWithSet.java | 12 +- .../annotations/manytomany/Inspector.java | 12 +- .../manytomany/InspectorPrefixes.java | 12 +- .../test/annotations/manytomany/JobInfo.java | 6 +- .../annotations/manytomany/KnownClient.java | 8 +- .../orm/test/annotations/manytomany/Man.java | 8 +- .../test/annotations/manytomany/ManPk.java | 4 +- .../manytomany/ManyToManyTest.java | 10 +- .../annotations/manytomany/Permission.java | 4 +- .../annotations/manytomany/PhoneNumber.java | 8 +- .../manytomany/ProgramManager.java | 8 +- .../test/annotations/manytomany/Store.java | 14 +- .../test/annotations/manytomany/Supplier.java | 8 +- .../test/annotations/manytomany/Woman.java | 12 +- .../test/annotations/manytomany/WomanPk.java | 4 +- .../orm/test/annotations/manytomany/Zone.java | 10 +- .../manytomany/defaults/Category.java | 10 +- .../annotations/manytomany/defaults/City.java | 10 +- .../manytomany/defaults/ContactInfo.java | 6 +- .../manytomany/defaults/Employee.java | 14 +- .../annotations/manytomany/defaults/Item.java | 10 +- .../manytomany/defaults/KnownClient.java | 8 +- .../manytomany/defaults/PhoneNumber.java | 8 +- .../manytomany/defaults/Store.java | 12 +- .../annotations/manytoone/BiggestForest.java | 8 +- .../orm/test/annotations/manytoone/Car.java | 10 +- .../orm/test/annotations/manytoone/Carz.java | 16 +- .../orm/test/annotations/manytoone/Child.java | 14 +- .../orm/test/annotations/manytoone/Color.java | 8 +- .../test/annotations/manytoone/Customer.java | 6 +- .../orm/test/annotations/manytoone/Deal.java | 10 +- .../annotations/manytoone/DistrictUser.java | 18 +- .../annotations/manytoone/ForestType.java | 14 +- .../orm/test/annotations/manytoone/Frame.java | 10 +- .../orm/test/annotations/manytoone/Lens.java | 10 +- .../orm/test/annotations/manytoone/Lotz.java | 12 +- .../test/annotations/manytoone/LotzPK.java | 4 +- .../ManyToOneMapsIdFlushModeTest.java | 16 +- .../orm/test/annotations/manytoone/Node.java | 14 +- .../test/annotations/manytoone/NodePk.java | 4 +- .../manytoone/NotNullManyToOneTest.java | 16 +- .../manytoone/NotOptionalManyToOneTest.java | 6 +- .../orm/test/annotations/manytoone/Order.java | 12 +- .../test/annotations/manytoone/OrderLine.java | 12 +- .../test/annotations/manytoone/Parent.java | 6 +- .../test/annotations/manytoone/ParentPk.java | 4 +- .../test/annotations/manytoone/TreeType.java | 14 +- .../orm/test/annotations/manytoone/User.java | 18 +- .../test/annotations/manytoone/UserPK.java | 2 +- .../referencedcolumnname/GenericObject.java | 12 +- .../manytoone/referencedcolumnname/Item.java | 2 +- .../referencedcolumnname/Vendor.java | 2 +- .../referencedcolumnname/WarehouseItem.java | 10 +- .../referencedcolumnname/ZItemCost.java | 6 +- .../intermediate/Account.java | 8 +- .../intermediate/AccountBase.java | 10 +- .../intermediate/SavingsAccount.java | 6 +- .../intermediate/SavingsAccountBase.java | 4 +- .../test/annotations/namingstrategy/A.java | 8 +- .../annotations/namingstrategy/Address.java | 8 +- .../namingstrategy/AddressEntry.java | 2 +- .../LongKeyNamingStrategyTest.java | 16 +- .../annotations/namingstrategy/Person.java | 6 +- .../AbstractCharsetNamingStrategyTest.java | 12 +- .../orm/test/annotations/naturalid/A.java | 16 +- .../test/annotations/naturalid/Citizen.java | 8 +- .../orm/test/annotations/naturalid/D.java | 16 +- .../ImmutableNaturalKeyLookupTest.java | 8 +- .../naturalid/NaturalIdOnManyToOne.java | 8 +- .../annotations/naturalid/NaturalIdTest.java | 6 +- .../orm/test/annotations/naturalid/State.java | 6 +- .../orm/test/annotations/naturalid/cid/A.java | 4 +- .../test/annotations/naturalid/cid/AId.java | 2 +- .../cid/EmbeddedAndNaturalIdTest.java | 6 +- .../orm/test/annotations/onetomany/A.java | 16 +- .../orm/test/annotations/onetomany/Asset.java | 2 +- .../orm/test/annotations/onetomany/B.java | 18 +- .../annotations/onetomany/BankAccount.java | 12 +- .../orm/test/annotations/onetomany/Box.java | 8 +- .../orm/test/annotations/onetomany/C.java | 10 +- .../orm/test/annotations/onetomany/Child.java | 14 +- .../orm/test/annotations/onetomany/City.java | 12 +- .../test/annotations/onetomany/Comment.java | 26 +- .../test/annotations/onetomany/Computer.java | 6 +- .../onetomany/DefaultNullOrderingTest.java | 6 +- .../test/annotations/onetomany/Employee.java | 2 +- .../orm/test/annotations/onetomany/Forum.java | 18 +- .../orm/test/annotations/onetomany/Item.java | 8 +- .../orm/test/annotations/onetomany/Model.java | 8 +- .../test/annotations/onetomany/Monkey.java | 6 +- .../annotations/onetomany/OneToManyTest.java | 22 +- .../orm/test/annotations/onetomany/Order.java | 12 +- .../annotations/onetomany/OrderByTest.java | 2 +- .../test/annotations/onetomany/OrderID.java | 2 +- .../test/annotations/onetomany/OrderItem.java | 18 +- .../annotations/onetomany/OrderItemID.java | 2 +- .../annotations/onetomany/Organisation.java | 16 +- .../onetomany/OrganisationUser.java | 14 +- .../test/annotations/onetomany/Parent.java | 10 +- .../test/annotations/onetomany/ParentPk.java | 2 +- .../test/annotations/onetomany/Person.java | 12 +- .../annotations/onetomany/PoliticalParty.java | 10 +- .../annotations/onetomany/Politician.java | 10 +- .../orm/test/annotations/onetomany/Post.java | 12 +- .../test/annotations/onetomany/Soldier.java | 12 +- .../test/annotations/onetomany/Street.java | 10 +- .../orm/test/annotations/onetomany/Tiger.java | 6 +- .../test/annotations/onetomany/Trainer.java | 12 +- .../annotations/onetomany/Transaction.java | 12 +- .../orm/test/annotations/onetomany/Troop.java | 12 +- .../orm/test/annotations/onetomany/User.java | 16 +- .../test/annotations/onetomany/Visitor.java | 6 +- .../orm/test/annotations/onetomany/Zoo.java | 14 +- .../test/annotations/onetoone/Address.java | 6 +- .../orm/test/annotations/onetoone/Body.java | 8 +- .../orm/test/annotations/onetoone/Client.java | 14 +- .../test/annotations/onetoone/Computer.java | 18 +- .../test/annotations/onetoone/ComputerPk.java | 2 +- .../orm/test/annotations/onetoone/Heart.java | 4 +- .../OneToOneJoinTableUniquenessTest.java | 18 +- .../annotations/onetoone/OneToOneTest.java | 6 +- .../OptionalOneToOneMappedByTest.java | 8 +- .../OptionalOneToOneMapsIdQueryTest.java | 12 +- .../OptionalOneToOnePKJCQueryTest.java | 14 +- .../onetoone/OptionalOneToOnePKJCTest.java | 8 +- .../orm/test/annotations/onetoone/Owner.java | 12 +- .../annotations/onetoone/OwnerAddress.java | 8 +- .../orm/test/annotations/onetoone/Party.java | 10 +- .../annotations/onetoone/PartyAffiliate.java | 6 +- .../orm/test/annotations/onetoone/Person.java | 10 +- .../annotations/onetoone/PersonAddress.java | 8 +- .../annotations/onetoone/SerialNumber.java | 6 +- .../annotations/onetoone/SerialNumberPk.java | 2 +- .../orm/test/annotations/onetoone/Show.java | 6 +- .../annotations/onetoone/ShowDescription.java | 6 +- .../test/annotations/onetoone/Trousers.java | 8 +- .../annotations/onetoone/TrousersZip.java | 6 +- .../onetoone/hhh4851/BaseEntity.java | 14 +- .../annotations/onetoone/hhh4851/Device.java | 10 +- .../onetoone/hhh4851/DeviceGroupConfig.java | 6 +- .../onetoone/hhh4851/Hardware.java | 20 +- .../onetoone/hhh4851/ManagedDevice.java | 16 +- .../annotations/onetoone/hhh4851/Owner.java | 12 +- ...ntityInheritanceAttributeOverrideTest.java | 18 +- ...MappedSuperclassAttributeOverrideTest.java | 14 +- ...sBasicPropertyIdAttributeOverrideTest.java | 14 +- .../MappedSuperClassWithUuidAsBasic.java | 6 +- .../SubclassWithUuidAsId.java | 12 +- .../orm/test/annotations/persister/Card.java | 8 +- .../orm/test/annotations/persister/Deck.java | 6 +- .../quote/resultsetmappings/MyEntity.java | 20 +- .../reflection/Administration.java | 18 +- .../test/annotations/reflection/BusTrip.java | 4 +- .../test/annotations/reflection/Company.java | 4 +- .../annotations/reflection/Competition.java | 2 +- .../JPAXMLOverriddenAnnotationReaderTest.java | 2 +- .../annotations/reflection/LogListener.java | 4 +- .../test/annotations/reflection/Match.java | 20 +- .../reflection/OrganizationConverter.java | 2 +- .../reflection/OtherLogListener.java | 4 +- .../SocialSecurityMoralAccount.java | 10 +- .../reflection/SocialSecurityNumber.java | 2 +- .../SocialSecurityPhysicalAccount.java | 2 +- .../annotations/reflection/TennisMatch.java | 10 +- .../SecondaryTableSchemaTest.java | 12 +- .../UpdateDetachedTest.java | 16 +- .../orm/test/annotations/strategy/Storm.java | 14 +- .../orm/test/annotations/subselect/Bid.java | 4 +- .../annotations/subselect/HighestBid.java | 4 +- .../orm/test/annotations/subselect/Item.java | 4 +- .../annotations/tableperclass/Component.java | 10 +- .../annotations/tableperclass/Machine.java | 12 +- .../annotations/tableperclass/Product.java | 6 +- .../test/annotations/tableperclass/Robot.java | 2 +- .../test/annotations/tableperclass/T800.java | 2 +- .../tableperclass/TablePerClassTest.java | 2 +- .../orm/test/annotations/target/Brand.java | 14 +- .../test/annotations/target/LuggageImpl.java | 8 +- .../test/annotations/target/OwnerImpl.java | 2 +- .../orm/test/annotations/target/SizeImpl.java | 4 +- .../UniqueConstraintTest.java | 2 +- ...hrowsConstraintViolationExceptionTest.java | 16 +- .../UniqueConstraintUnitTests.java | 20 +- .../UniqueConstraintValidationTest.java | 8 +- .../test/annotations/xml/ejb3/CarModel.java | 2 +- .../ejb3/Ejb3XmlElementCollectionTest.java | 54 +- .../xml/ejb3/Ejb3XmlManyToManyTest.java | 44 +- .../xml/ejb3/Ejb3XmlManyToOneTest.java | 22 +- .../xml/ejb3/Ejb3XmlOneToManyTest.java | 44 +- .../xml/ejb3/Ejb3XmlOneToOneTest.java | 26 +- .../annotations/xml/ejb3/Manufacturer.java | 10 +- .../test/any/annotations/CharProperty.java | 10 +- .../test/any/annotations/EmbeddedAnyTest.java | 14 +- .../test/any/annotations/IntegerProperty.java | 10 +- .../test/any/annotations/LazyPropertySet.java | 14 +- .../test/any/annotations/LongProperty.java | 10 +- .../test/any/annotations/PropertyList.java | 18 +- .../orm/test/any/annotations/PropertyMap.java | 16 +- .../orm/test/any/annotations/PropertySet.java | 16 +- .../test/any/annotations/StringProperty.java | 10 +- .../org/hibernate/orm/test/array/A.hbm.xml | 0 .../java/org/hibernate/orm/test/array/A.java | 0 .../hibernate/orm/test/array/ArrayTest.java | 0 .../java/org/hibernate/orm/test/array/B.java | 0 .../batch/BatchOptimisticLockingTest.java | 10 +- .../test/batch/BatchingBatchFailureTest.java | 8 +- .../batch/BatchingInheritanceDeleteTest.java | 26 +- .../batch/NonBatchingBatchFailureTest.java | 8 +- .../OptionalSecondaryTableBatchTest.java | 10 +- ...oaderInitializationWithNoLockModeTest.java | 10 +- .../hibernate/orm/test/bidi/Auction.hbm.xml | 0 .../org/hibernate/orm/test/bidi/Auction.java | 0 .../hibernate/orm/test/bidi/Auction2.hbm.xml | 0 .../hibernate/orm/test/bidi/AuctionTest.java | 0 .../hibernate/orm/test/bidi/AuctionTest2.java | 0 .../java/org/hibernate/orm/test/bidi/Bid.java | 0 .../cfgXml/CfgXmlResourceNameClosingTest.java | 2 +- .../QualifiedTableNamingTest.java | 6 +- .../jaxb/hbm/internal/XmlBindingChecker.java | 4 +- .../access/AttributeAccessorTest.java | 4 +- .../annotations/access/BaseFurniture.java | 12 +- .../binding/annotations/access/Bed.java | 8 +- .../binding/annotations/access/BigBed.java | 4 +- .../binding/annotations/access/Chair.java | 4 +- .../binding/annotations/access/Closet.java | 2 +- .../binding/annotations/access/Foobar.java | 2 +- .../binding/annotations/access/Furniture.java | 6 +- .../annotations/access/Gardenshed.java | 14 +- .../binding/annotations/access/Thingy.java | 4 +- .../binding/annotations/access/Woody.java | 6 +- .../annotations/access/jpa/Animal.java | 10 +- .../binding/annotations/access/jpa/Bed.java | 8 +- .../binding/annotations/access/jpa/Being.java | 6 +- .../annotations/access/jpa/BigBed.java | 4 +- .../binding/annotations/access/jpa/Chair.java | 4 +- .../annotations/access/jpa/Circle.java | 8 +- .../binding/annotations/access/jpa/Color.java | 2 +- .../annotations/access/jpa/Course1.java | 10 +- .../annotations/access/jpa/Course2.java | 14 +- .../annotations/access/jpa/Course3.java | 14 +- .../annotations/access/jpa/Course4.java | 14 +- .../annotations/access/jpa/Course5.java | 12 +- .../annotations/access/jpa/Course6.java | 10 +- .../annotations/access/jpa/Course7.java | 10 +- .../annotations/access/jpa/Course8.java | 14 +- .../annotations/access/jpa/Furniture.java | 14 +- .../annotations/access/jpa/Gardenshed.java | 14 +- .../binding/annotations/access/jpa/Horse.java | 2 +- .../annotations/access/jpa/Person.java | 6 +- .../annotations/access/jpa/Position.java | 6 +- .../binding/annotations/access/jpa/Shape.java | 6 +- .../annotations/access/jpa/Square.java | 8 +- .../annotations/access/jpa/Student.java | 6 +- .../annotations/access/jpa/Thingy.java | 4 +- .../binding/annotations/access/jpa/User.java | 6 +- .../binding/annotations/access/jpa/Woody.java | 6 +- .../binding/annotations/access/xml/Boy.java | 6 +- .../binding/annotations/access/xml/Cook.java | 6 +- .../annotations/access/xml/Driver.java | 6 +- .../binding/annotations/access/xml/Knive.java | 2 +- .../annotations/access/xml/RentalCar.java | 6 +- .../annotations/access/xml/Tourist.java | 6 +- .../annotations/access/xml/Waiter.java | 2 +- .../annotations/access/xml/XmlAccessTest.java | 2 +- .../EmbeddedOverrideTests.java | 20 +- .../MappedSuperclassOverrideTests.java | 18 +- .../EmbeddedOverrideTests.java | 18 +- .../MappedSuperclassOverrideTests.java | 18 +- .../PluralEmbeddedOverrideTests.java | 24 +- .../TablePerClassOverrideTests.java | 20 +- .../basics/BagIdTypeResolutionTests.java | 10 +- .../basics/CustomTypeResolutionTests.java | 6 +- .../basics/EnumResolutionTests.java | 16 +- .../SimpleEntityTypeResolutionsTests.java | 2 +- .../annotations/basics/sql/JdbcTypeTests.java | 8 +- .../basics/sql/MapKeyJdbcTypeTests.java | 8 +- .../binding/annotations/embedded/Address.java | 6 +- .../annotations/embedded/AddressType.java | 6 +- .../binding/annotations/embedded/Book.java | 14 +- .../annotations/embedded/CorpType.java | 8 +- .../binding/annotations/embedded/Country.java | 8 +- .../binding/annotations/embedded/Deal.java | 6 +- .../annotations/embedded/EmbeddableA.java | 10 +- .../annotations/embedded/EmbeddableB.java | 2 +- .../EmbeddedCheckQueryExecutedTest.java | 12 +- .../embedded/EmbeddedCircularFetchTests.java | 16 +- .../embedded/EntityWithNestedEmbeddables.java | 14 +- .../annotations/embedded/FavoriteThings.java | 6 +- .../annotations/embedded/FixedLeg.java | 2 +- .../annotations/embedded/FloatLeg.java | 2 +- .../embedded/InternetFavorites.java | 4 +- .../embedded/InternetProvider.java | 6 +- .../binding/annotations/embedded/Leg.java | 2 +- .../annotations/embedded/LegalStructure.java | 8 +- .../binding/annotations/embedded/Manager.java | 8 +- .../annotations/embedded/Nationality.java | 6 +- .../annotations/embedded/NotonialDeal.java | 8 +- .../binding/annotations/embedded/Person.java | 16 +- .../annotations/embedded/RegionalArticle.java | 4 +- .../embedded/RegionalArticlePk.java | 6 +- .../annotations/embedded/SpreadDeal.java | 10 +- .../binding/annotations/embedded/Summary.java | 4 +- .../binding/annotations/embedded/Swap.java | 8 +- .../annotations/embedded/URLFavorite.java | 2 +- .../annotations/embedded/VanillaSwap.java | 10 +- .../annotations/embedded/WealthyPerson.java | 8 +- .../binding/annotations/override/Addr.java | 4 +- .../binding/annotations/override/Address.java | 2 +- .../override/AssociationOverrideTest.java | 2 +- .../annotations/override/BlogEntry.java | 14 +- .../annotations/override/ContactInfo.java | 12 +- .../annotations/override/Employee.java | 14 +- .../binding/annotations/override/Entry.java | 16 +- .../InheritedAttributeOverridingTest.java | 6 +- .../annotations/override/Location.java | 4 +- .../binding/annotations/override/Move.java | 10 +- .../annotations/override/PhoneNumber.java | 10 +- .../annotations/override/PropertyInfo.java | 2 +- .../annotations/override/PropertyRecord.java | 16 +- .../annotations/override/SocialSite.java | 6 +- .../override/SocialTouchPoints.java | 6 +- .../binding/annotations/override/Trip.java | 8 +- .../OrderByMappingComplianceTest.java | 12 +- .../binding/mixed/AnnotationEntity.java | 2 +- .../jpa/PersistenceUnitInfoTests.java | 4 +- .../jpa/PersistenceUnitOverridesTests.java | 12 +- .../scanning/IntegerToVarcharConverter.java | 4 +- .../scanning/PackagedEntityManagerTest.java | 10 +- .../orm/test/bootstrap/scanning/Pasta.java | 6 +- .../test/bootstrap/scanning/ScannerTest.java | 4 +- ...unctionMetadataBuilderContributorTest.java | 4 +- ...nverterMetadataBuilderContributorTest.java | 10 +- ...WithEmbeddableAndMappedSuperclassTest.java | 12 +- ...DirtyCheckingWithEmbeddedOnGetterTest.java | 10 +- .../DirtyCheckingWithEmbeddedTest.java | 10 +- ...DirtyCheckingWithMappedsuperclassTest.java | 6 +- .../enhancement/access/MixedAccessTest.java | 14 +- .../InheritedAttributeAssociationTest.java | 24 +- .../ManyToManyAssociationTest.java | 8 +- .../association/OneToManyAssociationTest.java | 12 +- .../association/OneToOneAssociationTest.java | 6 +- .../basic/BasicEnhancementTest.java | 4 +- .../enhancement/basic/BasicSessionTest.java | 8 +- .../basic/CrossEnhancementTest.java | 14 +- .../ExtendedAssociationManagementTest.java | 8 +- ...nValueMappedSuperclassEnhancementTest.java | 12 +- .../enhancement/basic/InheritedTest.java | 6 +- .../basic/MappedSuperclassTest.java | 8 +- .../detached/DetachedGetIdentifierTest.java | 8 +- ...kingCollectionInDefaultFetchGroupTest.java | 18 +- .../dirty/DirtyTrackingCollectionTest.java | 10 +- .../dirty/DirtyTrackingNonUpdateableTest.java | 14 +- .../dirty/DirtyTrackingPersistTest.java | 30 +- .../enhancement/dirty/DirtyTrackingTest.java | 12 +- .../enhancement/eviction/EvictionTest.java | 10 +- .../lazy/HHH_10708/UnexpectedDeleteTest1.java | 14 +- .../lazy/HHH_10708/UnexpectedDeleteTest2.java | 14 +- .../lazy/HHH_10708/UnexpectedDeleteTest3.java | 16 +- .../LazyBasicFieldNotInitializedTest.java | 12 +- .../lazy/LazyCollectionDeletedTest.java | 22 +- .../lazy/LazyCollectionDetachTest.java | 18 +- ...izationWithoutInlineDirtyTrackingTest.java | 14 +- .../lazy/LazyLoadingByEnhancerSetterTest.java | 16 +- ...OneToManyWithEqualsImplementationTest.java | 14 +- .../lazy/LazyProxyOnEnhancedEntityTest.java | 14 +- .../MultipleBagsInLazyFetchGroupTest.java | 12 +- .../lazy/cache/LazyInCacheTest.java | 16 +- .../UninitializedAssociationsInCacheTest.java | 18 +- .../UninitializedLazyBasicCacheTest.java | 14 +- .../proxy/LoadANonExistingEntityTest.java | 10 +- .../MappedSuperclassWithEmbeddableTest.java | 12 +- .../lazy/proxy/ProxyDeletionTest.java | 24 +- .../lazy/proxy/SharingReferenceTest.java | 16 +- ...rtyCheckPrivateUnMappedCollectionTest.java | 16 +- .../LoadUninitializedCollectionTest.java | 16 +- ...QueryExecutionWithFlushModeAlwaysTest.java | 14 +- .../enhancement/merge/CompositeMergeTest.java | 22 +- .../test/bytecode/enhancement/merge/Leaf.java | 16 +- ...hedCascadedCollectionInEmbeddableTest.java | 16 +- ...NonCascadedCollectionInEmbeddableTest.java | 14 +- .../merge/MergeEnhancedEntityTest.java | 16 +- .../test/bytecode/enhancement/merge/Root.java | 16 +- .../mutable/MapStringConverter.java | 4 +- .../enhancement/mutable/TestEntity.java | 14 +- .../OtherEntityEntryContextTest.java | 6 +- .../enhancement/pk/EmbeddedPKTest.java | 14 +- ...deEnhancedImmutableReferenceCacheTest.java | 8 +- .../orm/test/cache/CacheAnnotationTests.java | 6 +- .../orm/test/cache/CacheableItem.java | 6 +- ...ctionCacheEvictionWithoutMappedByTest.java | 14 +- .../org/hibernate/orm/test/cache/Company.java | 8 +- .../hibernate/orm/test/cache/Continent.java | 8 +- .../org/hibernate/orm/test/cache/Country.java | 14 +- .../EntityUpdateCacheModeIgnoreTest.java | 6 +- ...ManyToManyCollectionCacheEvictionTest.java | 12 +- .../NonRootEntityWithCacheAnnotationTest.java | 8 +- ...RootEntityWithCacheableAnnotationTest.java | 10 +- .../orm/test/cache/ReferenceCacheTest.java | 6 +- .../test/cache/RefreshUpdatedDataTest.java | 10 +- .../orm/test/cache/RegionNameTest.java | 10 +- .../SharedDomainDataAndQueryResultsTest.java | 10 +- .../orm/test/cache/SharedRegionTest.java | 4 +- .../org/hibernate/orm/test/cache/User.java | 14 +- .../org/hibernate/orm/test/cache/cid/It.java | 6 +- .../orm/test/cache/cid/ItWithPkClass.java | 8 +- .../NonAggregatedCompositeIdCachingTest.java | 2 +- .../polymorphism/AbstractCachedItem.java | 6 +- .../test/cache/polymorphism/CachedItem1.java | 2 +- .../test/cache/polymorphism/CachedItem2.java | 2 +- .../CacheKeyImplementationHashCodeTest.java | 6 +- .../caching/mocked/ReadWriteCacheTest.java | 6 +- .../org/hibernate/orm/test/cascade/A.java | 2 +- ...cadeMergeToProxyEntityCopyAllowedTest.java | 30 +- .../CascadeMergeToProxySimpleTest.java | 18 +- .../org/hibernate/orm/test/cascade/G.java | 0 .../org/hibernate/orm/test/cascade/H.java | 4 +- .../hibernate/orm/test/cascade/MergeTest.java | 14 +- .../cascade/RefreshLazyOneToManyTest.java | 22 +- .../orm/test/cascade/RefreshTest.java | 22 +- .../AbstractMultiPathCircleCascadeTest.java | 2 +- .../test/cdi/converters/ConverterBean.java | 4 +- .../orm/test/cdi/converters/TheEntity.java | 6 +- .../DelayedCdiHostedConverterTest.java | 4 +- .../converters/legacy/AddTenConverter.java | 2 +- .../legacy/BigDecimalToStringConverter.java | 2 +- .../legacy/ConversionAutoApplyTest.java | 14 +- .../orm/test/cdi/converters/legacy/Item.java | 8 +- .../test/cdi/converters/legacy/QueryTest.java | 24 +- .../standard/CdiHostedConverterTest.java | 4 +- .../orm/test/cdi/events/TheEntity.java | 8 +- .../orm/test/cdi/events/TheListener.java | 4 +- .../events/delayed/DelayedCdiSupportTest.java | 4 +- .../extended/ValidExtendedCdiSupportTest.java | 4 +- .../events/nocdi/ValidNoCdiSupportTest.java | 10 +- .../standard/StandardCdiSupportTest.java | 4 +- .../general/mixed/DelayedMixedAccessTest.java | 2 +- .../mixed/ExtendedMixedAccessTest.java | 4 +- .../orm/test/cdi/general/mixed/Helper.java | 4 +- .../test/cdi/general/mixed/HostedBean.java | 2 +- .../mixed/ImmediateMixedAccessTests.java | 2 +- ...rnativeNamedApplicationScopedBeanImpl.java | 10 +- .../TheAlternativeNamedDependentBeanImpl.java | 10 +- .../TheApplicationScopedBean.java | 8 +- .../nonregistrymanaged/TheDependentBean.java | 8 +- .../general/nonregistrymanaged/TheEntity.java | 6 +- ...TheMainNamedApplicationScopedBeanImpl.java | 10 +- .../TheMainNamedDependentBeanImpl.java | 10 +- .../TheNestedDependentBean.java | 6 +- .../TheNonHibernateBeanConsumer.java | 6 +- .../TheReflectionInstantiatedBean.java | 2 +- .../TheSharedApplicationScopedBean.java | 8 +- ...nRegistryManagedDelayedCdiSupportTest.java | 6 +- ...RegistryManagedExtendedCdiSupportTest.java | 6 +- ...RegistryManagedStandardCdiSupportTest.java | 6 +- .../TestingExtendedBeanManager.java | 2 +- .../TestingExtendedBeanManagerImpl.java | 6 +- .../TestingLegacyExtendedBeanManagerImpl.java | 8 +- .../orm/test/cfg/AnnotationBinderTest.java | 6 +- .../orm/test/cfg/CfgFilePropertyTest.java | 2 +- .../cfg/WrongCircularityDetectionTest.java | 12 +- .../DefaultCacheConcurrencyPropertyTest.java | 8 +- .../DirectReferenceCacheEntriesTest.java | 6 +- .../orm/test/cfg/persister/Gate.java | 4 +- .../GoofyPersisterClassProvider.java | 2 +- .../orm/test/cfg/persister/Palmtree.java | 2 +- .../orm/test/cfg/persister/Portal.java | 6 +- .../orm/test/cfg/persister/Tree.java | 4 +- .../orm/test/cfg/persister/Window.java | 4 +- .../orm/test/cid/CompositeIdTest.java | 0 .../hibernate/orm/test/cid/Customer.hbm.xml | 0 .../org/hibernate/orm/test/cid/Customer.java | 0 .../hibernate/orm/test/cid/LineItem.hbm.xml | 0 .../org/hibernate/orm/test/cid/LineItem.java | 0 .../org/hibernate/orm/test/cid/Order.hbm.xml | 0 .../org/hibernate/orm/test/cid/Order.java | 0 .../hibernate/orm/test/cid/Product.hbm.xml | 0 .../org/hibernate/orm/test/cid/Product.java | 0 .../ProxyInterfaceClassLoaderTest.java | 4 +- .../collection/bag/BagDuplicatesTest.java | 14 +- .../bag/BagElementNullBasicTest.java | 18 +- .../bag/MultipleBagFetchHqlTest.java | 16 +- .../collection/bag/MultipleBagFetchTest.java | 16 +- .../bag/PersistentBagContainsTest.java | 12 +- .../orm/test/collection/basic/Contact.java | 18 +- .../test/collection/basic/EmailAddress.java | 2 +- .../orm/test/collection/basic/User.java | 16 +- .../BagDelayedOperationNoCascadeTest.java | 14 +- .../BagDelayedOperationTest.java | 16 +- .../DetachedBagDelayedOperationTest.java | 18 +- .../delayedOperation/ListAddTest.java | 16 +- .../ListDelayedOperationTest.java | 18 +- .../SetDelayedOperationTest.java | 16 +- .../test/collection/dereferenced/Many.java | 6 +- .../dereferenced/UnversionedCascadeOne.java | 12 +- .../dereferenced/UnversionedNoCascadeOne.java | 10 +- .../dereferenced/VersionedCascadeOne.java | 14 +- .../dereferenced/VersionedNoCascadeOne.java | 12 +- .../idbag/IdBagElementNullBasicTest.java | 16 +- .../list/ListElementNullBasicTest.java | 16 +- ...ListIndexReferenceFromListElementTest.java | 22 +- .../collection/map/EmbeddableIndexTest.java | 14 +- .../test/collection/map/LocalizedString.java | 2 +- .../map/MapElementNullBasicTest.java | 14 +- .../collection/map/MultilingualString.java | 16 +- .../map/MultilingualStringParent.java | 2 +- .../collection/map/PersistentMapTest.java | 22 +- .../collection/map/hhh7557/MapHolder.java | 18 +- .../test/collection/map/hhh7557/MapKey.java | 18 +- .../test/collection/map/hhh7557/MapValue.java | 10 +- .../MultipleSessionCollectionTest.java | 14 +- .../MultipleSessionCollectionWarningTest.java | 14 +- .../NonInsertableColumnTest.java | 14 +- .../ordered/joinedInheritence/Animal.java | 10 +- .../ordered/joinedInheritence/Lion.java | 2 +- .../ordered/joinedInheritence/Tiger.java | 4 +- .../ordered/joinedInheritence/Zoo.java | 14 +- .../collection/original/CollectionTest.java | 4 +- .../orm/test/collection/original/Email.java | 0 .../test/collection/original/Permission.java | 0 .../orm/test/collection/original/User.java | 0 .../original/UserPermissions.hbm.xml | 0 .../propertyref/ReferencedColumnNameTest.java | 18 +- .../collection/set/PersistentSetTest.java | 6 +- .../set/SetElementNullBasicTest.java | 14 +- .../orm/test/collectionalias/ATable.java | 204 ++--- .../orm/test/collectionalias/TableA.java | 192 ++--- .../orm/test/collectionalias/TableB.java | 202 ++--- .../orm/test/collectionalias/TableBId.java | 232 +++--- .../ColumnTransformerTest.java | 6 +- .../orm/test/columntransformer/Staff.java | 12 +- .../orm/test/comments/TestEntity.java | 4 +- .../orm/test/comments/TestEntity2.java | 4 +- .../orm/test/comments/UseSqlCommentTest.java | 14 +- .../component/AttributeOverridingTest.java | 20 +- .../test/component/basic/ComponentTest.java | 10 +- .../orm/test/component/basic2/Component.java | 2 +- .../orm/test/component/basic2/Name.java | 4 +- .../orm/test/component/basic2/Person.java | 6 +- .../empty/ComponentEmptyEmbedded.java | 2 +- .../empty/ComponentEmptyEmbeddedOwner.java | 8 +- .../EmptyCompositeCollectionKeyEagerTest.java | 10 +- .../EmptyCompositeCollectionKeyLazyTest.java | 8 +- .../EmptyCompositeEquivalentToNullTest.java | 10 +- .../EmptyCompositeManyToOneKeyCachedTest.java | 10 +- .../empty/EmptyCompositeManyToOneKeyTest.java | 6 +- .../empty/SelectBeforeUpdateEmbeddedTest.java | 10 +- .../orm/test/component/proxy/Adult.java | 2 +- .../orm/test/component/proxy/Person.java | 14 +- .../CompositeElementTest.java | 6 +- .../EagerManyToOneEmbeddedIdFKTest.java | 12 +- ...azyManyToOneEmbeddedIdWithToOneFKTest.java | 14 +- ...anyToOneEmbeddedIdWithLazyToOneFKTest.java | 14 +- .../ManyToOneEmbeddedIdWithToOneFKTest.java | 12 +- .../OneToManyEmbeddedIdFKTest.java | 12 +- ...onnectionProviderValidationConfigTest.java | 8 +- .../BeforeCompletionReleaseTest.java | 10 +- .../JdbcBatchingAgressiveReleaseTest.java | 8 +- .../LazyLoadingConnectionCloseTest.java | 724 +++++++++--------- .../orm/test/constraint/ConstraintTest.java | 22 +- .../ForeignKeyConstraintMapsIdTest.java | 14 +- .../constraint/ForeignKeyConstraintTest.java | 64 +- .../ForeignKeyNoConstraintTest.java | 18 +- .../NonRootTablePolymorphicTests.java | 32 +- .../test/dialect/DB2390DialectTestCase.java | 4 +- .../dialect/PostgreSQL81DialectTestCase.java | 2 +- .../function/HSQLTruncFunctionTest.java | 4 +- .../orm/test/dialect/functional/Category.java | 6 +- .../orm/test/dialect/functional/Contact.java | 12 +- .../orm/test/dialect/functional/Folder.java | 6 +- .../dialect/functional/HANABooleanTest.java | 10 +- .../dialect/functional/HANACalcViewTest.java | 12 +- .../dialect/functional/HANADecimalTest.java | 8 +- .../dialect/functional/HANASearchTest.java | 8 +- .../functional/OracleFollowOnLockingTest.java | 18 +- .../orm/test/dialect/functional/Product2.java | 8 +- .../SQLServerDialectCollationTest.java | 8 +- .../SQLServerDialectPaginationTest.java | 6 +- ...QLServerDialectTempTableCollationTest.java | 10 +- .../functional/SQLServerDialectTest.java | 18 +- .../SequenceInformationMariaDBTest.java | 14 +- .../functional/SequenceInformationTest.java | 10 +- ...tractSequenceInformationExtractorTest.java | 6 +- .../hibernate/orm/test/dirtiness/Thing.java | 8 +- .../discriminatedcollections/Account.java | 16 +- .../test/discriminatedcollections/Client.java | 12 +- .../discriminatedcollections/TempTest.java | 2 +- ...sociationsWithEmbeddedCompositeIdTest.java | 14 +- .../hibernate/orm/test/ecid/Course.hbm.xml | 0 .../org/hibernate/orm/test/ecid/Course.java | 0 .../test/ecid/EmbeddedCompositeIdTest.java | 0 .../orm/test/ecid/UniversityCourse.java | 0 .../orm/test/engine/spi/ExtraStateTest.java | 10 +- .../EntityGraphFunctionalTests.java | 20 +- .../EntityGraphNativeQueryTest.java | 16 +- .../EntityGraphUsingFetchGraphTest.java | 30 +- .../EntityGraphWithFetchAnnotationTest.java | 18 +- .../entitygraph/FetchWithRootGraphTest.java | 10 +- .../entitygraph/InheritedEntityGraphTest.java | 20 +- .../entitygraph/LoadAndFetchGraphTest.java | 22 +- .../ast/CriteriaEntityGraphTest.java | 20 +- .../ast/EntityGraphLoadPlanBuilderTest.java | 16 +- .../entitygraph/ast/HqlEntityGraphTest.java | 16 +- .../entitygraph/ast/LoadPlanBuilderTest.java | 12 +- .../mappedbyid/LoadGraphFindByIdTest.java | 24 +- .../basic/BasicAnnNamedEntityGraphTest.java | 4 +- .../basic/BasicOrmNamedEntityGraphTest.java | 4 +- .../test/entitygraph/named/basic/Person.java | 6 +- .../named/multiple/NamedEntityGraphsTest.java | 16 +- .../SubgraphOrmNamedEntityGraphTest.java | 6 +- .../parser/AbstractEntityGraphTest.java | 8 +- .../parser/BasicEntityGraphTests.java | 16 +- .../parser/EntityGraphParserTest.java | 8 +- .../entitygraph/parser/EntityGraphsTest.java | 4 +- .../parser/GraphParsingTestEntity.java | 16 +- .../parser/GraphParsingTestSubEntity.java | 4 +- .../entitymode/map/basic/ProductLine.hbm.xml | 0 .../entityname/DuplicateEntityNameTest.java | 6 +- .../test/event/EmbeddableCallbackTest.java | 8 +- .../orm/test/event/MergeContextTest.java | 4 +- ...ertEventListenerVetoBidirectionalTest.java | 12 +- ...rtEventListenerVetoUnidirectionalTest.java | 12 +- .../AbstractCollectionEventTest.java | 4 +- .../collection/BrokenCollectionEventTest.java | 4 +- .../test/event/collection/detached/Alias.java | 16 +- .../event/collection/detached/Character.java | 10 +- .../detached/MultipleCollectionEntity.java | 18 +- .../MultipleCollectionRefEntity1.java | 14 +- .../MultipleCollectionRefEntity2.java | 14 +- .../MergeListPreAndPostPersistTest.java | 10 +- ...ListPreAndPostPersistWithIdentityTest.java | 14 +- .../events/AutoFlushEventListenerTest.java | 6 +- .../eviction/IsolatedEvictableEntity.java | 4 +- ...paOrNativeBootstrapFunctionalTestCase.java | 8 +- ...straintViolationExceptionHandlingTest.java | 12 +- .../ExceptionExpectations.java | 14 +- ...tifierGenerationExceptionHandlingTest.java | 12 +- ...nSessionFindJdbcExceptionHandlingTest.java | 10 +- .../QueryExceptionHandlingTest.java | 4 +- ...StateObjectStateExceptionHandlingTest.java | 8 +- .../TransactionExceptionHandlingTest.java | 6 +- .../TransientObjectExceptionHandlingTest.java | 8 +- .../orm/test/extralazy/Championship.java | 10 +- .../hibernate/orm/test/extralazy/School.java | 10 +- .../hibernate/orm/test/extralazy/Student.java | 10 +- .../managed/RuntimeFetchFromManagedTest.java | 12 +- .../EagerToOneWithJoinFetchModeTests.java | 12 +- .../EagerToOneWithSelectFetchModeTests.java | 12 +- .../LazyToOneWithJoinFetchModeTests.java | 14 +- .../LazyToOneWithSelectFetchModeTests.java | 14 +- .../CollectionLoadedInTwoPhaseLoadTest.java | 10 +- .../EntityLoadedInTwoPhaseLoadTest.java | 14 +- .../join/JoinFetchProfileTest.java | 4 +- .../join/selfReferencing/Employee.java | 12 +- .../JoinSelfReferentialFetchProfileTest.java | 6 +- .../BatchFetchStrategyHelperTest.java | 14 +- .../FetchStrategyHelperTest.java | 14 +- .../NoProxyFetchStrategyHelperTest.java | 12 +- .../CriteriaQueryWithAppliedFilterTest.java | 20 +- .../orm/test/filter/DynamicFilterTest.java | 12 +- .../orm/test/filter/FilterDotNameTest.java | 12 +- .../FilterWitSubSelectFetchModeTest.java | 14 +- .../ManyToManyWithDynamicFilterTest.java | 10 +- .../OneToManyWithDynamicFilterTest.java | 20 +- .../BasicFilteredBulkManipulationTest.java | 8 +- .../JoinedFilteredBulkManipulationTest.java | 14 +- .../orm/test/filter/proxy/Account.java | 8 +- .../orm/test/filter/proxy/AccountGroup.java | 8 +- .../orm/test/filter/secondarytable/User.java | 12 +- .../subclass/MappedSuperclass/Animal.java | 8 +- .../subclass/MappedSuperclass/Human.java | 6 +- .../subclass/MappedSuperclass/Mammal.java | 10 +- .../test/filter/subclass/joined/Animal.java | 14 +- .../orm/test/filter/subclass/joined/Club.java | 10 +- .../test/filter/subclass/joined/Human.java | 8 +- .../test/filter/subclass/joined/Mammal.java | 6 +- .../filter/subclass/singletable/Animal.java | 14 +- .../filter/subclass/singletable/Human.java | 6 +- .../filter/subclass/singletable/Mammal.java | 6 +- .../filter/subclass/tableperclass/Animal.java | 14 +- .../filter/subclass/tableperclass/Human.java | 6 +- .../filter/subclass/tableperclass/Mammal.java | 6 +- .../org/hibernate/orm/test/flush/Author.java | 14 +- .../org/hibernate/orm/test/flush/Book.java | 12 +- .../hibernate/orm/test/flush/BookStore.java | 8 +- .../test/flush/NativeCriteriaSyncTest.java | 10 +- .../flush/NonTransactionalDataAccessTest.java | 10 +- .../hibernate/orm/test/flush/Publisher.java | 10 +- .../test/flush/TestFlushJoinTransaction.java | 2 +- ...lushModeWithIdentitySelfReferenceTest.java | 16 +- .../orm/test/flush/UnrelatedEntity.java | 6 +- .../orm/test/foreignkeys/HHH14230.java | 10 +- .../disabled/DefaultConstraintModeTest.java | 10 +- .../InheritanceManyToManyForeignKeyTest.java | 18 +- .../foreignkeys/disabled/ManyToManyOwner.java | 20 +- .../disabled/ManyToManyTarget.java | 6 +- .../OneToManyBidirectionalForeignKeyTest.java | 20 +- .../identity/IdentityGeneratedKeysTest.java | 4 +- .../JoinedSequenceIdentityBatchTest.java | 26 +- .../test/graph/AbstractEntityGraphTest.java | 8 +- .../orm/test/graph/EntityGraphsTest.java | 4 +- .../test/graph/GraphParsingTestEntity.java | 18 +- .../test/graph/GraphParsingTestSubentity.java | 6 +- .../orm/test/id/ForeignGeneratorTest.java | 10 +- .../test/id/IdClassManyToOneCascadeTest.java | 8 +- .../orm/test/id/NonUniqueIdTest.java | 6 +- .../id/PooledHiLoSequenceIdentifierTest.java | 8 +- .../orm/test/id/QuotedIdentifierTest.java | 12 +- .../hibernate/orm/test/id/RelatedEntity.java | 12 +- .../org/hibernate/orm/test/id/RootEntity.java | 12 +- ...er2012SequenceGeneratorAnnotationTest.java | 10 +- .../orm/test/id/array/ByteArrayIdTest.java | 6 +- .../test/id/array/CharacterArrayIdTest.java | 6 +- .../id/array/PrimitiveByteArrayIdTest.java | 6 +- .../array/PrimitiveCharacterArrayIdTest.java | 6 +- .../test/id/enhanced/SharedSequenceTest.java | 10 +- ...greSQLSequenceGeneratorWithSerialTest.java | 14 +- ...eMismatchStrategyDefaultExceptionTest.java | 16 +- ...hStrategyFixWithSequenceGeneratorTest.java | 16 +- .../SequenceMismatchStrategyLogTest.java | 16 +- ...hStrategyWithoutSequenceGeneratorTest.java | 14 +- .../orm/test/id/idClass/MyEntity.java | 6 +- .../id/sequence/LegacySequenceExportTest.java | 12 +- .../sequence/NegativeValueSequenceTest.java | 12 +- .../orm/test/id/sequence/OptimizerTest.java | 12 +- .../PostgreSQLIdentitySequenceTest.java | 12 +- .../PostgreSQLIdentitySupportTest.java | 8 +- .../id/usertype/UserTypeComparableIdTest.java | 8 +- .../usertype/UserTypeNonComparableIdTest.java | 8 +- .../orm/test/id/uuid/GeneratedValueTest.java | 10 +- .../PostgreSQLUUIDGeneratedValueTest.java | 6 +- ...GeneratorBinaryUniqueIdentifierIdTest.java | 14 +- ...GeneratorStringUniqueIdentifierIdTest.java | 16 +- .../UUID2GeneratorUniqueIdentifierIdTest.java | 14 +- .../UUIDBasedIdInterpretationTest.java | 8 +- .../uuid/sqlrep/sqlbinary/UUIDBinaryTest.java | 10 +- .../id/uuid/sqlrep/sqlchar/UUIDCharTest.java | 10 +- .../id/uuid/strategy/CustomStrategyTest.java | 6 +- .../org/hibernate/orm/test/idbag/Group.java | 0 .../hibernate/orm/test/idbag/IdBagTest.java | 4 +- .../org/hibernate/orm/test/idbag/User.java | 0 .../orm/test/idbag/UserGroup.hbm.xml | 0 .../orm/test/idclass/IdClassTest.java | 6 +- .../IdClassWithEagerManyToOneTest.java | 8 +- .../idclass/IdClassWithLazyManyToOneTest.java | 10 +- .../idgen/IdGeneratorNameScopingTest.java | 10 +- .../HiloOptimizerConcurrencyTest.java | 6 +- .../auto/AutoGenerationTypeTests.java | 18 +- .../HiLoSequenceMismatchStrategyTest.java | 8 +- .../ForeignGeneratorResourceLocalTest.java | 34 +- .../IdentityInsertSoleColumnTest.java | 8 +- .../IdentityGeneratorExtendsTest.java | 12 +- .../identity/hhh9983/SaveEntityTest.java | 10 +- .../idgen/identity/joinedSubClass/Sub.java | 4 +- .../idgen/identity/joinedSubClass/Super.java | 14 +- .../UserDefinedGeneratorsTests.java | 8 +- .../IdPropertyInJoinedSubclassTest.java | 14 +- .../IdPropertyInSingleTableSubclassTest.java | 14 +- ...rtyInSubclassIdInMappedSuperclassTest.java | 16 +- ...IdPropertyInTablePerClassSubclassTest.java | 14 +- .../PropertyNamedIdInEmbeddedIdTest.java | 6 +- .../idprops/PropertyNamedIdInIdClassTest.java | 6 +- ...ropertyNamedIdInNonJpaCompositeIdTest.java | 4 +- .../PropertyNamedIdOutOfEmbeddedIdTest.java | 8 +- .../PropertyNamedIdOutOfIdClassTest.java | 8 +- ...ertyNamedIdOutOfNonJpaCompositeIdTest.java | 6 +- .../orm/test/immutable/Contract.java | 0 .../test/immutable/ContractVariation.hbm.xml | 0 .../orm/test/immutable/ContractVariation.java | 0 .../orm/test/immutable/ImmutableTest.java | 8 +- .../AbstractEntityWithManyToManyTest.java | 8 +- .../AbstractEntityWithOneToManyTest.java | 10 +- .../entitywithmutablecollection/Contract.java | 0 .../ContractVariation.java | 0 ...lePhysicalIncludedTableConstraintTest.java | 16 +- .../TransientOverrideAsPersistentJoined.java | 36 +- ...tOverrideAsPersistentMappedSuperclass.java | 38 +- ...nsientOverrideAsPersistentSingleTable.java | 36 +- ...ientOverrideAsPersistentTablePerClass.java | 36 +- .../JoinedInheritanceEagerTest.java | 14 +- .../MappedSuperclassExtendsEntityTest.java | 16 +- .../MultiSingleTableLoadTest.java | 20 +- .../SingleTableInheritancePersistTest.java | 22 +- ...ngleTableNullNotNullDiscriminatorTest.java | 10 +- .../SingleTableRelationsTest.java | 24 +- .../TablePerClassInheritancePersistTest.java | 22 +- .../TablePerClassInheritanceTest.java | 18 +- .../JoinedSubclassWithEmbeddableTest.java | 32 +- .../SingleTableWithEmbeddableTest.java | 32 +- .../TablePerClassWithEmbeddableTest.java | 32 +- .../JoinedNullNotNullDiscriminatorTest.java | 12 +- .../joinedsubclass/JoinedSubclassTest.java | 6 +- .../joinedsubclass/RootEntity.java | 14 +- .../joinedsubclass/SubEntity.java | 4 +- .../joinedsubclass/SubSubEntity.java | 4 +- .../joinedsubclass/SubSubSubEntity.java | 4 +- .../joinedsubclass/TestEntityImpl.java | 4 +- .../joinedsubclass/TestEntityInterface.java | 6 +- ...edInheritancePropertyNameConflictTest.java | 14 +- .../JoinedInheritanceWithOneToManyTest.java | 34 +- .../test/insertordering/BatchSortingTest.java | 18 +- .../insertordering/ElementCollectionTest.java | 22 +- .../InsertOrderingDuplicateTest.java | 16 +- .../InsertOrderingHasParentTest.java | 16 +- ...rderingReferenceDifferentSubclassTest.java | 16 +- ...ngSelfReferenceSingleTableInheritance.java | 18 +- .../InsertOrderingSelfReferenceTest.java | 24 +- ...eringWithBaseClassReferencingSubclass.java | 12 +- ...rtOrderingWithBidirectionalManyToMany.java | 16 +- ...deringWithBidirectionalMapsIdOneToOne.java | 18 +- ...ertOrderingWithBidirectionalOneToMany.java | 18 +- ...ithBidirectionalOneToManyFlushProblem.java | 18 +- ...sertOrderingWithBidirectionalOneToOne.java | 16 +- ...WithBidirectionalOneToOneFlushProblem.java | 12 +- .../InsertOrderingWithCascadeOnPersist.java | 20 +- ...tOrderingWithCompositeTypeAssociation.java | 22 +- ...ertOrderingWithJoinedTableInheritance.java | 34 +- ...gWithJoinedTableMultiLevelInheritance.java | 30 +- .../InsertOrderingWithManyToOne.java | 14 +- .../InsertOrderingWithMultipleManyToOne.java | 8 +- .../InsertOrderingWithSecondaryTable.java | 40 +- ...ertOrderingWithSingleTableInheritance.java | 34 +- ...tOrderingWithTablePerClassInheritance.java | 34 +- ...ertOrderingWithUnidirectionalOneToOne.java | 16 +- ...gWithUnidirectionalOneToOneJoinColumn.java | 16 +- .../UpdateOrderingIdentityIdentifierTest.java | 20 +- .../test/internal/util/ReflectHelperTest.java | 10 +- ...rollableResultsObjectArrayCastingTest.java | 10 +- .../hibernate/orm/test/iterate/Item.hbm.xml | 0 .../org/hibernate/orm/test/iterate/Item.java | 0 .../orm/test/jdbc/LobCreatorTest.java | 2 +- .../jdbc/internal/AggressiveReleaseTest.java | 2 +- .../jdbc/internal/SessionJdbcBatchTest.java | 4 +- .../org/hibernate/orm/test/join/Customer.java | 12 +- .../org/hibernate/orm/test/join/Employee.java | 12 +- .../org/hibernate/orm/test/join/JoinTest.java | 6 +- .../orm/test/join/OuterJoinTest.java | 18 +- .../hibernate/orm/test/join/Person.hbm.xml | 0 .../org/hibernate/orm/test/join/Person.java | 24 +- .../orm/test/join/SecondaryTableTest.java | 0 .../SubclassesWithSamePropertyNameTest.java | 6 +- .../org/hibernate/orm/test/join/User.java | 10 +- .../orm/test/joinedsubclass/Address.java | 0 .../orm/test/joinedsubclass/Customer.java | 0 .../orm/test/joinedsubclass/Employee.java | 0 .../joinedsubclass/JoinedSubclassTest.java | 6 +- .../JoinedSubclassWithEmbeddableTest.java | 10 +- ...SubclassWithExplicitDiscriminatorTest.java | 16 +- ...sWithIgnoredExplicitDiscriminatorTest.java | 16 +- ...SubclassWithImplicitDiscriminatorTest.java | 10 +- .../orm/test/joinedsubclass/Person.hbm.xml | 0 .../orm/test/joinedsubclass/Person.java | 0 .../hibernate/orm/test/jpa/CompositeId.java | 2 +- .../orm/test/jpa/CompositeIdRowValueTest.java | 4 +- .../jpa/CountEntityWithCompositeIdTest.java | 6 +- .../orm/test/jpa/EntityManagerClosedTest.java | 16 +- .../jpa/EntityManagerFactoryUnwrapTest.java | 8 +- .../orm/test/jpa/EntityWithCompositeId.java | 4 +- .../jpa/JpaProxyComplianceWithDebugTest.java | 18 +- .../jpa/JpaqlStrictComplianceAliasTest.java | 4 +- .../orm/test/jpa/association/Incident.java | 8 +- .../test/jpa/association/IncidentStatus.java | 6 +- .../orm/test/jpa/association/Kitchen.java | 8 +- .../orm/test/jpa/association/Oven.java | 12 +- .../beanvalidation/BeanValidationTest.java | 4 +- .../test/jpa/beanvalidation/CupHolder.java | 10 +- .../test/jpa/beanvalidation/ValidTitle.java | 6 +- .../ValidatorFactory2PhaseInjectionTest.java | 6 +- .../orm/test/jpa/boot/BootFailureTest.java | 4 +- .../boot/DeprecatedProviderCheckerTest.java | 2 +- .../orm/test/jpa/boot/NewBootProcessTest.java | 2 +- .../annotation/ConfigurationTest.java | 4 +- .../annotation/ExplicitlyCacheableEntity.java | 8 +- .../ExplicitlyNonCacheableEntity.java | 6 +- .../NoCacheableAnnotationEntity.java | 6 +- .../cacheable/api/JpaCacheApiUsageTest.java | 2 +- .../orm/test/jpa/cacheable/api/Order.java | 8 +- .../cachemodes/SharedCacheModesTest.java | 4 +- .../cacheable/cachemodes/SimpleEntity.java | 4 +- .../jpa/callbacks/CallbackAndDirtyTest.java | 2 +- .../jpa/callbacks/CommunicationSystem.java | 4 +- .../test/jpa/callbacks/CountryChecker.java | 2 +- .../callbacks/CountryNameCheckerListener.java | 4 +- .../orm/test/jpa/callbacks/Customer.java | 12 +- .../orm/test/jpa/callbacks/Employee.java | 12 +- .../test/jpa/callbacks/ExceptionListener.java | 2 +- .../test/jpa/callbacks/FirstOneListener.java | 2 +- .../test/jpa/callbacks/IncreaseListener.java | 2 +- .../orm/test/jpa/callbacks/Person.java | 14 +- .../orm/test/jpa/callbacks/Plant.java | 6 +- .../PreUpdateBytecodeEnhancementTest.java | 18 +- ...dateCustomEntityDirtinessStrategyTest.java | 18 +- ...PreUpdateDirtyCheckingInterceptorTest.java | 18 +- .../PreUpdateNewBidirectionalBagTest.java | 16 +- .../PreUpdateNewUnidirectionalBagTest.java | 14 +- .../PreUpdateNewUnidirectionalIdBagTest.java | 16 +- .../PrivateConstructorEnhancerTest.java | 12 +- .../jpa/callbacks/PrivateConstructorTest.java | 16 +- .../callbacks/ProtectedConstructorTest.java | 16 +- .../orm/test/jpa/callbacks/RemoteControl.java | 14 +- .../orm/test/jpa/callbacks/Rythm.java | 8 +- .../orm/test/jpa/callbacks/Television.java | 16 +- .../orm/test/jpa/callbacks/Translation.java | 10 +- .../orm/test/jpa/callbacks/VideoSystem.java | 10 +- .../hbmxml/MappingClassMoreThanOnceTest.java | 2 +- .../orm/test/jpa/cascade/Author.java | 6 +- .../orm/test/jpa/cascade/Conference.java | 26 +- .../jpa/cascade/DetachAndContainsTest.java | 16 +- .../test/jpa/cascade/ExtractionDocument.java | 14 +- .../jpa/cascade/ExtractionDocumentInfo.java | 22 +- .../orm/test/jpa/cascade/Grandson.java | 12 +- .../orm/test/jpa/cascade/MergeTest.java | 14 +- ...thTransientNonCascadedAssociationTest.java | 8 +- .../orm/test/jpa/cascade/Parent.java | 8 +- .../orm/test/jpa/cascade/Soldier.java | 14 +- .../orm/test/jpa/cascade/Soldier2.java | 12 +- .../hibernate/orm/test/jpa/cascade/Son.java | 12 +- .../hibernate/orm/test/jpa/cascade/Song.java | 10 +- .../orm/test/jpa/cascade/Student.java | 16 +- .../orm/test/jpa/cascade/Teacher.java | 16 +- .../hibernate/orm/test/jpa/cascade/Troop.java | 12 +- .../orm/test/jpa/cascade/Troop2.java | 6 +- .../cascade/multicircle/AbstractEntity.java | 10 +- .../orm/test/jpa/cascade/multicircle/B.java | 14 +- .../orm/test/jpa/cascade/multicircle/C.java | 8 +- .../orm/test/jpa/cascade/multicircle/D.java | 12 +- .../orm/test/jpa/cascade/multicircle/E.java | 6 +- .../orm/test/jpa/cascade/multicircle/F.java | 10 +- .../orm/test/jpa/cascade/multicircle/G.java | 6 +- .../MultiCircleJpaCascadeTest.java | 4 +- .../test/jpa/cascade/multilevel/Bottom.java | 10 +- .../test/jpa/cascade/multilevel/Middle.java | 14 +- ...iLevelCascadeCollectionEmbeddableTest.java | 30 +- ...ultiLevelCascadeCollectionIdClassTest.java | 28 +- ...ularIdBasedParentChildAssociationTest.java | 12 +- .../orm/test/jpa/cascade/multilevel/Top.java | 12 +- .../orm/test/jpa/cdi/BasicCdiTest.java | 16 +- .../orm/test/jpa/cdi/NoCdiAvailableTest.java | 6 +- .../jpa/cdi/NoCdiAvailableTestDelegate.java | 2 +- .../orm/test/jpa/collection/Child.java | 84 +- .../orm/test/jpa/collection/Parent.java | 114 +-- .../tck2_2/EntityTransactionTests.java | 2 +- .../tck2_2/GeneratedValueTests.java | 26 +- .../tck2_2/GetterAndIsMethodChecks.java | 6 +- .../tck2_2/JpaPositionalParameterTest.java | 2 +- .../tck2_2/NonSelectQueryLockMode.java | 2 +- .../jpa/compliance/tck2_2/QueryApiTest.java | 14 +- .../compliance/tck2_2/QueryExecutionTest.java | 18 +- .../tck2_2/StoredProcedureApiTests.java | 10 +- .../TableGeneratorMultipleDefinitionTest.java | 10 +- .../tck2_2/TableGeneratorVisibilityTest.java | 10 +- .../CachingWithSecondaryTablesTests.java | 16 +- .../caching/InheritedCacheableTest.java | 14 +- .../caching/SubclassOnlyCachingTests.java | 14 +- .../compliance/tck2_2/joincolumn/Company.java | 8 +- .../tck2_2/joincolumn/Location.java | 10 +- .../MapKeyColumnBiDiOneToManyFKTest.java | 16 +- .../MapKeyColumnElementCollectionTest.java | 16 +- .../MapKeyColumnManyToManyTest.java | 14 +- .../MapKeyColumnOneToManyFKTest.java | 16 +- .../MapKeyColumnOneToManyJoinTableTest.java | 14 +- .../ConnectionsReleaseAutoCommitTest.java | 6 +- .../connection/DataSourceInjectionTest.java | 2 +- .../orm/test/jpa/criteria/Animal.java | 12 +- .../hibernate/orm/test/jpa/criteria/Book.java | 8 +- .../orm/test/jpa/criteria/Color.java | 2 +- .../jpa/criteria/CriteriaCompilingTest.java | 10 +- .../CriteriaQueryTypeQueryAdapterTest.java | 24 +- .../ElementCollectionConverterTest.java | 6 +- .../orm/test/jpa/criteria/Elephant.java | 6 +- .../EntitySuperclassCollectionTest.java | 22 +- .../orm/test/jpa/criteria/Human.java | 6 +- .../orm/test/jpa/criteria/Industry.java | 2 +- .../hibernate/orm/test/jpa/criteria/Item.java | 12 +- .../jpa/criteria/ItemAttributeConverter.java | 2 +- .../criteria/ManipulationCriteriaTest.java | 14 +- .../MultiTypedBasicAttributesEntity.java | 8 +- .../orm/test/jpa/criteria/OnKeywordTest.java | 6 +- .../orm/test/jpa/criteria/ParameterTest.java | 16 +- .../test/jpa/criteria/QueryBuilderTest.java | 18 +- .../orm/test/jpa/criteria/Store.java | 6 +- .../criteria/SuperclassCollectionTest.java | 26 +- .../orm/test/jpa/criteria/TreatJoinTest.java | 28 +- .../test/jpa/criteria/TreatKeywordTest.java | 18 +- .../test/jpa/criteria/TreatListJoinTest.java | 30 +- .../alias/CriteriaMultiselectAliasTest.java | 10 +- .../criteria/basic/AggregationResultTest.java | 8 +- .../basic/BasicCriteriaUsageTest.java | 16 +- .../orm/test/jpa/criteria/basic/CastTest.java | 6 +- .../test/jpa/criteria/basic/ConcatTest.java | 16 +- .../jpa/criteria/basic/ExpressionsTest.java | 14 +- .../InWithHeterogeneousCollectionTest.java | 16 +- .../jpa/criteria/basic/ListIndexTest.java | 10 +- .../orm/test/jpa/criteria/basic/Payment.java | 10 +- .../jpa/criteria/basic/PredicateTest.java | 12 +- .../orm/test/jpa/criteria/basic/Wall.java | 12 +- .../ComponentInWhereClauseTest.java | 32 +- ...SuperclassComponentWithCollectionTest.java | 32 +- ...SuperclassComponentWithCollectionTest.java | 32 +- .../components/joins/ComponentJoinTest.java | 16 +- .../components/joins/EmbeddedType.java | 6 +- .../jpa/criteria/components/joins/Entity.java | 8 +- .../components/joins/ManyToOneType.java | 6 +- .../enumcollection/EnumIsMemberTest.java | 12 +- .../jpa/criteria/enumcollection/User.java | 20 +- .../CriteriaToScrollableResultsFetchTest.java | 16 +- .../jpa/criteria/fetchscroll/Customer.java | 2 +- .../jpa/criteria/fetchscroll/Facility.java | 2 +- .../test/jpa/criteria/fetchscroll/Order.java | 2 +- .../jpa/criteria/fetchscroll/OrderId.java | 2 +- .../jpa/criteria/fetchscroll/OrderLine.java | 2 +- .../jpa/criteria/fetchscroll/OrderLineId.java | 2 +- .../jpa/criteria/fetchscroll/Product.java | 2 +- .../jpa/criteria/fetchscroll/ProductId.java | 2 +- .../jpa/criteria/fetchscroll/PurchaseOrg.java | 2 +- .../test/jpa/criteria/fetchscroll/Site.java | 2 +- .../orm/test/jpa/criteria/idclass/Helper.java | 8 +- .../test/jpa/criteria/idclass/HelperId.java | 6 +- .../idclass/IdClassPredicateTest.java | 12 +- .../orm/test/jpa/criteria/idclass/Tool.java | 6 +- .../orm/test/jpa/criteria/idclass/Widget.java | 10 +- .../test/jpa/criteria/idclass/WidgetId.java | 6 +- ...stractCriteriaLiteralHandlingModeTest.java | 12 +- .../CriteriaLiteralWithSingleQuoteTest.java | 16 +- .../test/jpa/criteria/mapjoin/Customer.java | 10 +- .../jpa/criteria/mapjoin/CustomerOrder.java | 6 +- .../criteria/mapjoin/MapJoinEntryTest.java | 10 +- .../jpa/criteria/mapjoin/MapJoinTest.java | 10 +- .../mapjoin/MapJoinTestWithEmbeddable.java | 34 +- ...CriteriaLiteralInSelectExpressionTest.java | 22 +- .../nulliteral/CriteriaLiteralsTest.java | 26 +- .../nulliteral/NullLiteralExpression.java | 6 +- .../test/jpa/criteria/nulliteral/Person.java | 8 +- .../test/jpa/criteria/nulliteral/Subject.java | 6 +- .../criteria/paths/AbstractPathImplTest.java | 10 +- .../jpa/criteria/paths/FetchAndJoinTest.java | 14 +- .../jpa/criteria/paths/ImplicitJoinTest.java | 10 +- .../orm/test/jpa/criteria/paths/LineItem.java | 12 +- .../orm/test/jpa/criteria/paths/Order.java | 16 +- .../paths/PluralAttributeExpressionsTest.java | 8 +- .../paths/SingularAttributeJoinTest.java | 16 +- .../criteria/query/LimitExpressionTest.java | 10 +- .../criteria/query/NonSelectCriteriaTest.java | 8 +- .../selectcase/GroupBySelectCaseTest.java | 14 +- .../SelectCaseLiteralHandlingBindTest.java | 14 +- .../criteria/selectcase/SelectCaseTest.java | 20 +- .../simplecase/BasicSimpleCaseTest.java | 28 +- .../CriteriaSelectSizeCollectionTest.java | 20 +- .../AbstractSubqueryInSelectClauseTest.java | 14 +- .../subquery/CorrelatedSubqueryTest.java | 14 +- ...bqueryInSelectClauseJpaComplianceTest.java | 14 +- .../subquery/SubqueryInSelectClauseTest.java | 14 +- .../subquery/UncorrelatedSubqueryTest.java | 12 +- .../jpa/criteria/tuple/TupleCriteriaTest.java | 16 +- .../orm/test/jpa/ejb3configuration/Bell.java | 4 +- .../ConfigurationObjectSettingTest.java | 4 +- ...EntityManagerFactorySerializationTest.java | 4 +- .../EntityManagerSerializationTest.java | 4 +- .../ejb3configuration/InterceptorTest.java | 2 +- .../NamingStrategyConfigurationTest.java | 2 +- .../PersisterClassProviderTest.java | 8 +- .../SessionFactoryObserverTest.java | 2 +- .../test/jpa/ejb3configuration/id/Cable.java | 6 +- ...entifierGeneratorStrategyProviderTest.java | 4 +- .../org/hibernate/orm/test/jpa/emops/Cat.java | 8 +- .../orm/test/jpa/emops/Category.java | 10 +- .../hibernate/orm/test/jpa/emops/Colony.java | 6 +- .../orm/test/jpa/emops/Competition.java | 16 +- .../orm/test/jpa/emops/Competitor.java | 6 +- .../orm/test/jpa/emops/Decorate.java | 12 +- .../org/hibernate/orm/test/jpa/emops/Dog.java | 6 +- .../hibernate/orm/test/jpa/emops/Dress.java | 4 +- .../hibernate/orm/test/jpa/emops/Empire.java | 10 +- .../orm/test/jpa/emops/FlushTest.java | 4 +- .../hibernate/orm/test/jpa/emops/Hoarder.java | 14 +- .../hibernate/orm/test/jpa/emops/Item.java | 10 +- .../hibernate/orm/test/jpa/emops/Mail.java | 6 +- .../hibernate/orm/test/jpa/emops/Music.java | 8 +- .../org/hibernate/orm/test/jpa/emops/Pet.java | 12 +- .../hibernate/orm/test/jpa/emops/Race.java | 14 +- .../orm/test/jpa/emops/RefreshTest.java | 2 +- .../orm/test/jpa/emops/RemoveTest.java | 4 +- .../orm/test/jpa/emops/cascade/A.java | 14 +- .../orm/test/jpa/emops/cascade/B1.java | 20 +- .../orm/test/jpa/emops/cascade/B2.java | 18 +- .../orm/test/jpa/emops/cascade/B3.java | 16 +- .../orm/test/jpa/emops/cascade/B4.java | 16 +- .../orm/test/jpa/emops/cascade/C1.java | 16 +- .../orm/test/jpa/emops/cascade/C2.java | 16 +- .../TestLazyPropertyOnPreUpdate.java | 16 +- .../orm/test/jpa/exception/ExceptionTest.java | 8 +- .../orm/test/jpa/exception/Instrument.java | 8 +- .../orm/test/jpa/exception/Music.java | 8 +- .../orm/test/jpa/exception/Musician.java | 8 +- .../jpa/factory/SynchronizationTypeTest.java | 2 +- .../test/jpa/factory/puUtil/LegacyEntity.java | 6 +- .../test/jpa/factory/puUtil/ModernEntity.java | 6 +- .../factory/puUtil/NestedLegacyEntity.java | 12 +- .../orm/test/jpa/graphs/Company.java | 14 +- .../test/jpa/graphs/CompanyFetchProfile.java | 2 +- .../hibernate/orm/test/jpa/graphs/Course.java | 10 +- .../orm/test/jpa/graphs/Employee.java | 12 +- .../EntityGraphAttributeResolutionTest.java | 30 +- .../orm/test/jpa/graphs/EntityGraphTest.java | 30 +- ...EntityGraphUsingFetchGraphForLazyTest.java | 22 +- .../orm/test/jpa/graphs/FetchGraphTest.java | 20 +- .../jpa/graphs/LoadAndFetchGraphTest.java | 22 +- .../orm/test/jpa/graphs/Location.java | 6 +- .../orm/test/jpa/graphs/Manager.java | 2 +- .../orm/test/jpa/graphs/Student.java | 25 +- .../mappedbyid/FetchGraphFindByIdTest.java | 6 +- .../queryhint/QueryHintEntityGraphTest.java | 8 +- ...tialValueTableGeneratorConfiguredTest.java | 10 +- ...tialValueTableGeneratorConfiguredTest.java | 10 +- .../orm/test/jpa/inheritance/Fruit.java | 10 +- .../orm/test/jpa/inheritance/Strawberry.java | 4 +- .../test/jpa/integrationprovider/Person.java | 6 +- .../orm/test/jpa/jointable/Address.java | 6 +- .../orm/test/jpa/jointable/Person.java | 10 +- .../hibernate/orm/test/jpa/lob/BlobTest.java | 2 +- .../orm/test/jpa/lob/ImageReader.java | 10 +- .../org/hibernate/orm/test/jpa/lock/Lock.java | 14 +- .../orm/test/jpa/lock/LockExceptionTests.java | 6 +- .../hibernate/orm/test/jpa/lock/LockTest.java | 14 +- .../jpa/lock/LockTimeoutPropertyTest.java | 6 +- .../hibernate/orm/test/jpa/lock/Lockable.java | 8 +- .../hibernate/orm/test/jpa/lock/Person.java | 14 +- ...ithOptionalOuterJoinBreaksRefreshTest.java | 16 +- .../orm/test/jpa/lock/QueryLockingTest.java | 22 +- ...tementIsClosedAfterALockExceptionTest.java | 2 +- .../orm/test/jpa/lock/UnversionedLock.java | 10 +- .../orm/test/jpa/lock/UpgradeLockTest.java | 8 +- ...ctionalOneToManyNotNullableColumnTest.java | 14 +- ...thExplicitReferenceToPrimaryTableTest.java | 8 +- .../test/jpa/mapping/DefaultCascadeTest.java | 10 +- ...nidirectionalOneToManyIndexColumnTest.java | 12 +- ...nidirectionalOneToManyOrderColumnTest.java | 14 +- ...ToManyUniqueConstraintOrderColumnTest.java | 18 +- .../orm/test/jpa/metadata/Address.java | 4 +- .../orm/test/jpa/metadata/Animal.java | 6 +- .../orm/test/jpa/metadata/Being.java | 2 +- .../hibernate/orm/test/jpa/metadata/Cat.java | 2 +- .../orm/test/jpa/metadata/Cattish.java | 2 +- .../orm/test/jpa/metadata/Child.java | 8 +- .../test/jpa/metadata/DeskWithRawType.java | 14 +- .../hibernate/orm/test/jpa/metadata/Dog.java | 2 +- .../jpa/metadata/EmployeeWithRawType.java | 12 +- .../orm/test/jpa/metadata/Feline.java | 2 +- .../orm/test/jpa/metadata/Flower.java | 6 +- .../orm/test/jpa/metadata/FoodItem.java | 8 +- .../orm/test/jpa/metadata/Fridge.java | 8 +- .../orm/test/jpa/metadata/Garden.java | 8 +- .../orm/test/jpa/metadata/Giant.java | 2 +- .../orm/test/jpa/metadata/House.java | 10 +- .../jpa/metadata/JoinedManyToOneOwner.java | 8 +- .../orm/test/jpa/metadata/MetadataTest.java | 28 +- .../orm/test/jpa/metadata/Parent.java | 16 +- .../orm/test/jpa/metadata/Person.java | 6 +- .../hibernate/orm/test/jpa/metadata/Room.java | 2 +- .../test/jpa/metadata/SecondMetadataTest.java | 2 +- .../jpa/metadata/SimpleMedicalHistory.java | 12 +- .../orm/test/jpa/metadata/SimplePerson.java | 4 +- .../test/jpa/metadata/StaticMetadataTest.java | 10 +- .../orm/test/jpa/metadata/Thing.java | 4 +- .../jpa/metadata/WithGenericCollection.java | 18 +- .../attribute/AbstractNameable.java | 4 +- .../MappedSuperclassWithAttributesTest.java | 2 +- .../mappedsuperclass/attribute/Product.java | 4 +- .../embedded/AbstractAddressable.java | 4 +- .../mappedsuperclass/embedded/Address.java | 2 +- .../mappedsuperclass/embedded/Company.java | 4 +- .../MappedSuperclassWithEmbeddedTest.java | 2 +- .../embeddedid/AbstractProduct.java | 4 +- .../MappedSuperclassWithEmbeddedIdTest.java | 2 +- .../mappedsuperclass/embeddedid/Product.java | 4 +- .../embeddedid/ProductId.java | 4 +- .../idclass/AbstractAttribute.java | 6 +- .../idclass/AbstractAttributeId.java | 2 +- ...edSuperclassWithEntityWithIdClassTest.java | 2 +- .../idclass/ProductAttribute.java | 8 +- .../overridden/AbstractProduct.java | 10 +- ...SuperclassWithOverriddenAttributeTest.java | 2 +- .../mappedsuperclass/overridden/Product1.java | 10 +- .../mappedsuperclass/overridden/Product2.java | 8 +- .../orm/test/jpa/metamodel/GenericsTest.java | 2 +- .../metamodel/MappedSuperclassType2Test.java | 4 +- .../metamodel/MappedSuperclassTypeTest.java | 6 +- .../metamodel/MixedIdAndIdClassHandling.java | 14 +- .../orm/test/jpa/metamodel/Person.java | 2 +- .../orm/test/jpa/metamodel/PersonId.java | 2 +- .../jpa/metamodel/SomeMappedSuperclass.java | 4 +- .../SomeMappedSuperclassSubclass.java | 2 +- .../attributeInSuper/AbstractEntity.java | 6 +- .../attributeInSuper/EmbeddableEntity.java | 6 +- .../EmbeddableInSuperClassTest.java | 8 +- .../metamodel/attributeInSuper/Entity.java | 2 +- .../FunkyExtendedEmbeddedIdTest.java | 2 +- .../metamodel/attributeInSuper/WorkOrder.java | 12 +- .../attributeInSuper/WorkOrderComponent.java | 10 +- .../WorkOrderComponentId.java | 4 +- .../attributeInSuper/WorkOrderId.java | 4 +- .../hibernate/orm/test/jpa/ops/Animal.java | 6 +- .../orm/test/jpa/ops/ContainsTest.java | 4 +- ...oadJpaComplianceDifferentSessionsTest.java | 2 +- .../jpa/ops/GetLoadJpaComplianceTest.java | 2 +- .../orm/test/jpa/ops/GetLoadTest.java | 0 .../hibernate/orm/test/jpa/ops/Mammal.java | 2 +- .../test/jpa/ops/MergeJpaComplianceTest.java | 16 +- .../hibernate/orm/test/jpa/ops/MergeTest.java | 0 .../org/hibernate/orm/test/jpa/ops/Node.java | 0 .../orm/test/jpa/ops/NumberedNode.java | 0 .../orm/test/jpa/ops/PersistTest.java | 4 +- .../orm/test/jpa/ops/RemoveOrderingTest.java | 12 +- .../hibernate/orm/test/jpa/ops/Reptile.java | 2 +- .../hibernate/orm/test/jpa/ops/Workload.java | 8 +- .../DeleteSharedOneToManyOrphansTest.java | 16 +- .../test/jpa/orphan/onetomany/Feature.java | 12 +- .../test/jpa/orphan/onetomany/Product.java | 12 +- .../orm/test/jpa/orphan/onetoone/A.java | 8 +- .../orm/test/jpa/orphan/onetoone/B.java | 12 +- .../DeleteMultiLevelOrphansTest.java | 2 +- .../multilevelcascade/Preisregelung.java | 12 +- .../onetoone/multilevelcascade/Tranche.java | 14 +- .../multilevelcascade/Tranchenmodell.java | 16 +- .../orphan/onetoone/multilevelcascade/X.java | 10 +- .../orphan/onetoone/multilevelcascade/Y.java | 10 +- .../test/jpa/query/LimitExpressionTest.java | 10 +- .../jpa/query/NamedQueryFlushModeTest.java | 30 +- ...yParametersWithDisabledValidationTest.java | 8 +- ...ithInParamListAndNamedEntityGraphTest.java | 18 +- .../orm/test/jpa/query/TupleQueryTest.java | 14 +- .../jpa/query/TypedValueParametersTest.java | 12 +- .../orm/test/jpa/refresh/TestEntity.java | 6 +- .../orm/test/jpa/schemagen/Document.java | 6 +- .../orm/test/jpa/schemagen/Item.java | 6 +- .../jpa/schemagen/JpaSchemaGeneratorTest.java | 4 +- .../jpa/schemagen/SchemaCreateDropTest.java | 2 +- ...DropUtf8WithoutHbm2DdlCharsetNameTest.java | 8 +- ...hemaDatabaseFileGenerationFailureTest.java | 8 +- ...SchemaScriptFileGenerationFailureTest.java | 12 +- .../SchemaScriptFileGenerationTest.java | 6 +- ...ableNullNonOptionalSecondaryTableTest.java | 14 +- ...ableNullNonOptionalSecondaryTableTest.java | 10 +- .../EntityManagerDeserializationTest.java | 14 +- .../jpa/statistics/SessionCloseCountTest.java | 2 +- .../test/jpa/temporal/TemporalTypeTest.java | 12 +- .../orm/test/jpa/test/components/Alias.java | 6 +- .../orm/test/jpa/test/components/Client.java | 6 +- .../components/ComponentCriteriaTest.java | 8 +- .../orm/test/jpa/test/components/Name.java | 10 +- .../orm/test/jpa/transaction/Book.java | 11 +- ...ntityManagerWithActiveTransactionTest.java | 26 +- ...nagerWithJpaTransactionComplianceTest.java | 4 +- ...erWithoutJpaTransactionComplianceTest.java | 4 +- .../transaction/FlushAndTransactionTest.java | 14 +- .../jpa/transaction/GetTransactionTest.java | 2 +- .../JtaGetTransactionThrowsExceptionTest.java | 6 +- .../JtaReusingEntityTransactionTest.java | 8 +- .../transaction/SynchronizationTypeTest.java | 18 +- .../TransactionCommitFailureTest.java | 6 +- .../TransactionJoinHandlingChecker.java | 8 +- .../transaction/TransactionJoiningTest.java | 12 +- .../transaction/TransactionRollbackTest.java | 6 +- ...actionRolledBackInDifferentThreadTest.java | 14 +- .../batch/AbstractJtaBatchTest.java | 10 +- .../batch/JtaWithFailingBatchTest.java | 8 +- .../batch/JtaWithStatementsBatchTest.java | 8 +- .../ResourceLocalTransactionJoiningTest.java | 4 +- .../orm/test/jpa/userguide/util/Article.java | 10 +- .../orm/test/jpa/userguide/util/Author.java | 9 +- .../orm/test/jpa/userguide/util/Book.java | 7 +- .../userguide/util/CopyrightableContent.java | 7 +- .../jpa/userguide/util/GetIdentifierTest.java | 2 +- .../test/jpa/userguide/util/IsLoadedTest.java | 2 +- .../util/PersistenceUtilHelperTest.java | 2 +- .../jpa/userguide/util/ProviderUtilTest.java | 4 +- .../orm/test/jpa/userguide/util/Sickness.java | 10 +- .../orm/test/jpa/userguide/util/Umbrella.java | 6 +- .../orm/test/jpa/version/Customer.java | 12 +- .../hibernate/orm/test/jpa/version/Order.java | 12 +- .../hibernate/orm/test/jpa/xml/Article.java | 16 +- .../orm/test/jpa/xml/CounterListener.java | 6 +- .../hibernate/orm/test/jpa/xml/Employee.java | 6 +- .../orm/test/jpa/xml/JpaEntityNameTest.java | 6 +- ...XmlAndAnnotationAttributeOverrideTest.java | 16 +- .../hibernate/orm/test/jpa/xml/XmlTest.java | 4 +- .../orm/test/jpa/xml/sequences/Article.java | 16 +- .../orm/test/jpa/xml/sequences/Employee.java | 6 +- .../orm/test/jpa/xml/sequences/XmlTest.java | 2 +- .../jpa/xml/versions/JpaXsdVersionsTest.java | 14 +- .../component/EagerKeyManyToOneTest.java | 4 +- .../bidir/embedded/KeyManyToOneTest.java | 10 +- ...azyPersistWithDetachedAssociationTest.java | 12 +- .../hibernate/orm/test/lazyload/Child.java | 14 +- .../test/lazyload/LazyLoadingLoggingTest.java | 14 +- .../orm/test/lazyload/LazyLoadingTest.java | 18 +- .../ManyToOneLazyLoadingByIdTest.java | 8 +- .../hibernate/orm/test/lazyload/Parent.java | 14 +- .../org/hibernate/orm/test/legacy/Baz.java | 2 +- .../hibernate/orm/test/legacy/Company.java | 14 +- .../orm/test/legacy/CompositeElement.java | 2 +- .../org/hibernate/orm/test/legacy/Drug.java | 8 +- .../org/hibernate/orm/test/legacy/Foo.java | 22 +- .../orm/test/legacy/Intervention.java | 6 +- .../hibernate/orm/test/legacy/Medication.java | 8 +- .../test/legacy/NonReflectiveBinderTest.java | 2 +- .../org/hibernate/orm/test/legacy/Party.java | 18 +- .../org/hibernate/orm/test/legacy/Person.java | 26 +- .../hibernate/orm/test/legacy/Resource.java | 18 +- .../org/hibernate/orm/test/legacy/Role.java | 6 +- .../orm/test/loading/MappedFetchTests.java | 16 +- .../orm/test/loading/ReadonlyHintTest.java | 4 +- .../MultiLoadSubSelectCollectionTest.java | 18 +- .../test/loading/multiLoad/MultiLoadTest.java | 10 +- .../org/hibernate/orm/test/locking/A.java | 10 +- .../test/locking/AbstractSkipLockedTest.java | 4 +- .../locking/HANAOptimisticLockingTest.java | 10 +- ...heritanceOptimisticForceIncrementTest.java | 16 +- .../orm/test/locking/LockModeTest.java | 6 +- .../orm/test/locking/LockRefreshTest.java | 10 +- .../orm/test/locking/paging/Door.java | 6 +- .../locking/paging/PagingAndLockingTest.java | 6 +- .../locking/warning/LockNoneWarmingTest.java | 14 +- .../orm/test/manytomany/Advertisement.java | 12 +- .../orm/test/manytomany/Attachment.java | 8 +- .../hibernate/orm/test/manytomany/Group.java | 0 .../ManyToManyBidirectionalTest.java | 12 +- .../orm/test/manytomany/ManyToManyTest.java | 6 +- .../test/manytomany/PageAdvertisement.java | 6 +- .../test/manytomany/SubjectAdvertisement.java | 4 +- .../hibernate/orm/test/manytomany/User.java | 0 .../orm/test/manytomany/UserGroup.hbm.xml | 0 .../batchload/UserGroupBatchLoad.hbm.xml | 0 ...ManyWithMaykeyAndSchemaDefinitionTest.java | 14 +- .../ordered/OrderedManyToManyTest.java | 6 +- ...ToManyAssociationClassGeneratedIdTest.java | 2 +- .../org/hibernate/orm/test/map/Group.java | 0 .../orm/test/map/MapIndexFormulaTest.java | 0 .../orm/test/map/SessionAttribute.java | 0 .../java/org/hibernate/orm/test/map/User.java | 0 .../hibernate/orm/test/map/UserGroup.hbm.xml | 0 .../orm/test/mapelemformula/Group.java | 0 .../mapelemformula/MapElementFormulaTest.java | 0 .../orm/test/mapelemformula/User.java | 0 .../orm/test/mapelemformula/UserGroup.hbm.xml | 0 .../orm/test/mapping/SecondaryTableTests.java | 10 +- .../orm/test/mapping/SmokeTests.java | 22 +- .../orm/test/mapping/array/ArrayTests.java | 12 +- .../test/mapping/attrorder/TheComponent.java | 2 +- .../orm/test/mapping/attrorder/TheEntity.java | 8 +- .../mapping/cid/aggregated/SmokeTests.java | 16 +- .../mapping/cid/nonaggregated/SmokeTests.java | 12 +- .../SortNaturalByDefaultTests.java | 14 +- .../contributed/BasicContributorTests.java | 6 +- .../converted/converter/AndLobTest.java | 12 +- .../converter/AndNationalizedTests.java | 10 +- .../converter/AttributeConverterTest.java | 16 +- .../BasicJodaTimeConversionTest.java | 8 +- .../converted/converter/ConverterTest.java | 8 +- .../converter/DirtyCheckingTest.java | 10 +- .../converter/ExplicitDateConvertersTest.java | 8 +- .../converter/ExplicitEnumConvertersTest.java | 8 +- .../ExplicitJavaTypeDescriptorTest.java | 14 +- .../ExplicitlyNamedConverterClassesTest.java | 8 +- .../converter/LongToDateConversionTest.java | 16 +- .../converter/NullHandlingTests.java | 10 +- ...buteConverterEntityManagerFactoryTest.java | 12 +- ...eAttributeConverterSessionFactoryTest.java | 12 +- .../converted/converter/QueryTest.java | 18 +- .../converter/SillyStringConverter.java | 4 +- .../SimpleConvertAnnotationTest.java | 10 +- .../SimpleConvertsAnnotationTest.java | 12 +- ...mpleEmbeddableOverriddenConverterTest.java | 10 +- .../SimpleOverriddenConverterTest.java | 8 +- .../converter/SimpleXmlOverriddenTest.java | 6 +- .../converter/StringClobConverter.java | 4 +- ...XmlWithExplicitConvertAnnotationsTest.java | 14 +- .../converted/converter/caching/Address.java | 8 +- .../caching/PostalAreaConverter.java | 2 +- .../converter/custom/MyCustomConverter.java | 4 +- .../converted/converter/custom/MyEntity.java | 8 +- ...lectionCompositeElementConversionTest.java | 20 +- ...ompositeElementExplicitConversionTest.java | 22 +- .../CollectionElementConversionTest.java | 18 +- ...llectionElementExplicitConversionTest.java | 24 +- .../ElementCollectionTests.java | 26 +- ...edAttributeConverterParameterTypeTest.java | 8 +- .../AttributeConverterOnSuperclassTest.java | 2 +- .../converter/literal/QueryLiteralTest.java | 20 +- .../converted/converter/lob/Address.java | 10 +- .../converter/lob/PostalAreaConverter.java | 2 +- .../converter/map/ColorTypeConverter.java | 6 +- .../map/MapElementConversionTest.java | 22 +- .../map/MapKeyAttributeConverterTest.java | 30 +- .../converter/map/MapKeyConversionTest.java | 14 +- .../mapping/converted/enums/EnumTypeTest.java | 6 +- .../enums/InvalidEnumeratedJavaTypeTest.java | 6 +- .../converted/enums/OrdinalEnumTypeTest.java | 10 +- .../mapping/formula/FormulaBasicsTest.java | 10 +- .../formula/FormulaNativeQueryTest.java | 8 +- .../test/mapping/formula/FormulaTests.java | 10 +- .../mapping/formula/FormulaWithAliasTest.java | 8 +- .../formula/FormulaWithColumnTypesTest.java | 16 +- .../formula/FormulaWithPartitionByTest.java | 6 +- .../ComplexValueGenerationBaselineTests.java | 6 +- .../ComplexValueGenerationTests.java | 8 +- .../CurrentTimestampAnnotationTests.java | 6 +- .../DefaultGeneratedValueIdentityTest.java | 10 +- .../generated/DefaultGeneratedValueTest.java | 8 +- .../generated/GeneratedAnnotationTests.java | 6 +- .../InDbGenerationsWithAnnotationsTests.java | 8 +- .../InVmGenerationsWithAnnotationsTests.java | 8 +- ...WithAnnotationsWithMixedSqlTypesTests.java | 8 +- ...ationsWithAnnotationsWithSqlDateTests.java | 8 +- ...nerationsWithMultipleAnnotationsTests.java | 8 +- .../SimpleValueGenerationBaselineTests.java | 6 +- .../temporals/GeneratedInstantTests.java | 6 +- .../temporals/GeneratedUuidTests.java | 8 +- .../MultipleGeneratedValuesTests.java | 6 +- .../temporals/ProposedGeneratedTests.java | 6 +- .../MappedSuperclassInheritanceTest.java | 6 +- ...appedSuperclassWithIdOnSubclassesTest.java | 6 +- .../OneToManyToInheritedTypeTest.java | 6 +- .../SingleTableInheritanceTests.java | 14 +- .../inheritance/discriminator/Address.java | 0 .../inheritance/discriminator/Customer.java | 0 .../DiscriminatorQueryUsageTests.java | 2 +- .../discriminator/DiscriminatorTest.java | 6 +- .../inheritance/discriminator/Employee.java | 0 .../discriminator/PartTimeEmployee.java | 0 .../inheritance/discriminator/Person.hbm.xml | 0 .../inheritance/discriminator/Person.java | 0 .../discriminator/SimpleInheritanceTest.java | 6 +- .../joined/DiscriminatorQueryUsageTests.java | 2 +- .../joined/JoinedInheritanceTest.java | 10 +- ...JoinedInheritanceWithConcreteRootTest.java | 10 +- ...eritanceWithExplicitDiscriminatorTest.java | 14 +- .../joined/MixedInheritanceTest.java | 14 +- .../tableperclass/MixedInheritanceTest.java | 14 +- ...rClassInheritanceWithAbstractRootTest.java | 8 +- ...rClassInheritanceWithConcreteRootTest.java | 8 +- .../collectioninitializer/Company.java | 4 +- .../collectioninitializer/CostCenter.java | 6 +- .../collectioninitializer/Offer.java | 8 +- .../lazytoone/collectioninitializer/User.java | 10 +- .../UserAuthorization.java | 6 +- .../ManyToManyBidirectionalTest.java | 10 +- .../ManyToManyHqlMemberOfQueryTest.java | 28 +- .../ManyToManyUnidirectionalFetchTest.java | 12 +- ...ManyToOneBidirectionalCircularityTest.java | 8 +- .../manytoone/ManyToOneBidirectionalTest.java | 6 +- .../manytoone/ManyToOneJoinTableTest.java | 14 +- .../test/mapping/manytoone/ManyToOneTest.java | 10 +- .../naturalid/BasicNaturalIdCachingTests.java | 6 +- .../naturalid/CompoundNaturalIdTests.java | 8 +- .../test/mapping/naturalid/cid/Account.java | 8 +- .../test/mapping/naturalid/cid/AccountId.java | 2 +- .../naturalid/composite/PostalCarrier.java | 6 +- .../naturalid/composite/PostalCode.java | 2 +- .../mapping/naturalid/compound/Country.java | 4 +- .../naturalid/compound/PostalCarrier.java | 8 +- .../mapping/naturalid/immutable/Child.java | 6 +- ...entityGeneratorWithNaturalIdCacheTest.java | 8 +- .../ImmutableManyToOneNaturalIdHbmTest.java | 2 +- .../immutable/ImmutableNaturalIdTest.java | 2 +- .../mapping/naturalid/immutable/Parent.java | 6 +- .../naturalid/immutableentity/Building.java | 6 +- .../MappedSuperclassOverrideTest.java | 8 +- .../naturalid/inheritance/Principal.java | 14 +- .../mapping/naturalid/inheritance/System.java | 4 +- .../mapping/naturalid/inheritance/User.java | 6 +- .../inheritance/cache/ExtendedEntity.java | 4 +- .../naturalid/inheritance/cache/MyEntity.java | 10 +- .../inheritance/spread/Principal.java | 12 +- .../naturalid/inheritance/spread/User.java | 4 +- ...turalIdInUninitializedAssociationTest.java | 10 +- .../NaturalIdInUninitializedProxyTest.java | 4 +- .../mutable/MutableNaturalIdTest.java | 0 .../mapping/naturalid/mutable/User.hbm.xml | 0 .../test/mapping/naturalid/mutable/User.java | 0 .../mapping/naturalid/mutable/cached/A.java | 14 +- .../naturalid/mutable/cached/AllCached.java | 6 +- .../naturalid/mutable/cached/Another.java | 6 +- .../mapping/naturalid/mutable/cached/B.java | 10 +- .../cached/CachedMutableNaturalIdTest.java | 0 .../naturalid/mutable/cached/SubClass.java | 2 +- .../test/mapping/naturalid/nullable/A.java | 10 +- .../test/mapping/naturalid/nullable/B.java | 6 +- .../test/mapping/naturalid/nullable/C.java | 4 +- .../test/mapping/naturalid/nullable/D.java | 6 +- .../onetomany/OneToManyBidirectionalTest.java | 10 +- .../OneToManyEmptyCollectionTest.java | 14 +- .../OneToManyHqlMemberOfQueryTest.java | 30 +- .../onetomany/OneToManySelfReferenceTest.java | 10 +- .../test/mapping/onetomany/OneToManyTest.java | 14 +- ...ntityWithBidirectionalAssociationTest.java | 8 +- ...BidirectionalJoinTableAssociationTest.java | 12 +- .../OneToOneJoinTableNonOptionalTest.java | 20 +- .../OneToOneJoinTableOptionalTest.java | 20 +- .../mapping/onetoone/OneToOneLazyTest.java | 8 +- .../OneToOneMapsIdChangeParentTest.java | 8 +- .../OneToOneMapsIdJoinColumnTest.java | 14 +- .../mapping/onetoone/OneToOneMapsIdTest.java | 10 +- .../onetoone/ToOneSelfReferenceTest.java | 6 +- .../test/mapping/onetoone/hhh9798/Item.java | 8 +- .../hhh9798/OneToOneJoinTableTest.java | 4 +- .../mapping/onetoone/hhh9798/Shipment.java | 18 +- .../mapping/onetoone/primarykey/Address.java | 6 +- .../mapping/onetoone/primarykey/Person.java | 10 +- .../test/mapping/quote/ColumnQuoteTest.java | 8 +- .../mapping/readwrite/ReadWriteEntity.java | 8 +- .../test/mapping/type/java/CoercionTests.java | 6 +- .../org/hibernate/orm/test/math/Math.hbm.xml | 0 .../hibernate/orm/test/metamodel/Address.java | 2 +- .../hibernate/orm/test/metamodel/Company.java | 8 +- .../orm/test/metamodel/LocalizedValue.java | 4 +- .../orm/test/metamodel/MetamodelTest.java | 8 +- .../hibernate/orm/test/metamodel/Person.java | 8 +- .../orm/test/metamodel/ProductEntity.java | 16 +- .../WildcardTypeAttributeMetaModelTest.java | 2 +- .../wildcardmodel/AbstractEntity.java | 12 +- .../wildcardmodel/AbstractOwner.java | 14 +- .../metamodel/wildcardmodel/EntityOne.java | 2 +- .../metamodel/wildcardmodel/OwnerOne.java | 2 +- .../NationalizedLobFieldTest.java | 8 +- .../nationalized/SimpleNationalizedTest.java | 6 +- .../nationalized/StringNationalizedTest.java | 8 +- .../UseNationalizedCharDataSettingTest.java | 10 +- .../NonPkManyToOneAssociationTest.java | 14 +- ...OptionalEagerInEmbeddableNotFoundTest.java | 28 +- .../OptionalEagerMappedByNotFoundTest.java | 16 +- .../notfound/OptionalEagerNotFoundTest.java | 26 +- .../OptionalEagerRefNonPKNotFoundTest.java | 26 +- .../notfound/OptionalLazyNotFoundTest.java | 28 +- .../notfound/RequiredLazyNotFoundTest.java | 28 +- .../hibernate/orm/test/ondelete/Address.java | 0 .../hibernate/orm/test/ondelete/Employee.java | 0 .../orm/test/ondelete/OnDeleteTest.java | 0 .../orm/test/ondelete/Person.hbm.xml | 0 .../hibernate/orm/test/ondelete/Person.java | 0 .../orm/test/ondelete/Salesperson.java | 0 .../ondelete/toone/ToOneOnDeleteTest.java | 10 +- .../orm/test/ondemandload/Inventory.java | 10 +- .../orm/test/ondemandload/Product.java | 6 +- .../orm/test/ondemandload/Store.java | 14 +- .../cache/CacheLazyLoadNoTransTest.java | 20 +- .../OneToManyDuplicateInsertionTest.java | 12 +- .../onetomany/inheritance/joined/Book.java | 6 +- .../onetomany/inheritance/joined/Library.java | 14 +- .../onetomany/inheritance/joined/Product.java | 14 +- .../onetomany/inheritance/perclass/Book.java | 6 +- .../inheritance/perclass/Library.java | 14 +- .../inheritance/perclass/Product.java | 14 +- .../onetomany/inheritance/single/Book.java | 4 +- .../onetomany/inheritance/single/Library.java | 14 +- .../onetomany/inheritance/single/Product.java | 14 +- .../orm/test/onetoone/basic/Child.java | 8 +- .../orm/test/onetoone/basic/Parent.java | 8 +- .../BiDirectionalOneToOneFetchTest.java | 12 +- .../OneToOneCacheEnableSelectingTest.java | 16 +- .../orm/test/onetoone/formula/Address.java | 0 .../onetoone/formula/OneToOneFormulaTest.java | 10 +- .../orm/test/onetoone/formula/Person.hbm.xml | 0 .../orm/test/onetoone/formula/Person.java | 0 .../orm/test/onetoone/joined/Address.java | 0 .../orm/test/onetoone/joined/Entity.java | 0 .../joined/JoinedSubclassOneToOneTest.java | 0 .../orm/test/onetoone/joined/Org.java | 0 .../orm/test/onetoone/joined/Person.hbm.xml | 0 .../orm/test/onetoone/joined/Person.java | 0 .../onetoone/jointable/ABlockableEntity.java | 30 +- .../orm/test/onetoone/jointable/Event.java | 6 +- .../orm/test/onetoone/jointable/Message.java | 6 +- .../test/onetoone/jointable/OtherEntity.java | 6 +- .../orm/test/onetoone/lazy/LazyToOneTest.java | 20 +- .../orm/test/onetoone/link/Customer.java | 0 .../orm/test/onetoone/link/Employee.java | 0 .../test/onetoone/link/OneToOneLinkTest.java | 0 .../orm/test/onetoone/link/Person.hbm.xml | 0 .../orm/test/onetoone/link/Person.java | 0 .../BidirectionalOptionalOneToOneTest.java | 12 +- .../test/onetoone/singletable/Address.java | 0 .../DiscrimSubclassOneToOneTest.java | 0 .../orm/test/onetoone/singletable/Entity.java | 0 .../orm/test/onetoone/singletable/Org.java | 0 .../test/onetoone/singletable/Person.hbm.xml | 0 .../orm/test/onetoone/singletable/Person.java | 0 .../hibernate/orm/test/ops/CreateTest.java | 2 +- .../ops/MergeManagedAndCopiesAllowedTest.java | 16 +- .../MergeMultipleEntityCopiesAllowedTest.java | 2 +- .../org/hibernate/orm/test/ops/MergeTest.java | 8 +- .../org/hibernate/orm/test/ops/Node.hbm.xml | 0 .../java/org/hibernate/orm/test/ops/Node.java | 0 .../hibernate/orm/test/ops/NumberedNode.java | 0 .../orm/test/ops/OneToOneMergeTest.java | 20 +- .../orm/test/ops/RemoveOrderingTest.java | 12 +- .../orm/test/ops/SaveOrUpdateTest.java | 6 +- .../hibernate/orm/test/ops/SimpleOpsTest.java | 0 .../genericApi/BasicGetLoadAccessTest.java | 8 +- .../genericApi/ProxiedGetLoadAccessTest.java | 8 +- .../orm/test/optlock/Document.hbm.xml | 0 .../hibernate/orm/test/optlock/Document.java | 0 .../orm/test/optlock/OptimisticLockTest.java | 2 +- ...cLockWithGloballyQuotedIdentifierTest.java | 8 +- .../OptimisticLockWithQuotedVersionTest.java | 10 +- .../orm/test/optlock/PublicationDate.java | 0 .../orm/test/orderby/OrderByTest.java | 8 +- .../orm/test/ordered/HqlOrderByIdsTest.java | 4 +- .../orm/test/ordered/OrderByTest.java | 6 +- .../hibernate/orm/test/ordered/Search.hbm.xml | 0 .../hibernate/orm/test/ordered/Search.java | 0 .../UseReservedKeywordInOrderByTest.java | 8 +- .../hibernate/orm/test/orphan/OrphanTest.java | 0 .../org/hibernate/orm/test/orphan/Part.java | 0 .../hibernate/orm/test/orphan/Product.hbm.xml | 0 .../hibernate/orm/test/orphan/Product.java | 0 .../elementcollection/EnrollableClass.java | 8 +- .../manytomany/ManyToManyOrphanTest.java | 198 ++--- ...oOneEagerNonOptionalOrphanRemovalTest.java | 6 +- .../OneToOneEagerOrphanRemovalTest.java | 8 +- ...ToOneLazyNonOptionalOrphanRemovalTest.java | 8 +- .../OneToOneLazyOrphanRemovalTest.java | 8 +- .../OneToOneProxyOrphanRemovalTest.java | 14 +- .../multilevelcascade/Preisregelung.java | 12 +- .../multilevelcascade/Tranche.java | 2 +- .../multilevelcascade/Tranchenmodell.java | 2 +- .../fk/bidirectional/multilevelcascade/X.java | 10 +- .../fk/bidirectional/multilevelcascade/Y.java | 10 +- .../multilevelcascade/Preisregelung.java | 10 +- .../multilevelcascade/Tranche.java | 8 +- .../multilevelcascade/Tranchenmodell.java | 12 +- .../orm/test/orphan/onetomany/Feature.java | 12 +- .../orm/test/orphan/onetomany/Product.java | 12 +- .../test/pagination/OraclePaginationTest.java | 16 +- .../orm/test/pagination/PaginationTest.java | 6 +- .../orm/test/pagination/hhh9965/Product.java | 6 +- .../orm/test/pagination/hhh9965/Shop.java | 2 +- ...AbstractSchemaSubstitutionFormulaTest.java | 12 +- .../CustomSqlSchemaResolvingIdentityTest.java | 10 +- .../entity/CustomSqlSchemaResolvingTest.java | 6 +- .../entity/JoinFormulaImplicitJoinTest.java | 16 +- .../internal/ProcedureCallImplTest.java | 2 +- .../property/GetAndIsVariantGetterTest.java | 10 +- ...iantGetterWithTransientAnnotationTest.java | 8 +- .../org/hibernate/orm/test/property/Item.java | 4 +- .../hibernate/orm/test/property/Order.java | 10 +- .../orm/test/propertyref/DoesNotWork.java | 16 +- .../orm/test/propertyref/DoesNotWorkPk.java | 4 +- .../propertyref/basic/PropertyRefTest.java | 4 +- .../orm/test/proxy/FinalGetterSetterTest.java | 8 +- .../orm/test/proxy/HibernateUnproxyTest.java | 12 +- .../proxy/ProxyReferenceEqualityTest.java | 10 +- .../orm/test/proxy/narrow/AbstractEntity.java | 6 +- .../orm/test/proxy/narrow/ConcreteEntity.java | 2 +- .../narrow/LazyAbstractEntityReference.java | 10 +- .../orm/test/query/AddNamedQueryTest.java | 8 +- .../orm/test/query/QueryTimeOutTest.java | 6 +- .../criteria/BasicCriteriaExecutionTests.java | 6 +- .../criteria/CriteriaParameterTests.java | 10 +- .../CriteriaStringInlineLiteralTest.java | 14 +- .../query/criteria/internal/HHH13884Test.java | 3 +- .../SearchedCaseExpressionTest.java | 22 +- .../query/criteria/internal/hhh11877/Foo.java | 10 +- .../internal/hhh11877/HHH111877Test.java | 8 +- .../internal/hhh13058/HHH13058Test.java | 12 +- .../criteria/internal/hhh13058/Patient.java | 12 +- .../criteria/internal/hhh13058/Site.java | 8 +- .../criteria/internal/hhh13058/Task.java | 12 +- .../internal/hhh13151/SideEntity.java | 6 +- .../criteria/internal/hhh13151/SubEntity.java | 4 +- .../internal/hhh13151/SuperEntity.java | 6 +- .../hhh13151/TreatedEntityFetchTest.java | 6 +- .../query/criteria/internal/hhh13908/Foo.java | 6 +- .../internal/hhh13908/HHH13908Test.java | 6 +- .../internal/hhh14197/AbstractPersistent.java | 10 +- .../internal/hhh14197/Department.java | 4 +- .../criteria/internal/hhh14197/Employee.java | 20 +- .../internal/hhh14197/HHH14197Test.java | 11 +- .../AggregateFunctionsWithSubSelectTest.java | 14 +- .../test/query/hql/AttributePathTests.java | 4 +- .../orm/test/query/hql/CaseStatementTest.java | 4 +- .../orm/test/query/hql/CastFunctionTest.java | 4 +- .../hql/CastNullSelectExpressionTest.java | 8 +- .../test/query/hql/CountExpressionTest.java | 14 +- .../query/hql/DateQueryParameterTest.java | 6 +- .../query/hql/EmbeddableAsParameterTest.java | 8 +- .../EmbeddableWithPluralAttributeTest.java | 10 +- .../orm/test/query/hql/EmbeddedIdTest.java | 10 +- .../orm/test/query/hql/EntityJoinTest.java | 12 +- ...veElementCollectionAndAssociationTest.java | 18 +- .../orm/test/query/hql/GroupByTest.java | 4 +- .../orm/test/query/hql/ILikeCriteriaTest.java | 4 +- .../query/hql/InsertWithSubSelectTest.java | 6 +- .../test/query/hql/IsEmptyPredicateTest.java | 6 +- .../orm/test/query/hql/JoinOrderTest.java | 6 +- .../test/query/hql/NamedHqlQueriesTest.java | 4 +- .../orm/test/query/hql/ParameterTests.java | 14 +- .../QueryParametersValidationArrayTest.java | 10 +- .../hql/QueryParametersValidationTest.java | 8 +- .../orm/test/query/hql/ScrollableTest.java | 8 +- .../query/hql/SizeAttributeReferenceTest.java | 12 +- .../query/hql/WithClauseJoinRewriteTest.java | 22 +- .../UpdateEntityWithEmbeddedTest.java | 8 +- .../hql/nullPrecedence/ExampleEntity.java | 6 +- .../test/query/hql/set/SetOperationTest.java | 2 +- .../query/hql/size/ManyToManySizeTest.java | 10 +- .../query/hql/size/ManyToManySizeTest2.java | 16 +- .../query/hql/size/OneToManySizeTest.java | 12 +- .../orm/test/query/hql/size/Skill.java | 10 +- .../orm/test/query/hql/size/Student.java | 12 +- .../orm/test/query/hql/size/Teacher.java | 12 +- .../treat/DiscriminatedTreatSmokeTesting.java | 16 +- .../DiscriminatedTreatSqmSmokeTesting.java | 14 +- .../hql/treat/JoinedTreatSmokeTesting.java | 14 +- .../hql/treat/PerClassTreatSmokeTesting.java | 14 +- .../simple/SimpleEntityWithNamedQueries.java | 6 +- .../named/simple/SimpleNamedQueryTests.java | 2 +- .../query/resultcache/AggregateEntity.java | 8 +- .../test/query/resultcache/TestEntity.java | 8 +- .../resultmapping/DiscriminatedRoot.java | 24 +- .../resultmapping/DiscriminatedSubType1.java | 6 +- .../resultmapping/DiscriminatedSubType2.java | 6 +- .../resultmapping/EntityWithEmbedded.java | 20 +- .../SimpleEntityWithNamedMappings.java | 18 +- .../results/BasicCriteriaResultTests.java | 12 +- .../query/results/BasicHqlResultTests.java | 2 +- .../test/query/results/SimpleComposite.java | 2 +- .../orm/test/query/results/SimpleEntity.java | 8 +- .../test/query/returns/ResultListTest.java | 4 +- .../query/returns/ScrollableResultsTests.java | 4 +- .../query/sql/NativeQueryParameterTests.java | 2 +- .../query/sql/SynchronizedSpaceTests.java | 20 +- .../sqm/domain/CrazyHqlKeywordEntity.java | 4 +- .../orm/test/query/sqm/domain/Person.java | 14 +- .../SubQueryImplicitJoinReferenceTest.java | 10 +- .../sqm/param/CompositeParameterTests.java | 12 +- .../orm/test/querycache/CompositeKey.java | 110 +-- .../querycache/EntityWithCompositeKey.java | 50 +- .../EntityWithStringCompositeKey.java | 58 +- .../orm/test/querycache/Item.hbm.xml | 0 .../hibernate/orm/test/querycache/Item.java | 0 .../querycache/QueryCacheJoinFetchTest.java | 14 +- .../test/querycache/StringCompositeKey.java | 130 ++-- .../querycache/StructuredQueryCacheTest.java | 20 +- .../quote/ColumnDefinitionQuotingTest.java | 10 +- .../org/hibernate/orm/test/quote/House.java | 6 +- .../org/hibernate/orm/test/quote/Person.java | 10 +- .../org/hibernate/orm/test/quote/Phone.java | 8 +- .../hibernate/orm/test/quote/QuoteTest.java | 22 +- .../org/hibernate/orm/test/quote/Role.java | 10 +- .../test/quote/TableGeneratorQuotingTest.java | 10 +- .../org/hibernate/orm/test/quote/User.java | 22 +- .../orm/test/refresh/TestEntity.java | 6 +- .../common/SynchronizationCollectorImpl.java | 4 +- .../common/SynchronizationErrorImpl.java | 2 +- ...chronizationRegistryStandardImplTests.java | 4 +- .../AbstractSkipAutoCommitTest.java | 4 +- .../jta/AbstractBasicJtaTestScenarios.java | 6 +- ...mplianceAlreadyStartedTransactionTest.java | 4 +- .../jta/JtaPlatformInaccessibleImpl.java | 12 +- .../jta/JtaPlatformStandardTestingImpl.java | 10 +- ...mplianceAlreadyStartedTransactionTest.java | 10 +- .../hibernate/orm/test/rowid/RowIdTest.java | 8 +- .../test/schemafilter/CatalogFilterTest.java | 14 +- .../test/schemafilter/SchemaFilterTest.java | 14 +- .../test/schemafilter/SequenceFilterTest.java | 14 +- .../AlterTableQuoteDefaultSchemaTest.java | 6 +- .../AlterTableQuoteSpecifiedSchemaTest.java | 6 +- .../test/schemaupdate/ColumnNamesTest.java | 8 +- .../schemaupdate/ConnectionsReleaseTest.java | 6 +- ...hemaMigrationTargetScriptCreationTest.java | 8 +- .../schemaupdate/Hbm2ddlCreateOnlyTest.java | 2 +- .../ImplicitCompositeKeyJoinTest.java | 12 +- .../orm/test/schemaupdate/MigrationTest.java | 8 +- .../MixedFieldPropertyAnnotationTest.java | 8 +- .../PostgreSQLMultipleSchemaSequenceTest.java | 12 +- .../QuotedTableNameSchemaUpdateTest.java | 6 +- .../SchemaCreationToOutputScriptTest.java | 4 +- .../orm/test/schemaupdate/SchemaDropTest.java | 8 +- .../SchemaDropToOutputScriptTest.java | 4 +- ...erverWithSequenceDefaultSchemaCatalog.java | 11 +- .../test/schemaupdate/SchemaExportTest.java | 2 +- ...emaExportWithGlobalQuotingEnabledTest.java | 8 +- ...SchemaExportWithIndexAndDefaultSchema.java | 8 +- ...hemaMigrationTargetScriptCreationTest.java | 6 +- .../SchemaMigrationToOutputScriptTest.java | 4 +- .../SchemaMigratorHaltOnErrorTest.java | 4 +- .../SchemaUpdateDelimiterTest.java | 6 +- .../SchemaUpdateFormatterTest.java | 6 +- ...emaUpdateGeneratingOnlyScriptFileTest.java | 6 +- .../SchemaUpdateHaltOnErrorTest.java | 6 +- ...nColumnNoConstraintSecondaryTableTest.java | 14 +- ...ColumnNoConstraintSecondaryTablesTest.java | 12 +- ...chemaUpdateJoinColumnNoConstraintTest.java | 12 +- .../SchemaUpdateProceedOnErrorTest.java | 4 +- .../SchemaUpdateSQLServerTest.java | 32 +- .../SchemaUpdateSchemaNameTest.java | 8 +- .../test/schemaupdate/SchemaUpdateTest.java | 30 +- .../SchemaUpdateWithFunctionIndexTest.java | 10 +- ...faultsSettingToFalseAndQuotedNameTest.java | 6 +- ...dbcMetadataDefaultsSettingToFalseTest.java | 4 +- .../SchemaUpdateWithViewsTest.java | 8 +- .../schemaupdate/SequenceReadingTest.java | 6 +- .../SqlServerQuoteSchemaTest.java | 6 +- .../test/schemaupdate/TableCommentTest.java | 6 +- .../orm/test/schemaupdate/TestFkUpdating.java | 10 +- .../derivedid/ColumnLengthTest.java | 18 +- .../schemaupdate/foreignkeys/Employee.java | 16 +- .../foreignkeys/ForeignKeyDropTest.java | 10 +- .../foreignkeys/ForeignKeyMigrationTest.java | 10 +- .../test/schemaupdate/foreignkeys/Group.java | 8 +- .../JoinedInheritanceForeignKeyTest.java | 20 +- .../test/schemaupdate/foreignkeys/Person.java | 18 +- .../test/schemaupdate/foreignkeys/Phone.java | 6 +- .../schemaupdate/foreignkeys/Project.java | 10 +- ...dateWithKeywordAutoQuotingEnabledTest.java | 12 +- .../test/schemaupdate/foreignkeys/User.java | 18 +- .../schemaupdate/foreignkeys/UserSetting.java | 16 +- .../crossschema/SchemaOneEntity.java | 6 +- .../crossschema/SchemaTwoEntity.java | 10 +- .../ForeignKeyDefinitionManyToOneTest.java | 10 +- ...gnKeyDefinitionOneToManyJoinTableTest.java | 12 +- .../ForeignKeyDefinitionOneToOneTest.java | 10 +- ...oreignKeyDefinitionSecondaryTableTest.java | 14 +- .../idgenerator/SequenceGenerationTest.java | 12 +- .../idgenerator/SequenceGeneratorsTest.java | 14 +- .../idgenerator/TableGeneratorTest.java | 12 +- .../idgenerator/TableGeneratorsTest.java | 14 +- .../index/ComponentIndexTest.java | 8 +- .../index/IndexesCreationTest.java | 10 +- .../inheritance/hhh_x/GroupStep.java | 6 +- .../schemaupdate/inheritance/hhh_x/Step.java | 20 +- .../inheritance/tableperclass/Category.java | 4 +- .../inheritance/tableperclass/Element.java | 12 +- .../JoinTableWithDefaultSchemaTest.java | 12 +- .../LongVarcharValidationTest.java | 6 +- .../NumericValidationTest.java | 6 +- .../SynonymValidationTest.java | 10 +- .../schemavalidation/ViewValidationTest.java | 10 +- .../TableNamesWithUnderscoreTest.java | 8 +- .../orm/test/secure/JaccIntegratorTest.java | 10 +- .../EntityProxySerializationTest.java | 14 +- .../service/ClassLoaderServiceImplTest.java | 2 +- .../AssociateEntityWithTwoSessionsTest.java | 10 +- .../SessionWithSharedConnectionTest.java | 4 +- .../hibernate/orm/test/sorted/SortTest.java | 18 +- .../test/sorted/map/SortComparatorTest.java | 16 +- .../orm/test/sorted/map/SortNaturalTest.java | 16 +- .../test/sorted/set/SortComparatorTest.java | 14 +- .../orm/test/sorted/set/SortNaturalTest.java | 14 +- .../orm/test/sql/ast/SmokeTests.java | 2 +- .../orm/test/sql/autodiscovery/Group.java | 10 +- .../test/sql/autodiscovery/Membership.java | 10 +- .../orm/test/sql/autodiscovery/User.java | 10 +- .../sql/exec/EmbeddedWithManyToOneTest.java | 10 +- .../orm/test/sql/exec/SmokeTests.java | 14 +- .../sql/exec/manytoone/ManyToOneTest.java | 14 +- .../OneToOneWithDerivedIdentityTest.java | 8 +- ...ssociationsOneOfWhichIsAJoinTableTest.java | 12 +- .../EntityWithBidirectionalOneToOneTest.java | 8 +- ...BidirectionalJoinTableAssociationTest.java | 12 +- ...ionalAssociationsOneWithJoinTableTest.java | 12 +- .../test/sql/function/JpaFunctionTest.java | 6 +- .../sql/hand/query/NativeSQLQueriesTest.java | 2 +- .../internal/EmbeddableFetchImplTests.java | 12 +- .../test/sql/storedproc/H2ProcTesting.java | 19 +- .../PostgresRefCursorSupportTest.java | 12 +- .../StoredProcedureResultSetMappingTest.java | 16 +- .../NativeQuerySyncSpaceCachingTest.java | 8 +- .../QueryPlanCacheStatisticsTest.java | 16 +- .../orm/test/stateless/Document.hbm.xml | 0 .../orm/test/stateless/Document.java | 0 .../test/stateless/StatelessDoWorkTest.java | 8 +- .../StatelessSessionConnectionTest.java | 4 +- ...StatelessSessionNativeQueryInsertTest.java | 8 +- ...StatelessSessionPersistentContextTest.java | 12 +- .../test/stateless/StatelessSessionTest.java | 4 +- .../orm/test/stateless/fetching/Producer.java | 8 +- .../orm/test/stateless/fetching/Product.java | 8 +- .../orm/test/stateless/fetching/Vendor.java | 8 +- .../test/tm/InterceptorTransactionTest.java | 8 +- .../orm/test/tm/JtaAfterCompletionTest.java | 12 +- .../tm/JtaBeforeCompletionFailureTest.java | 12 +- .../orm/test/tm/TransactionTimeoutTest.java | 2 +- .../schema/DropSchemaDuringJtaTxnTest.java | 6 +- ...allySchemaValidatorImplConnectionTest.java | 6 +- .../IndividuallySchemaValidatorImplTest.java | 8 +- .../tool/schema/JtaPlatformLoggingTest.java | 6 +- .../SchemaToolTransactionHandlingTest.java | 10 +- .../contributor/ArrayTypeContributorTest.java | 4 +- .../contributor/ArrayTypePropertiesTest.java | 4 +- .../orm/test/typedescriptor/Issue.java | 8 +- .../typedescriptor/VariousTypesEntity.java | 4 +- .../orm/test/unconstrained/Employee.java | 0 .../orm/test/unconstrained/Person.hbm.xml | 0 .../orm/test/unconstrained/Person.java | 0 .../test/unconstrained/UnconstrainedTest.java | 8 +- .../org/hibernate/orm/test/unidir/Child1.java | 2 +- .../org/hibernate/orm/test/unidir/Child2.java | 2 +- .../hibernate/orm/test/unidir/Parent1.java | 8 +- ...rectionalOneToManyNonPkJoinColumnTest.java | 12 +- .../test/unionsubclass/UnionSubclassTest.java | 8 +- .../orm/test/unionsubclass2/Address.java | 0 .../orm/test/unionsubclass2/Customer.java | 0 .../orm/test/unionsubclass2/Employee.java | 0 .../orm/test/unionsubclass2/Person.hbm.xml | 0 .../orm/test/unionsubclass2/Person.java | 0 .../unionsubclass2/UnionSubclassTest.java | 6 +- .../unionsubclass3/UnionSubclassTest.java | 12 +- .../hibernate/orm/test/util/SchemaUtil.java | 2 +- .../orm/test/version/InstantVersionTest.java | 8 +- .../version/LocalDateTimeVersionTest.java | 8 +- .../version/OffsetDateTimeVersionTest.java | 8 +- .../hibernate/orm/test/version/Person.java | 0 .../orm/test/version/PersonThing.hbm.xml | 0 .../org/hibernate/orm/test/version/Task.java | 0 .../org/hibernate/orm/test/version/Thing.java | 0 .../orm/test/version/VersionTest.java | 6 +- .../version/ZonedDateTimeVersionTest.java | 8 +- .../mappedsuperclass/AbstractEntity.java | 2 +- ...appingMappedSuperclassWithVersionTest.java | 6 +- ...aseTimestampComparisonAnnotationsTest.java | 10 +- .../sybase/SybaseTimestampVersioningTest.java | 2 +- .../EagerManyToOneFetchModeJoinWhereTest.java | 20 +- ...agerManyToOneFetchModeSelectWhereTest.java | 20 +- ...EagerToManyWhereDontUseClassWhereTest.java | 18 +- .../annotations/EagerToManyWhereTest.java | 18 +- .../EagerToManyWhereUseClassWhereTest.java | 18 +- ...ntCollectionBasicNonUniqueIdWhereTest.java | 14 +- ...WithLazyManyToOneNonUniqueIdWhereTest.java | 24 +- .../LazyManyToManyNonUniqueIdWhereTest.java | 14 +- .../LazyOneToManyNonUniqueIdWhereTest.java | 12 +- .../LazyToManyWhereDontUseClassWhereTest.java | 18 +- .../annotations/LazyToManyWhereTest.java | 18 +- .../LazyToManyWhereUseClassWhereTest.java | 18 +- .../orm/test/where/hbm/WhereTest.java | 8 +- .../InClauseParameterPaddingCriteriaTest.java | 14 +- .../query/InClauseParameterPaddingTest.java | 4 +- ...esentationLiteralParsingExceptionTest.java | 4 +- .../MaxInExpressionParameterPaddingTest.java | 4 +- .../query/NativeQueryWithParenthesesTest.java | 6 +- .../AnnotationMappingJoinClassTest.java | 36 +- .../query/hhh13670/HHH13670Test.java | 22 +- .../query/hhh13712/HHH13712Test.java | 22 +- .../query/hhh14112/HHH14112Test.java | 14 +- .../query/hhh14116/HHH14116Test.java | 22 +- .../query/hhh14154/HHH14154Test.java | 14 +- .../query/hhh14156/HHH14156Test.java | 8 +- .../QueryPlanCacheStatisticsTest.java | 10 +- .../org/hibernate/test/annotations/A320.java | 4 +- .../org/hibernate/test/annotations/A320b.java | 2 +- .../test/annotations/AmericaCupClass.java | 8 +- .../org/hibernate/test/annotations/Boat.java | 12 +- .../hibernate/test/annotations/Country.java | 6 +- .../hibernate/test/annotations/Customer.java | 18 +- .../hibernate/test/annotations/Discount.java | 16 +- .../org/hibernate/test/annotations/Ferry.java | 2 +- .../test/annotations/FlyingObject.java | 6 +- .../test/annotations/IncorrectEntity.java | 2 +- .../hibernate/test/annotations/Passport.java | 8 +- .../org/hibernate/test/annotations/Plane.java | 24 +- .../org/hibernate/test/annotations/Port.java | 8 +- .../org/hibernate/test/annotations/Thing.java | 2 +- .../hibernate/test/annotations/Ticket.java | 8 +- .../annotations/dataTypes/SomeEntity.java | 24 +- .../dataTypes/SomeOtherEntity.java | 14 +- .../derivedidentities/Dependent.java | 8 +- .../derivedidentities/DependentId.java | 2 +- .../derivedidentities/Employee.java | 6 +- .../derivedidentities/Employer.java | 8 +- .../derivedidentities/MedicalHistory.java | 10 +- .../annotations/derivedidentities/Person.java | 4 +- .../derivedidentities/bidirectional/Bar.java | 8 +- .../CompositeIdDerivedIdWithIdClassTest.java | 16 +- .../bidirectional/Dependent.java | 6 +- .../bidirectional/Employee.java | 8 +- .../derivedidentities/bidirectional/Foo.java | 10 +- ...yToOneEagerDerivedIdFetchModeJoinTest.java | 14 +- ...oOneEagerDerivedIdFetchModeSelectTest.java | 14 +- ...ToOneLazyDerivedIdFetchModeSelectTest.java | 14 +- .../bidirectional/Order.java | 14 +- .../bidirectional/OrderLine.java | 12 +- .../bidirectional/Person.java | 166 ++-- .../bidirectional/PersonInfo.java | 132 ++-- .../bidirectional/Product.java | 10 +- .../derivedidentities/e1/a/Dependent.java | 12 +- .../derivedidentities/e1/a/Employee.java | 4 +- .../derivedidentities/e1/b2/Customer.java | 24 +- .../e1/b2/CustomerInventory.java | 28 +- .../e1/b2/CustomerInventoryPK.java | 0 .../IdClassGeneratedValueManyToOneTest.java | 0 .../derivedidentities/e1/b2/Item.java | 14 +- .../derivedidentities/e2/a/Dependent.java | 14 +- .../derivedidentities/e2/a/DependentId.java | 2 +- .../derivedidentities/e2/a/Employee.java | 6 +- .../derivedidentities/e2/b/Dependent.java | 12 +- .../derivedidentities/e2/b/DependentId.java | 2 +- .../derivedidentities/e2/b/Employee.java | 6 +- .../derivedidentities/e3/a/Dependent.java | 16 +- .../derivedidentities/e3/a/Employee.java | 4 +- .../derivedidentities/e3/b/Dependent.java | 18 +- .../derivedidentities/e3/b/DependentId.java | 2 +- .../derivedidentities/e3/b/Employee.java | 4 +- .../derivedidentities/e3/b/EmployeeId.java | 2 +- .../derivedidentities/e3/b2/Dependent.java | 10 +- .../derivedidentities/e3/b2/DependentId.java | 2 +- .../derivedidentities/e3/b2/Employee.java | 4 +- .../derivedidentities/e3/b2/EmployeeId.java | 4 +- .../derivedidentities/e3/b2/Policy.java | 10 +- .../derivedidentities/e3/b2/PolicyId.java | 4 +- .../derivedidentities/e3/b3/Dependent.java | 2 +- .../derivedidentities/e3/b3/DependentId.java | 4 +- .../derivedidentities/e3/b3/Employee.java | 4 +- .../derivedidentities/e3/b3/EmployeeId.java | 4 +- .../derivedidentities/e3/b3/Policy.java | 2 +- .../derivedidentities/e3/b3/PolicyId.java | 4 +- .../e4/a/FinancialHistory.java | 10 +- .../e4/a/MedicalHistory.java | 12 +- .../derivedidentities/e4/a/Person.java | 4 +- .../derivedidentities/e4/a/Simple.java | 4 +- ...ParentSimpleDepSecondPassOrderingTest.java | 8 +- .../e5/a/MedicalHistory.java | 12 +- .../derivedidentities/e5/a/Person.java | 6 +- .../e5/b/MedicalHistory.java | 12 +- .../derivedidentities/e5/b/Person.java | 6 +- .../e6/a/MedicalHistory.java | 12 +- .../derivedidentities/e6/a/Person.java | 4 +- .../derivedidentities/e6/a/PersonId.java | 2 +- .../e6/b/MedicalHistory.java | 12 +- .../derivedidentities/e6/b/Person.java | 4 +- .../derivedidentities/e6/b/PersonId.java | 2 +- ...oOneEagerDerivedIdFetchModeSelectTest.java | 12 +- ...ToOneLazyDerivedIdFetchModeSelectTest.java | 12 +- .../embeddables/EmbeddableIntegratorTest.java | 2 +- .../annotations/embeddables/Investment.java | 94 +-- .../annotations/embeddables/Investor.java | 8 +- ...AttributeOverrideEnhancedUserTypeTest.java | 16 +- .../manytoonewithformula/Company.java | 10 +- .../manytoonewithformula/Contract.java | 12 +- .../manytoonewithformula/ContractId.java | 4 +- .../manytoonewithformula/FoodItem.java | 10 +- .../manytoonewithformula/Language.java | 8 +- .../manytoonewithformula/Manufacturer.java | 8 +- .../manytoonewithformula/ManufacturerId.java | 4 +- .../ManyToOneWithFormulaTest.java | 4 +- .../manytoonewithformula/Menu.java | 8 +- .../manytoonewithformula/Message.java | 10 +- .../manytoonewithformula/Model.java | 6 +- .../manytoonewithformula/ModelId.java | 4 +- .../manytoonewithformula/Person.java | 8 +- .../manytoonewithformula/Product.java | 10 +- .../ProductSqlServer.java | 10 +- .../notfound/NotFoundLogicalOneToOneTest.java | 16 +- ...neToOneNonInsertableNonUpdateableTest.java | 10 +- .../annotations/notfound/NotFoundTest.java | 10 +- .../notfound/OneToOneNotFoundTest.java | 18 +- .../test/annotations/polymorphism/Car.java | 14 +- .../polymorphism/MarketRegion.java | 8 +- .../annotations/polymorphism/SportCar.java | 4 +- .../test/annotations/query/AllTables.java | 14 +- .../test/annotations/query/Area.java | 26 +- .../test/annotations/query/Attrset.java | 86 +-- .../test/annotations/query/Attrvalue.java | 72 +- .../test/annotations/query/Captain.java | 16 +- .../annotations/query/CasimirParticle.java | 6 +- .../test/annotations/query/Chaos.java | 14 +- .../test/annotations/query/Darkness.java | 2 +- .../test/annotations/query/Dictionary.java | 20 +- .../test/annotations/query/Dimensions.java | 2 +- .../test/annotations/query/Employee.java | 100 +-- .../test/annotations/query/Employeegroup.java | 110 +-- .../test/annotations/query/Mark.java | 12 +- .../annotations/query/NamedQueryTest.java | 16 +- .../test/annotations/query/Night.java | 12 +- ...yListParametersWithFetchSubSelectTest.java | 12 +- .../test/annotations/query/SpaceShip.java | 22 +- .../query/SynonymousDictionary.java | 4 +- .../test/annotations/query/Twilight.java | 6 +- .../annotations/referencedcolumnname/Bag.java | 12 +- .../referencedcolumnname/Clothes.java | 8 +- .../referencedcolumnname/House.java | 16 +- .../referencedcolumnname/HousePlaces.java | 14 +- .../referencedcolumnname/Inhabitant.java | 8 +- .../referencedcolumnname/Item.java | 4 +- .../referencedcolumnname/ItemCost.java | 6 +- .../referencedcolumnname/Luggage.java | 16 +- .../referencedcolumnname/Place.java | 8 +- .../referencedcolumnname/Places.java | 10 +- .../referencedcolumnname/Postman.java | 4 +- .../referencedcolumnname/Rambler.java | 12 +- .../ReferencedColumnNameTest.java | 8 +- .../referencedcolumnname/Vendor.java | 4 +- .../referencedcolumnname/WarehouseItem.java | 10 +- .../hibernate/test/annotations/type/Dvd.java | 8 +- .../dynamicparameterized/AbstractEntity.java | 10 +- .../type/dynamicparameterized/Entity1.java | 10 +- .../type/dynamicparameterized/Entity2.java | 10 +- .../uniqueconstraint/Building.java | 4 +- .../annotations/uniqueconstraint/House.java | 12 +- ...ySQLDropConstraintThrowsExceptionTest.java | 14 +- .../annotations/uniqueconstraint/Room.java | 6 +- .../UniqueConstraintBatchingTest.java | 2 +- .../test/annotations/various/Antenna.java | 6 +- .../test/annotations/various/Conductor.java | 10 +- .../annotations/various/DBTimestamped.java | 8 +- .../various/ProfessionalAgreement.java | 6 +- .../test/annotations/various/Truck.java | 6 +- .../annotations/various/VMTimestamped.java | 8 +- .../test/annotations/various/Vehicule.java | 16 +- .../test/annotations/xml/hbm/AImpl.java | 14 +- .../test/annotations/xml/hbm/BImpl.java | 4 +- .../annotations/xml/hbm/PrimeMinister.java | 10 +- .../test/annotations/xml/hbm/Sky.java | 10 +- .../test/annotations/xml/hbm/ZImpl.java | 20 +- .../java/org/hibernate/test/batchfetch/A.java | 10 +- .../java/org/hibernate/test/batchfetch/B.java | 6 +- .../batchfetch/BatchFetchBootstrapTest.java | 12 +- ...chFetchNotFoundIgnoreDefaultStyleTest.java | 12 +- .../BatchFetchReferencedColumnNameTest.java | 18 +- .../batchfetch/BatchFetchRefreshTest.java | 16 +- .../test/batchfetch/BatchFetchTest.java | 0 .../test/batchfetch/BatchLoadableEntity.java | 4 +- .../org/hibernate/test/batchfetch/City.java | 18 +- .../hibernate/test/batchfetch/Country.java | 14 +- .../org/hibernate/test/batchfetch/Model.java | 0 .../test/batchfetch/ProductLine.hbm.xml | 0 .../test/batchfetch/ProductLine.java | 0 .../basic/FinalFieldEnhancementTest.java | 12 +- .../cascade/CascadeDeleteCollectionTest.java | 22 +- .../cascade/CascadeDeleteManyToOneTest.java | 20 +- .../cascade/CascadeDetachedTest.java | 22 +- .../cascade/CascadeOnUninitializedTest.java | 20 +- .../cascade/CascadeWithFkConstraintTest.java | 10 +- .../enhancement/join/HHH3949Test.java | 18 +- .../lazy/BidirectionalLazyTest.java | 12 +- .../lazy/IdInUninitializedProxyTest.java | 6 +- .../lazy/LazyBasicFieldMergeTest.java | 22 +- .../lazy/LazyCollectionHandlingTest.java | 12 +- .../lazy/LazyCollectionLoadingTest.java | 18 +- .../lazy/LazyLoadingIntegrationTest.java | 18 +- .../enhancement/lazy/LazyLoadingTest.java | 18 +- .../lazy/LazyProxyWithCollectionTest.java | 18 +- ...turalIdInUninitializedAssociationTest.java | 10 +- .../lazy/StatelessQueryScrollingTest.java | 14 +- .../lazy/basic/LazyBasicFieldAccessTest.java | 12 +- .../basic/LazyBasicPropertyAccessTest.java | 16 +- ...directionalLazyGroupsInEmbeddableTest.java | 18 +- .../group/BidirectionalLazyGroupsTest.java | 14 +- .../enhancement/lazy/group/LGMB_From.java | 26 +- .../enhancement/lazy/group/LGMB_To.java | 18 +- .../enhancement/lazy/group/LazyGroupTest.java | 20 +- .../lazy/group/SimpleLazyGroupUpdateTest.java | 10 +- ...anyToOneNonUpdatableNonInsertableTest.java | 18 +- ...OneToOneNonUpdatableNonInsertableTest.java | 18 +- .../notfound/LazyNotFoundOneToOneTest.java | 18 +- .../enhancement/lazy/proxy/AbstractKey.java | 18 +- .../enhancement/lazy/proxy/Activity.java | 12 +- .../enhancement/lazy/proxy/Address.java | 8 +- .../enhancement/lazy/proxy/BaseEntity.java | 6 +- .../lazy/proxy/BatchFetchProxyTest.java | 12 +- .../lazy/proxy/BidirectionalProxyTest.java | 24 +- ...nhancedLazyLoadingOnDeletedEntityTest.java | 12 +- .../lazy/proxy/CreditCardPayment.java | 4 +- .../enhancement/lazy/proxy/Customer.java | 18 +- .../lazy/proxy/DebitCardPayment.java | 4 +- .../lazy/proxy/DeepInheritanceProxyTest.java | 10 +- ...epInheritanceWithNonEntitiesProxyTest.java | 10 +- .../lazy/proxy/DomesticCustomer.java | 4 +- .../EntitySharedInCollectionAndToOneTest.java | 18 +- .../lazy/proxy/FetchGraphTest.java | 24 +- .../lazy/proxy/ForeignCustomer.java | 4 +- .../enhancement/lazy/proxy/GenericKey.java | 8 +- .../enhancement/lazy/proxy/Instruction.java | 4 +- .../LazyCollectionDeletedAllowProxyTest.java | 20 +- ...roxyFactoryWithSubclassesStatefulTest.java | 16 +- ...oxyFactoryWithSubclassesStatelessTest.java | 16 +- ...azyToOnesProxyMergeWithSubclassesTest.java | 18 +- ...oOnesProxyWithSubclassesStatelessTest.java | 16 +- .../LazyToOnesProxyWithSubclassesTest.java | 16 +- ...adANonExistingNotFoundBatchEntityTest.java | 16 +- .../LoadANonExistingNotFoundEntityTest.java | 16 +- .../proxy/MapsIdProxyBidirectionalTest.java | 14 +- .../proxy/MapsIdProxyUnidirectionalTest.java | 12 +- .../lazy/proxy/MergeDetachedToProxyTest.java | 10 +- .../enhancement/lazy/proxy/ModelEntity.java | 8 +- .../lazy/proxy/MoreSpecializedKey.java | 6 +- .../NaturalIdInUninitializedProxyTest.java | 4 +- .../enhancement/lazy/proxy/Order.java | 22 +- .../lazy/proxy/OrderSupplemental.java | 8 +- .../lazy/proxy/OrderSupplemental2.java | 14 +- .../enhancement/lazy/proxy/Payment.java | 10 +- ...eInlineDirtyTrackingDynamicUpdateTest.java | 12 +- ...alizeAndUpdateInlineDirtyTrackingTest.java | 8 +- .../proxy/ProxyInitializeAndUpdateTest.java | 8 +- ...ithInheritanceProxyEagerManyToOneTest.java | 18 +- ...ueryScrollingWithInheritanceProxyTest.java | 18 +- .../enhancement/lazy/proxy/RoleEntity.java | 16 +- .../SetIdentifierOnAEnhancedProxyTest.java | 22 +- .../SimpleUpdateTestWithLazyLoading.java | 20 +- ...WithLazyLoadingAndInlineDirtyTracking.java | 20 +- .../lazy/proxy/SpecializedEntity.java | 18 +- .../lazy/proxy/SpecializedKey.java | 12 +- .../lazy/proxy/WebApplication.java | 10 +- .../proxy/batch/AbstractBatchingTest.java | 22 +- .../proxy/inlinedirtychecking/BaseEntity.java | 12 +- .../proxy/inlinedirtychecking/Customer.java | 12 +- .../EntityWithMutableAttributesTest.java | 16 +- ...dAndUpdateEntitiesWithCollectionsTest.java | 8 +- .../ManyToOnePropertyAccessByFieldTest.java | 40 +- ...neWithEmbeddedAndNotOptionalFieldTest.java | 20 +- .../lazy/proxy/inlinedirtychecking/Role.java | 12 +- .../inlinedirtychecking/SamplingOrder.java | 12 +- .../SimpleDynamicUpdateTest.java | 12 +- .../lazy/proxy/inlinedirtychecking/User.java | 18 +- .../dynamicupdate/BaseEntity.java | 12 +- .../dynamicupdate/Customer.java | 12 +- .../DynamicUpdateAndCollectionsTest.java | 8 +- .../dynamicupdate/Role.java | 12 +- .../dynamicupdate/SamplingOrder.java | 14 +- .../dynamicupdate/User.java | 18 +- .../lazyCache/InitFromCacheTest.java | 18 +- .../ondemandload/OnDemandLoadTest.java | 20 +- .../test/collection/custom/basic/Email.java | 8 +- .../test/collection/custom/basic/User.java | 18 +- .../custom/basic/UserCollectionTypeTest.java | 4 +- .../collection/custom/declaredtype/Email.java | 8 +- .../declaredtype/UserCollectionTypeTest.java | 22 +- .../UserWithUnimplementedCollection.java | 2 +- .../UserCollectionTypeTest.java | 26 +- .../custom/parameterized/Entity.java | 14 +- .../EmptyInitializedNestedCompositesTest.java | 8 +- .../java/org/hibernate/test/cuk/Account.java | 0 .../java/org/hibernate/test/cuk/Address.java | 0 .../test/cuk/CompositePropertyRefTest.java | 0 .../org/hibernate/test/cuk/Person.hbm.xml | 0 .../java/org/hibernate/test/cuk/Person.java | 0 .../test/distinct/SelectDistinctHqlTest.java | 18 +- .../test/formulajoin/AnnotatedDetail.java | 6 +- .../test/formulajoin/AnnotatedRoot.java | 12 +- .../hibernate/test/formulajoin/Detail.java | 0 .../test/formulajoin/FormulaJoinTest.java | 0 .../hibernate/test/formulajoin/Root.hbm.xml | 0 .../org/hibernate/test/formulajoin/Root.java | 0 .../test/hql/ClassificationType.java | 2 +- .../org/hibernate/test/hql/CoalesceTest.java | 10 +- .../CollectionMapWithComponentValueTest.java | 14 +- .../test/hql/ComponentContainer.java | 14 +- .../java/org/hibernate/test/hql/Crop.java | 10 +- .../test/hql/DB297SubStringFunctionsTest.java | 10 +- ...SubqueryReferencingTargetPropertyTest.java | 14 +- .../test/hql/DeleteWhereFunctionCallTest.java | 6 +- .../org/hibernate/test/hql/Department.java | 12 +- .../hibernate/test/hql/DomesticAnimal.java | 0 .../java/org/hibernate/test/hql/Employee.java | 20 +- .../java/org/hibernate/test/hql/Farm.java | 16 +- .../test/hql/FunctionNameAsColumnTest.java | 8 +- .../java/org/hibernate/test/hql/Human.java | 0 .../org/hibernate/test/hql/IndicesTest.java | 14 +- .../hibernate/test/hql/JoinOnClauseTest.java | 28 +- .../test/hql/MapFunctionExpressionsTest.java | 12 +- .../java/org/hibernate/test/hql/Name.java | 0 .../test/hql/NaturalIdDereferenceTest.java | 20 +- .../java/org/hibernate/test/hql/Panel.java | 94 +-- .../test/hql/ParameterCollectionTest.java | 6 +- .../org/hibernate/test/hql/PettingZoo.java | 0 .../test/hql/SelectNewEmbeddedIdTest.java | 10 +- .../org/hibernate/test/hql/SubQueryTest.java | 12 +- .../java/org/hibernate/test/hql/Title.java | 10 +- .../java/org/hibernate/test/hql/TrtPanel.java | 120 +-- .../UpdateJoinedSubclassCorrelationTest.java | 8 +- .../java/org/hibernate/test/hql/User.java | 0 .../test/hql/fetchAndJoin/Child.java | 16 +- .../test/hql/fetchAndJoin/Entity1.java | 12 +- .../test/hql/fetchAndJoin/Entity2.java | 14 +- .../test/hql/fetchAndJoin/Entity3.java | 8 +- .../test/hql/fetchAndJoin/GrandChild.java | 8 +- .../test/hql/fetchAndJoin/Parent.java | 16 +- .../test/hql/joinedSubclass/Employee.java | 2 +- .../JoinedSubclassSubQueryTest.java | 22 +- .../test/hql/joinedSubclass/Person.java | 10 +- .../hql/size/WhereClauseOrderBySizeTest.java | 16 +- .../hibernate/test/hql/size/filter/City.java | 6 +- .../test/hql/size/filter/Region.java | 6 +- .../QueryScrollingWithInheritanceTest.java | 18 +- .../test/id/sequence/SequenceExportTest.java | 12 +- ...eSQLMultipleTypesOtherContributorTest.java | 10 +- .../test/id/usertype/inet/Event.java | 8 +- ...stgreSQLInetTypesOtherContributorTest.java | 10 +- .../hibernate/test/idclass/Customer.hbm.xml | 0 .../org/hibernate/test/idclass/Customer.java | 0 .../hibernate/test/idclass/CustomerId.java | 0 .../hibernate/test/idclass/IdClassTest.java | 0 .../InheritanceDeleteBatchTest.java | 12 +- .../MappedSuperclassInheritanceTest.java | 12 +- .../discriminator/InheritingEntity.java | 6 +- .../JoinedInheritanceEagerTest.java | 14 +- .../discriminator/JoinedInheritanceTest.java | 2 +- .../MultiInheritanceImplicitDowncastTest.java | 38 +- .../discriminator/ParentEntity.java | 18 +- .../inheritance/discriminator/Polygon.java | 10 +- .../discriminator/Quadrilateral.java | 4 +- .../interceptor/CollectionInterceptor.java | 0 .../InterceptorNonNullTransactionTest.java | 6 +- .../test/interceptor/InterceptorTest.java | 6 +- .../org/hibernate/test/interceptor/Log.java | 0 .../test/interceptor/PropertyInterceptor.java | 0 .../test/interceptor/StatefulInterceptor.java | 0 .../hibernate/test/interceptor/User.hbm.xml | 0 .../org/hibernate/test/interceptor/User.java | 0 .../test/interfaceproxy/Document.java | 0 .../test/interfaceproxy/DocumentImpl.java | 0 .../interfaceproxy/DocumentInterceptor.java | 0 .../hibernate/test/interfaceproxy/Folder.java | 0 .../test/interfaceproxy/FolderImpl.java | 0 .../interfaceproxy/InterfaceProxyTest.java | 0 .../test/interfaceproxy/Item.hbm.xml | 0 .../hibernate/test/interfaceproxy/Item.java | 0 .../test/interfaceproxy/ItemImpl.java | 0 .../test/interfaceproxy/SecureDocument.java | 0 .../interfaceproxy/SecureDocumentImpl.java | 0 .../test/joinedsubclass/Address.java | 0 .../test/joinedsubclass/Customer.java | 0 .../test/joinedsubclass/Employee.java | 0 .../joinedsubclass/JoinedSubclassTest.java | 6 +- .../test/joinedsubclass/Person.hbm.xml | 0 .../hibernate/test/joinedsubclass/Person.java | 0 .../IdentityJoinedSubclassBatchingTest.java | 24 +- .../JoinedSubclassBatchingTest.java | 22 +- .../SequenceJoinedSubclassBatchingTest.java | 24 +- ...dSubclassDuplicateFieldsWithTreatTest.java | 10 +- .../org/hibernate/test/joinfetch/Bid.java | 0 .../hibernate/test/joinfetch/Category.java | 0 .../org/hibernate/test/joinfetch/Comment.java | 0 .../org/hibernate/test/joinfetch/Group.java | 0 .../org/hibernate/test/joinfetch/Item.java | 0 .../hibernate/test/joinfetch/ItemBid.hbm.xml | 0 .../test/joinfetch/JoinFetchTest.java | 8 +- .../org/hibernate/test/joinfetch/User.java | 0 .../test/joinfetch/UserGroup.hbm.xml | 0 .../JoinFetchWithEnhancementTest.java | 16 +- .../hibernate/test/jpa/AbstractJPATest.java | 2 +- .../test/jpa/EntityManagerUnwrapTest.java | 6 +- .../org/hibernate/test/jpa/MapContent.java | 8 +- .../java/org/hibernate/test/jpa/MapOwner.java | 12 +- .../org/hibernate/test/jpa/Relationship.java | 4 +- .../JdbcTypeDescriptorConverterTest.java | 12 +- .../test/jpa/convert/package-info.java | 2 +- .../naturalid/ClassWithIdentityColumn.java | 66 +- .../hibernate/test/jpa/naturalid/Group.java | 6 +- .../jpa/naturalid/ImmutableNaturalIdTest.java | 2 +- ...oOneEagerNonOptionalOrphanRemovalTest.java | 6 +- .../OneToOneEagerOrphanRemovalTest.java | 8 +- ...ToOneLazyNonOptionalOrphanRemovalTest.java | 8 +- .../OneToOneLazyOrphanRemovalTest.java | 8 +- ...LazyOrphanRemovalInEmbeddedEntityTest.java | 2 +- .../test/jpa/proxy/JPAProxyTest.java | 2 +- .../test/jpa/ql/DestinationEntity.java | 18 +- .../org/hibernate/test/jpa/ql/FromEntity.java | 10 +- .../jpa/ql/IdentificationVariablesTest.java | 18 +- .../test/jpa/ql/TreatKeywordTest.java | 22 +- .../hibernate/test/lazyonetoone/Employee.java | 0 .../test/lazyonetoone/Employment.java | 0 .../test/lazyonetoone/LazyOneToOneTest.java | 0 .../test/lazyonetoone/Person.hbm.xml | 0 .../hibernate/test/lazyonetoone/Person.java | 0 .../org/hibernate/test/lob/LobEntity.java | 10 +- .../org/hibernate/test/lob/LobStringTest.java | 14 +- .../test/lob/PostgreSqlLobStringTest.java | 14 +- .../org/hibernate/test/mapcompelem/Item.java | 0 .../mapcompelem/MapCompositeElementTest.java | 0 .../org/hibernate/test/mapcompelem/Part.java | 0 .../hibernate/test/mapcompelem/Product.java | 0 .../test/mapcompelem/ProductPart.hbm.xml | 0 .../hibernate/test/mapping/ConfEntity.java | 120 +-- .../MappedSuperclassWithGenericsTest.java | 8 +- .../org/hibernate/test/mapping/Table1.java | 8 +- .../org/hibernate/test/mapping/Table2.java | 8 +- .../test/mapping/UserConfEntity.java | 108 +-- .../hibernate/test/mapping/UserEntity.java | 128 ++-- .../cascade/PersistOnLazyCollectionTest.java | 482 ++++++------ .../mapping/hhh14276/entity/PlayerStat.java | 18 +- .../test/mapping/hhh14276/entity/Score.java | 12 +- .../hhh14343/entity/NestedPlayerStat.java | 18 +- .../mapping/hhh14343/entity/NestedScore.java | 12 +- .../mapping/hhh14343/entity/NestedStat.java | 16 +- .../test/mapping/joinformula/ChildEntity.java | 6 +- .../mapping/joinformula/ParentEntity.java | 8 +- .../test/mapping/lazytoone/Airport.java | 6 +- .../test/mapping/lazytoone/Flight.java | 12 +- .../JoinFetchedManyToOneAllowProxyTests.java | 10 +- .../lazytoone/ManyToOneAllowProxyTests.java | 10 +- .../ManyToOneExplicitOptionTests.java | 10 +- .../mappedby/InverseToOneAllowProxyTests.java | 10 +- .../InverseToOneExplicitOptionTests.java | 10 +- ...oinFetchedInverseToOneAllowProxyTests.java | 10 +- .../JoinFetchedOneToOneAllowProxyTests.java | 10 +- .../onetoone/OneToOneAllowProxyTests.java | 10 +- .../onetoone/OneToOneExplicitOptionTests.java | 10 +- .../JoinFetchedPolymorphicToOneTests.java | 14 +- .../PolymorphicToOneExplicitOptionTests.java | 14 +- .../PolymorphicToOneImplicitOptionTests.java | 14 +- .../org/hibernate/test/mixed/Document.java | 0 .../test/mixed/DocumentInterceptor.java | 0 .../java/org/hibernate/test/mixed/Folder.java | 0 .../org/hibernate/test/mixed/Item.hbm.xml | 0 .../java/org/hibernate/test/mixed/Item.java | 0 .../org/hibernate/test/mixed/MixedTest.java | 0 .../hibernate/test/mixed/SecureDocument.java | 0 .../test/multitenancy/schema/Customer.java | 4 +- .../test/multitenancy/schema/Invoice.java | 8 +- .../test/namingstrategy/Category.java | 18 +- .../hibernate/test/namingstrategy/Item.java | 12 +- .../namingstrategy/LocalizedEmbeddable.java | 4 +- .../test/namingstrategy/Workflow.java | 16 +- .../CollectionJoinTableNamingTest.java | 18 +- .../test/namingstrategy/complete/Address.java | 8 +- .../namingstrategy/complete/Customer.java | 20 +- .../namingstrategy/complete/Industry.java | 8 +- .../test/namingstrategy/complete/Order.java | 16 +- .../test/namingstrategy/complete/ZipCode.java | 10 +- ...ponentNamingStrategyForJoinColumnTest.java | 20 +- .../namingstrategy/components/Container.java | 6 +- .../test/namingstrategy/components/Item.java | 2 +- .../ejb3joincolumn/Language.java | 12 +- .../synchronizedTables/DynamicEntity.java | 4 +- .../test/notfound/EagerProxyNotFoundTest.java | 16 +- .../org/hibernate/test/onetomany/Child.java | 0 .../test/onetomany/OneToManyTest.java | 0 .../hibernate/test/onetomany/Parent.hbm.xml | 0 .../org/hibernate/test/onetomany/Parent.java | 0 .../OraclePaginationWithLocksTest.java | 10 +- .../procedure/HANAStoredProcedureTest.java | 16 +- .../procedure/MySQLStoredProcedureTest.java | 6 +- .../procedure/OracleStoredProcedureTest.java | 16 +- .../org/hibernate/test/procedure/Person.java | 26 +- .../org/hibernate/test/procedure/Phone.java | 12 +- .../PostgreSQLStoredProcedureTest.java | 4 +- ...erverStoredProcedureCrossDatabaseTest.java | 6 +- ...LServerStoredProcedureCrossSchemaTest.java | 4 +- .../SQLServerStoredProcedureTest.java | 6 +- .../StoredProcedureParameterTypeTest.java | 4 +- .../org/hibernate/test/procedure/Vote.java | 8 +- .../joined/JoinedSubclassPropertyRefTest.java | 6 +- .../hibernate/test/proxy/DataPoint.hbm.xml | 0 .../org/hibernate/test/proxy/DataPoint.java | 0 .../MissingSetterWithEnhancementTest.java | 6 +- .../org/hibernate/test/proxy/ProxyTest.java | 0 ...stractQueryCacheResultTransformerTest.java | 13 +- .../test/queryhint/OracleQueryHintTest.java | 18 +- .../test/queryhint/QueryHintHANATest.java | 20 +- .../queryhint/QueryHintSQLServer2012Test.java | 18 +- .../org/hibernate/test/readonly/Course.java | 0 .../hibernate/test/readonly/DataPoint.hbm.xml | 0 .../hibernate/test/readonly/DataPoint.java | 0 .../hibernate/test/readonly/Enrolment.hbm.xml | 0 .../hibernate/test/readonly/Enrolment.java | 0 .../org/hibernate/test/readonly/Student.java | 0 .../test/readonly/TextHolder.hbm.xml | 0 .../test/replicate/ReplicateTest.java | 8 +- .../org/hibernate/test/rowid/Point.hbm.xml | 0 .../java/org/hibernate/test/rowid/Point.java | 0 .../org/hibernate/test/rowid/RowIdTest.java | 4 +- .../org/hibernate/test/rowid/RowIdType.java | 0 .../scalar/NationalizedScalarQueryTest.java | 10 +- .../sql/NativeQueryScrollableResults.java | 6 +- .../test/sql/refcursor/NumValue.java | 14 +- .../stats/ExplicitQueryStatsMaxSizeTest.java | 2 +- .../test/stats/QueryStatsMaxSizeTest.java | 6 +- .../test/stream/basic/BasicStreamTest.java | 14 +- .../test/stream/basic/JpaStreamTest.java | 6 +- .../test/subclassfilter/Employee.java | 2 +- .../org/hibernate/test/subquery/EntityA.java | 4 +- .../hibernate/test/subquery/SubqueryTest.java | 2 +- .../org/hibernate/test/subselect/Alien.java | 0 .../org/hibernate/test/subselect/Being.java | 0 .../hibernate/test/subselect/Beings.hbm.xml | 0 .../hibernate/test/subselect/Employee.java | 6 +- .../test/subselect/EmployeeGroup.java | 8 +- .../test/subselect/EmployeeGroupId.java | 2 +- .../org/hibernate/test/subselect/Human.java | 0 .../test/subselect/SubselectTest.java | 6 +- .../hibernate/test/subselectfetch/Child.java | 0 .../hibernate/test/subselectfetch/Parent.java | 0 ...SubselectFetchCollectionFromBatchTest.java | 18 +- .../subselectfetch/SubselectFetchTest.java | 10 +- .../SubselectFetchWithFormulaTest.java | 4 +- ...selectFetchWithFormulaTransactSqlTest.java | 4 +- .../MySQL57TimestampFspFunctionTest.java | 8 +- .../MySQL57TimestampPropertyTest.java | 12 +- .../test/temporal/TimePropertyTest.java | 12 +- .../test/temporal/TimestampPropertyTest.java | 14 +- .../org/hibernate/test/ternary/Employee.java | 0 .../java/org/hibernate/test/ternary/Site.java | 0 .../hibernate/test/ternary/Ternary.hbm.xml | 0 .../hibernate/test/ternary/TernaryTest.java | 0 .../timestamp/JdbcTimeCustomTimeZoneTest.java | 4 +- .../JdbcTimeDefaultTimeZoneTest.java | 4 +- ...mestampCustomSessionLevelTimeZoneTest.java | 4 +- .../JdbcTimestampCustomTimeZoneTest.java | 4 +- .../JdbcTimestampDSTWithUTCTest.java | 4 +- .../JdbcTimestampDefaultTimeZoneTest.java | 4 +- .../JdbcTimestampWithoutUTCTimeZoneTest.java | 4 +- ...calDateCustomSessionLevelTimeZoneTest.java | 4 +- .../org/hibernate/test/timestamp/Person.java | 0 .../test/timestamp/TimestampTest.java | 0 .../org/hibernate/test/timestamp/User.hbm.xml | 0 .../org/hibernate/test/timestamp/User.java | 0 .../java/org/hibernate/test/tm/CMTTest.java | 2 +- .../java/org/hibernate/test/tm/Item.hbm.xml | 0 .../test/type/BigDecimalTypeTest.java | 14 +- .../hibernate/test/type/BinaryTypeTest.java | 6 +- .../org/hibernate/test/type/InstantTest.java | 8 +- .../test/type/Java8DateTimeTests.java | 8 +- .../test/type/LobUnfetchedPropertyTest.java | 14 +- .../hibernate/test/type/LocalDateTest.java | 8 +- .../test/type/LocalDateTimeTest.java | 8 +- .../hibernate/test/type/LocalTimeTest.java | 8 +- .../type/LongListTypeContributorTest.java | 8 +- .../test/type/OffsetDateTimeTest.java | 8 +- .../hibernate/test/type/OffsetTimeTest.java | 8 +- .../test/type/OracleLongLobTypeTest.java | 6 +- .../type/SQLServer2008NVarCharTypeTest.java | 8 +- .../type/SmallIntToShortClassMappingTest.java | 14 +- .../test/type/TimeAndTimestampTest.java | 4 +- .../test/type/ZonedDateTimeTest.java | 8 +- .../test/typedmanytoone/Address.java | 0 .../test/typedmanytoone/AddressId.java | 0 .../test/typedmanytoone/Customer.hbm.xml | 0 .../test/typedmanytoone/Customer.java | 0 .../typedmanytoone/TypedManyToOneTest.java | 0 .../hibernate/test/typedonetoone/Address.java | 0 .../test/typedonetoone/AddressId.java | 0 .../test/typedonetoone/Customer.hbm.xml | 0 .../test/typedonetoone/Customer.java | 0 .../test/typedonetoone/TypedOneToOneTest.java | 0 .../test/uniquekey/NaturalIdCachingTest.java | 14 +- .../IntegratorProvidedUserTypeTest.java | 4 +- .../hibernate/orm/test/jpa/ops/Node.hbm.xml | 0 .../test/subselectfetch/ParentChild.hbm.xml | 0 .../hibernate/id/hhh14407/ChildEntity.java | 6 +- .../hibernate/id/hhh14407/ParentEntity.java | 12 +- .../paths/EntityModeMapJoinsTest.java | 12 +- .../AbstractStoredProcedureTest.java | 10 +- .../test/procedure/DateTimeParameterTest.java | 18 +- .../test/procedure/H2StoreProcedureTest.java | 14 +- .../procedure/HSQLStoreProcedureTest.java | 24 +- .../jpa/test/procedure/JpaTckUsageTest.java | 4 +- .../StoreProcedureOutParameterByNameTest.java | 22 +- ...reProcedureOutParameterByPositionTest.java | 22 +- ...cedureRefCursorOutParameterByNameTest.java | 20 +- ...reRefCursorOutParameterByPositionTest.java | 20 +- ...toredProcedureNullParameterByNameTest.java | 22 +- .../StoredProcedureResultSetMappingTest.java | 20 +- .../hibernate/jpa/test/procedure/User.java | 20 +- .../internal/AliasWithCriterionTest.java | 18 +- .../access/jpa/AccessMappingTest.java | 2 +- .../bulkid/AbstractBulkCompositeIdTest.java | 10 +- .../test/bulkid/AbstractBulkIdTest.java | 12 +- .../GlobalQuotedIdentifiersBulkIdTest.java | 16 +- .../test/cid/CompositeIdCountEntityTest.java | 2 +- .../org/hibernate/test/criteria/Bid.java | 6 +- .../org/hibernate/test/criteria/Course.java | 0 .../test/criteria/CriteriaAliasFetchTest.java | 10 +- .../test/criteria/CriteriaQueryTest.java | 0 .../hibernate/test/criteria/Enrolment.hbm.xml | 0 .../hibernate/test/criteria/Enrolment.java | 0 .../org/hibernate/test/criteria/Foo.hbm.xml | 0 .../org/hibernate/test/criteria/Item.java | 2 +- .../test/criteria/ListActionRole.java | 14 +- .../criteria/NationalizedIgnoreCaseTest.java | 10 +- .../org/hibernate/test/criteria/Role.java | 10 +- .../SessionCreateQueryFromCriteriaTest.java | 14 +- .../org/hibernate/test/criteria/Student.java | 0 .../test/criteria/VersionedRecord.java | 2 +- .../criteria/limitexpression/Country.java | 0 .../test/criteria/limitexpression/Person.java | 0 .../criteria/limitexpression/UsState.java | 0 .../criteria/limitexpression/domain.hbm.xml | 0 .../test/criteria/many_to_many/Customer.java | 10 +- .../test/criteria/many_to_many/Seller.java | 14 +- .../mapsid/MapsIdOneToOneSelectTest.java | 18 +- .../test/hql/CriteriaHQLAlignmentTest.java | 2 +- .../org/hibernate/test/hql/EJBQLTest.java | 0 .../HibernateFirstResultMaxResultsTest.java | 4 +- .../hibernate/test/hql/QuerySplitterTest.java | 6 +- .../hibernate/test/hql/TupleSupportTest.java | 8 +- .../CriteriaIdPropertyReferencesTest.java | 6 +- .../hibernate/test/iterate/IterateTest.java | 0 .../tck2_2/OrderByAnnotationTests.java | 12 +- ...positeAttributeResultSetProcessorTest.java | 24 +- ...atedCompositeIdResultSetProcessorTest.java | 10 +- ...tityAssociationResultSetProcessorTest.java | 12 +- ...nLazyCollectionResultSetProcessorTest.java | 14 +- ...zyOneToManyListResultSetProcessorTest.java | 14 +- ...azyOneToManySetResultSetProcessorTest.java | 14 +- .../process/SimpleResultSetProcessorTest.java | 4 +- .../process/inheritance/Contractor.java | 8 +- .../process/inheritance/Department.java | 4 +- .../process/inheritance/Employee.java | 4 +- .../loadplans/process/inheritance/User.java | 10 +- .../loadplans/walking/BasicWalkingTest.java | 10 +- .../org/hibernate/test/locale/IAmAFoo.java | 8 +- .../readonly/ReadOnlyCriteriaQueryTest.java | 0 ...ativeQueryDoesNotSupportIterationTest.java | 6 +- ...redProcedureParameterRegistrationTest.java | 2 +- .../hibernate-envers-jakarta.gradle | 139 ---- .../org/hibernate/envers/demo/Address.java | 8 +- .../org/hibernate/envers/demo/Person.java | 8 +- .../hibernate/envers/demo/TestConsole.java | 6 +- .../org/hibernate/envers/AuditJoinTable.java | 2 +- .../org/hibernate/envers/AuditMappedBy.java | 2 +- .../org/hibernate/envers/AuditOverride.java | 14 +- .../org/hibernate/envers/AuditOverrides.java | 10 +- .../org/hibernate/envers/AuditReader.java | 2 +- .../hibernate/envers/AuditReaderFactory.java | 2 +- .../java/org/hibernate/envers/Audited.java | 2 +- .../envers/DefaultRevisionEntity.java | 8 +- ...rackingModifiedEntitiesRevisionEntity.java | 12 +- .../internal/RevisionInfoConfiguration.java | 2 +- .../metadata/CollectionMetadataGenerator.java | 10 +- .../internal/metadata/MetadataTools.java | 6 +- .../reader/AuditedPropertiesReader.java | 14 +- .../metadata/reader/PropertyAuditingData.java | 2 +- .../enhanced/SequenceIdRevisionEntity.java | 8 +- ...rackingModifiedEntitiesRevisionEntity.java | 12 +- .../relation/AbstractOneToOneMapper.java | 2 +- ...MiddleMapKeyEnumeratedComponentMapper.java | 2 +- .../relation/OneToOneNotOwningMapper.java | 2 +- .../OneToOnePrimaryKeyJoinColumnMapper.java | 2 +- .../mapper/relation/ToOneIdMapper.java | 2 +- .../BasicCollectionInitializor.java | 2 +- .../ListCollectionInitializor.java | 4 +- .../initializor/MapCollectionInitializor.java | 2 +- .../relation/lazy/proxy/CollectionProxy.java | 2 +- .../mapper/relation/lazy/proxy/MapProxy.java | 2 +- .../relation/lazy/proxy/SortedMapProxy.java | 2 +- .../internal/reader/AuditReaderImpl.java | 2 +- .../internal/tools/query/QueryBuilder.java | 2 +- .../internal/tools/query/UpdateBuilder.java | 2 +- .../envers/query/AuditAssociationQuery.java | 2 +- .../hibernate/envers/query/AuditQuery.java | 6 +- .../criteria/internal/CriteriaTools.java | 2 +- .../internal/impl/AbstractAuditQuery.java | 6 +- .../impl/AuditAssociationQueryImpl.java | 6 +- .../internal/impl/RevisionsOfEntityQuery.java | 2 +- .../envers/strategy/AuditStrategy.java | 0 .../envers/strategy/DefaultAuditStrategy.java | 0 .../test/java/ee/estonia/entities/Child.java | 8 +- .../test/java/ee/estonia/entities/Parent.java | 8 +- .../EmbeddableWithCollectionTest.java | 28 +- .../customtype/ExtendedEnumTypeTest.java | 10 +- .../customtype/ObjectUserTypeEntity.java | 8 +- .../customtype/ObjectUserTypeTest.java | 2 +- .../customtype/ParametrizedCustom.java | 4 +- .../test/integration/data/DateTestEntity.java | 8 +- .../test/integration/data/EnumTestEntity.java | 10 +- .../data/LobSerializableTestEntity.java | 10 +- .../test/integration/data/LobTestEntity.java | 10 +- .../envers/test/integration/data/Lobs.java | 2 +- .../data/SerializableTestEntity.java | 8 +- .../integration/manytoone/lazy/Address.java | 14 +- .../manytoone/lazy/AddressVersion.java | 16 +- .../test/integration/manytoone/lazy/Base.java | 6 +- .../manytoone/lazy/BaseDomainEntity.java | 8 +- .../lazy/BaseDomainEntityMetadata.java | 6 +- .../lazy/BaseDomainEntityVersion.java | 8 +- .../integration/manytoone/lazy/ChildUser.java | 12 +- .../integration/manytoone/lazy/Shipment.java | 20 +- .../test/integration/manytoone/lazy/User.java | 18 +- .../maytomany/BasicWhereJoinTable.java | 4 +- .../HasChangedChildAuditing.java | 4 +- .../HasChangedChildReferencing.java | 4 +- .../HasChangedNotOwnedBidirectional.java | 4 +- .../naming/AuditColumnNameTest.java | 4 +- ...ionsJoinTableRangeComponentNamingTest.java | 2 +- .../BidirectionalOneToOneOptionalTest.java | 2 +- .../AssociationToOneInnerJoinQueryTest.java | 4 +- ...eritanceAssociationToOneInnerJoinTest.java | 14 +- .../integration/query/OrderByLimitQuery.java | 4 +- .../query/OrderByOneAuditEntityTest.java | 16 +- .../query/OrderByThreeEntityTest.java | 10 +- .../query/OrderByTwoEntityOneAuditedTest.java | 14 +- .../query/OrderByTwoEntityTest.java | 14 +- .../ids/EmbeddedIdRelatedIdQueryTest.java | 10 +- .../query/ids/IdClassRelatedIdQueryTest.java | 8 +- .../ids/MultipleIdRelatedIdQueryTest.java | 6 +- .../ReadWriteExpressionChange.java | 2 +- .../readwriteexpression/Staff.java | 10 +- .../BaseEnversJPAFunctionalTestCase.java | 6 +- .../orm/test/envers/EnversRunner.java | 2 +- .../envers/ModelContributorSmokeTests.java | 6 +- .../test/envers/RuntimeModelSmokeTests.java | 6 +- .../entities/IntNoAutoIdTestEntity.java | 6 +- .../test/envers/entities/IntTestEntity.java | 10 +- .../envers/entities/IntTestPrivSeqEntity.java | 12 +- .../envers/entities/PrimitiveTestEntity.java | 8 +- .../envers/entities/StrIntTestEntity.java | 10 +- .../test/envers/entities/StrTestEntity.java | 10 +- .../envers/entities/StrTestNoProxyEntity.java | 8 +- .../envers/entities/StrTestPrivSeqEntity.java | 12 +- .../envers/entities/UnversionedEntity.java | 8 +- .../entities/UnversionedStrTestEntity.java | 8 +- .../collection/EmbeddableListEntity1.java | 16 +- .../collection/EmbeddableListEntity2.java | 16 +- .../collection/EmbeddableListEntity3.java | 2 +- .../collection/EmbeddableMapEntity.java | 16 +- .../collection/EmbeddableSetEntity.java | 14 +- .../entities/collection/EnumMapEntity.java | 10 +- .../entities/collection/EnumMapType.java | 6 +- .../entities/collection/EnumSetEntity.java | 14 +- .../collection/MultipleCollectionEntity.java | 22 +- .../MultipleCollectionRefEntity1.java | 18 +- .../MultipleCollectionRefEntity2.java | 18 +- .../entities/collection/StringListEntity.java | 10 +- .../entities/collection/StringMapEntity.java | 12 +- .../entities/collection/StringSetEntity.java | 10 +- .../entities/components/Component1.java | 2 +- .../entities/components/Component2.java | 2 +- .../entities/components/Component3.java | 8 +- .../entities/components/Component4.java | 2 +- .../components/ComponentSetTestEntity.java | 14 +- .../components/ComponentTestEntity.java | 10 +- .../components/DefaultValueComponent1.java | 2 +- .../DefaultValueComponentTestEntity.java | 16 +- .../relations/ManyToOneComponent.java | 8 +- .../ManyToOneComponentTestEntity.java | 12 +- .../relations/ManyToOneEagerComponent.java | 8 +- .../NotAuditedManyToOneComponent.java | 8 +- ...otAuditedManyToOneComponentTestEntity.java | 12 +- .../relations/OneToManyComponent.java | 10 +- .../OneToManyComponentTestEntity.java | 12 +- .../envers/entities/converter/Person.java | 8 +- .../entities/converter/SexConverter.java | 2 +- .../entities/customtype/EnumTypeEntity.java | 10 +- .../ParametrizedCustomTypeEntity.java | 10 +- .../ids/CompositeDateIdTestEntity.java | 6 +- .../test/envers/entities/ids/DateEmbId.java | 4 +- .../envers/entities/ids/DateIdTestEntity.java | 6 +- .../orm/test/envers/entities/ids/EmbId.java | 4 +- .../envers/entities/ids/EmbIdTestEntity.java | 6 +- .../entities/ids/EmbIdWithCustomType.java | 2 +- .../ids/EmbIdWithCustomTypeTestEntity.java | 6 +- .../ids/ManyToOneIdNotAuditedTestEntity.java | 6 +- .../ids/ManyToOneNotAuditedEmbId.java | 4 +- .../envers/entities/ids/MulIdTestEntity.java | 8 +- .../entities/ids/UnusualIdNamingEntity.java | 4 +- .../entities/manytomany/ListOwnedEntity.java | 10 +- .../entities/manytomany/ListOwningEntity.java | 10 +- .../entities/manytomany/MapOwnedEntity.java | 10 +- .../entities/manytomany/MapOwningEntity.java | 12 +- .../entities/manytomany/SetOwnedEntity.java | 10 +- .../entities/manytomany/SetOwningEntity.java | 10 +- .../entities/manytomany/SortedSetEntity.java | 10 +- .../manytomany/WhereJoinTableEntity.java | 12 +- .../biowned/ListBiowning1Entity.java | 14 +- .../biowned/ListBiowning2Entity.java | 14 +- .../manytomany/sametable/Child1Entity.java | 14 +- .../manytomany/sametable/Child2Entity.java | 16 +- .../manytomany/sametable/ParentEntity.java | 14 +- .../unidirectional/JoinTableEntity.java | 12 +- .../unidirectional/ListUniEntity.java | 8 +- .../M2MIndexedListTargetNotAuditedEntity.java | 16 +- .../M2MTargetNotAuditedEntity.java | 10 +- .../ManyToManyNotAuditedNullEntity.java | 14 +- .../unidirectional/MapUniEntity.java | 10 +- .../unidirectional/SetUniEntity.java | 8 +- .../ExtManyToOneNotAuditedNullEntity.java | 4 +- .../ManyToOneNotAuditedNullEntity.java | 14 +- .../TargetNotAuditedEntity.java | 8 +- .../onetomany/CollectionRefEdEntity.java | 8 +- .../onetomany/CollectionRefIngEntity.java | 8 +- .../entities/onetomany/ListRefEdEntity.java | 8 +- .../entities/onetomany/ListRefIngEntity.java | 8 +- .../OneToManyNotAuditedNullEntity.java | 14 +- .../entities/onetomany/SetRefEdEntity.java | 6 +- .../entities/onetomany/SetRefIngEntity.java | 6 +- ...stJoinColumnBidirectionalRefEdEntity1.java | 14 +- ...stJoinColumnBidirectionalRefEdEntity2.java | 14 +- ...stJoinColumnBidirectionalRefIngEntity.java | 14 +- .../detached/DoubleSetRefCollEntity.java | 10 +- ...istJoinColumnBidirectionalRefEdEntity.java | 16 +- ...stJoinColumnBidirectionalRefIngEntity.java | 14 +- ...irectionalInheritanceRefEdChildEntity.java | 8 +- ...rectionalInheritanceRefEdParentEntity.java | 24 +- ...nBidirectionalInheritanceRefIngEntity.java | 14 +- ...istJoinColumnBidirectionalRefEdEntity.java | 12 +- ...stJoinColumnBidirectionalRefIngEntity.java | 12 +- .../onetomany/detached/ListRefCollEntity.java | 8 +- .../detached/SetJoinColumnRefCollEntity.java | 12 +- .../onetomany/detached/SetRefCollEntity.java | 8 +- .../detached/ids/SetRefCollEntityEmbId.java | 10 +- .../detached/ids/SetRefCollEntityMulId.java | 12 +- ...stJoinColumnBidirectionalRefIngEntity.java | 4 +- ...stJoinColumnBidirectionalRefIngEntity.java | 18 +- ...istJoinColumnBidirectionalRefEdEntity.java | 16 +- .../onetomany/ids/SetRefEdEmbIdEntity.java | 8 +- .../onetomany/ids/SetRefEdMulIdEntity.java | 10 +- .../onetomany/ids/SetRefIngEmbIdEntity.java | 8 +- .../onetomany/ids/SetRefIngMulIdEntity.java | 10 +- ...rectionalEagerAnnotationRefEdOneToOne.java | 14 +- ...ectionalEagerAnnotationRefIngOneToOne.java | 18 +- .../reventity/CustomDataRevEntity.java | 8 +- .../reventity/CustomDateRevEntity.java | 8 +- .../CustomPropertyAccessRevEntity.java | 8 +- .../entities/reventity/CustomRevEntity.java | 6 +- .../CustomRevEntityColumnMapping.java | 10 +- .../AnnotatedTrackingRevisionEntity.java | 16 +- .../CustomTrackingRevisionEntity.java | 12 +- .../ExtendedRevisionEntity.java | 4 +- .../ModifiedEntityTypeEntity.java | 8 +- .../accesstype/AttributeAccessorTest.java | 4 +- .../integration/accesstype/Country.java | 6 +- .../accesstype/FieldAccessType.java | 4 +- .../accesstype/FieldAccessTypeEntity.java | 8 +- .../accesstype/ImmutableClassAccessType.java | 4 +- .../accesstype/MixedAccessType.java | 4 +- .../accesstype/MixedAccessTypeEntity.java | 14 +- .../accesstype/PropertyAccessType.java | 4 +- .../accesstype/PropertyAccessTypeEntity.java | 10 +- .../auditReader/AuditReaderAPITest.java | 2 +- .../auditReader/AuditedTestEntity.java | 4 +- .../auditReader/NotAuditedTestEntity.java | 4 +- .../integration/basic/BasicTestEntity1.java | 6 +- .../integration/basic/BasicTestEntity2.java | 8 +- .../integration/basic/BasicTestEntity3.java | 8 +- .../integration/basic/BasicTestEntity4.java | 8 +- .../basic/BasicTypeColumnDefinitionTest.java | 8 +- .../integration/basic/BigDecimalTypeTest.java | 10 +- .../basic/ColumnScalePrecisionTest.java | 2 +- .../test/envers/integration/basic/Delete.java | 2 +- .../integration/basic/EmptyStringTest.java | 2 +- .../integration/basic/GlobalVersioned.java | 4 +- .../basic/ManyOperationsInTransaction.java | 2 +- .../integration/basic/NotVersioned.java | 4 +- .../integration/basic/NullProperties.java | 4 +- .../basic/OutsideTransactionTest.java | 2 +- .../basic/ScalePrecisionEntity.java | 8 +- .../test/envers/integration/basic/Simple.java | 4 +- .../basic/SingleOperationInTransaction.java | 2 +- .../basic/TransactionRollbackBehaviour.java | 2 +- .../basic/UnversionedPropertiesChange.java | 2 +- .../basic/UnversionedProperty.java | 2 +- .../integration/cache/OneToManyCache.java | 4 +- .../integration/cache/OneToOneCache.java | 4 +- .../envers/integration/cache/QueryCache.java | 4 +- .../DetachedCollectionChangeTest.java | 14 +- .../DetachedMultipleCollectionChangeTest.java | 10 +- .../integration/collection/EmbeddableSet.java | 2 +- .../integration/collection/EntityMapTest.java | 10 +- .../EntitySameMapKeyMultiMapValueTest.java | 8 +- .../integration/collection/EnumMapTest.java | 2 +- .../integration/collection/EnumSet.java | 4 +- .../collection/IndexColumnListTest.java | 8 +- .../collection/OrderColumnListTest.java | 8 +- .../integration/collection/StringList.java | 4 +- .../integration/collection/StringMap.java | 4 +- .../collection/StringMapLobTest.java | 8 +- .../StringMapNationalizedLobTest.java | 8 +- .../integration/collection/StringSet.java | 4 +- .../embeddable/BasicEmbeddableCollection.java | 2 +- .../collection/embeddable/DarkCharacter.java | 6 +- .../embeddable/EmbeddableList1.java | 2 +- .../embeddable/EmbeddableList2.java | 4 +- .../collection/embeddable/EmbeddableMap.java | 4 +- .../collection/embeddable/EmbeddableSet.java | 4 +- .../collection/embeddable/Item.java | 4 +- .../embeddable/ListEqualsHashCodeTest.java | 10 +- .../embeddable/ListNoEqualsHashCodeTest.java | 10 +- .../embeddable/MapEqualsHashCodeTest.java | 8 +- .../embeddable/MapNoEqualsHashCodeTest.java | 10 +- .../collection/embeddable/Name.java | 2 +- .../collection/embeddable/Product.java | 12 +- .../embeddable/SetEqualsHashCodeTest.java | 10 +- .../embeddable/SetNoEqualsHashCodeTest.java | 10 +- .../collection/embeddable/Type.java | 4 +- .../collection/mapkey/ComponentMapKey.java | 4 +- .../mapkey/ComponentMapKeyEntity.java | 14 +- .../collection/mapkey/IdMapKey.java | 4 +- .../collection/mapkey/IdMapKeyEntity.java | 14 +- .../mapkey/MapKeyEnumeratedNonEntityTest.java | 14 +- .../mapkey/MapKeyEnumeratedTest.java | 12 +- .../collection/norevision/Child.java | 8 +- .../collection/norevision/House.java | 8 +- .../collection/norevision/Name.java | 10 +- .../collection/norevision/Parent.java | 8 +- .../collection/norevision/Person.java | 12 +- .../integration/components/Components.java | 2 +- .../components/DefaultValueComponents.java | 2 +- .../collections/CollectionOfComponents.java | 4 +- .../mappedsuperclasselement/AbstractCode.java | 8 +- .../mappedsuperclasselement/Code.java | 4 +- ...ctionOfMappedSuperclassComponentsTest.java | 4 +- ...appedSuperclassComponentSetTestEntity.java | 16 +- .../mappedsuperclass/AbstractEmbeddable.java | 8 +- .../EmbeddableWithDeclaredData.java | 4 +- .../EmbeddableWithDeclaredDataTest.java | 4 +- .../EmbeddableWithNoDeclaredData.java | 4 +- .../EmbeddableWithNoDeclaredDataTest.java | 4 +- .../EntityWithEmbeddableWithDeclaredData.java | 16 +- ...ntityWithEmbeddableWithNoDeclaredData.java | 16 +- .../relations/ManyToOneInComponent.java | 2 +- .../NotAuditedManyToOneInComponent.java | 4 +- .../relations/OneToManyInComponent.java | 4 +- .../integration/customtype/EnumTypeTest.java | 2 +- .../test/envers/integration/data/Dates.java | 4 +- .../test/envers/integration/data/Enums.java | 4 +- .../integration/data/LobSerializables.java | 4 +- .../integration/data/Serializables.java | 4 +- .../dynamicmodel/DynamicModelTest.java | 2 +- .../integration/flush/AbstractFlushTest.java | 2 +- .../envers/integration/flush/CommitFlush.java | 2 +- .../flush/CommitFlushCollectionTest.java | 26 +- ...ommitFlushSingleRevisionInTransaction.java | 2 +- .../integration/flush/DoubleFlushAddDel.java | 4 +- .../integration/flush/DoubleFlushAddMod.java | 4 +- .../integration/flush/DoubleFlushModDel.java | 4 +- .../integration/flush/DoubleFlushModMod.java | 4 +- .../envers/integration/flush/ManualFlush.java | 2 +- .../generated/GeneratedColumnTest.java | 2 +- .../integration/generated/SimpleEntity.java | 8 +- .../hashcode/ChangingHashcode.java | 4 +- ...ComponentCollectionHashcodeChangeTest.java | 12 +- .../hashcode/ListHashcodeChangeTest.java | 20 +- .../hashcode/SetHashcodeChangeTest.java | 20 +- .../integration/hashcode/WikiImage.java | 8 +- .../envers/integration/hashcode/WikiPage.java | 12 +- .../integration/ids/CompositeDateId.java | 4 +- .../envers/integration/ids/CompositeIds.java | 2 +- .../test/envers/integration/ids/DateId.java | 4 +- .../ids/ManyToOneIdNotAudited.java | 2 +- .../ids/embeddedid/CorrectChild.java | 8 +- .../ids/embeddedid/CorrectChildId.java | 4 +- .../embeddedid/EmbeddedIdGenericsTest.java | 18 +- .../ids/embeddedid/IncorrectChild.java | 4 +- .../ids/embeddedid/IncorrectChildId.java | 10 +- .../integration/ids/embeddedid/Item.java | 6 +- .../integration/ids/embeddedid/ItemId.java | 10 +- .../integration/ids/embeddedid/Parent.java | 6 +- .../integration/ids/embeddedid/Producer.java | 8 +- .../ids/embeddedid/PurchaseOrder.java | 16 +- ...elationInsideEmbeddableNotAuditedTest.java | 14 +- .../RelationInsideEmbeddableRemoveTest.java | 2 +- .../RelationInsideEmbeddableTest.java | 2 +- .../integration/ids/idclass/ClassType.java | 6 +- .../IdClassReferenceIdentifierTest.java | 2 +- .../ids/idclass/IdClassWithRelationTest.java | 2 +- .../IntegerGeneratedIdentityEntity.java | 6 +- .../idclass/ReferenceIdentifierEntity.java | 2 +- .../integration/ids/idclass/SampleClass.java | 14 +- .../ProtectedConstructorEntity.java | 4 +- .../ProtectedConstructorTest.java | 2 +- .../protectedmodifier/WrappedStringId.java | 2 +- .../inheritance/joined/ChildAuditing.java | 4 +- .../inheritance/joined/ChildEntity.java | 6 +- .../inheritance/joined/ChildNullAuditing.java | 4 +- .../DiscriminatorJoinedInheritanceTest.java | 20 +- .../inheritance/joined/ParentAuditing.java | 4 +- .../inheritance/joined/ParentEntity.java | 12 +- .../joined/childrelation/ChildIngEntity.java | 8 +- .../childrelation/ChildReferencing.java | 4 +- .../childrelation/ParentNotIngEntity.java | 12 +- .../childrelation/ReferencedEntity.java | 8 +- .../joined/emptychild/EmptyChildAuditing.java | 2 +- .../joined/emptychild/EmptyChildEntity.java | 2 +- .../joined/emptychild/ParentEntity.java | 10 +- .../joined/notownedrelation/Address.java | 8 +- .../joined/notownedrelation/Contact.java | 12 +- .../NotOwnedBidirectional.java | 4 +- .../notownedrelation/PersonalContact.java | 4 +- .../ChildPrimaryKeyJoinAuditing.java | 4 +- .../ChildPrimaryKeyJoinEntity.java | 8 +- .../joined/relation/ChildIngEntity.java | 6 +- .../joined/relation/ParentIngEntity.java | 14 +- .../relation/ParentReferencingChildTest.java | 2 +- .../inheritance/joined/relation/Person.java | 2 +- .../relation/PolymorphicCollection.java | 4 +- .../joined/relation/ReferencedEntity.java | 8 +- .../joined/relation/RightsSubject.java | 14 +- .../inheritance/joined/relation/Role.java | 6 +- .../AbstractContainedEntity.java | 14 +- .../unidirectional/AbstractSetEntity.java | 16 +- .../unidirectional/ContainedEntity.java | 6 +- .../relation/unidirectional/SetEntity.java | 4 +- .../UnidirectionalDoubleAbstract.java | 4 +- .../mixed/entities/AbstractActivity.java | 8 +- .../mixed/entities/AbstractCheckActivity.java | 20 +- .../mixed/entities/ActivityId.java | 2 +- .../mixed/entities/CheckInActivity.java | 4 +- .../mixed/entities/NormalActivity.java | 4 +- .../inheritance/single/ChildAuditing.java | 2 +- .../inheritance/single/ChildEntity.java | 8 +- .../inheritance/single/ParentAuditing.java | 4 +- .../inheritance/single/ParentEntity.java | 20 +- .../single/childrelation/ChildIngEntity.java | 10 +- .../childrelation/ChildReferencing.java | 4 +- .../childrelation/ParentNotIngEntity.java | 20 +- .../childrelation/ReferencedEntity.java | 10 +- .../discriminatorformula/ChildEntity.java | 4 +- .../discriminatorformula/ClassTypeEntity.java | 6 +- .../DiscriminatorFormulaTest.java | 2 +- .../discriminatorformula/ParentEntity.java | 8 +- .../single/notownedrelation/Address.java | 8 +- .../single/notownedrelation/Contact.java | 18 +- .../NotOwnedBidirectional.java | 4 +- .../notownedrelation/PersonalContact.java | 4 +- .../single/relation/ChildIngEntity.java | 8 +- .../single/relation/ParentIngEntity.java | 22 +- .../relation/PolymorphicCollection.java | 4 +- .../relation/PolymorphicRemovalTest.java | 22 +- .../single/relation/ReferencedEntity.java | 8 +- .../tableperclass/ChildAuditing.java | 4 +- .../tableperclass/ChildEntity.java | 6 +- .../tableperclass/ParentAuditing.java | 4 +- .../tableperclass/ParentEntity.java | 12 +- .../abstractparent/AbstractEntity.java | 10 +- .../AuditedAbstractParentTest.java | 2 +- .../abstractparent/EffectiveEntity1.java | 6 +- .../childrelation/ChildIngEntity.java | 8 +- .../childrelation/ChildReferencing.java | 4 +- .../childrelation/ParentNotIngEntity.java | 12 +- .../childrelation/ReferencedEntity.java | 8 +- .../notownedrelation/Address.java | 8 +- .../notownedrelation/Contact.java | 12 +- .../NotOwnedBidirectional.java | 4 +- .../notownedrelation/PersonalContact.java | 4 +- .../relation/ChildIngEntity.java | 6 +- .../relation/ParentIngEntity.java | 14 +- .../relation/PolymorphicCollection.java | 4 +- .../relation/ReferencedEntity.java | 8 +- .../interfaces/components/Component1.java | 4 +- .../components/ComponentTestEntity.java | 10 +- .../components/InterfacesComponents.java | 4 +- .../allAudited/AbstractAllAuditedTest.java | 2 +- .../AbstractPropertiesAuditedTest.java | 2 +- .../AbstractPropertiesAudited2Test.java | 2 +- .../relation/InterfacesRelation.java | 4 +- .../interfaces/relation/SetRefEdEntity.java | 6 +- .../interfaces/relation/SetRefIngEntity.java | 8 +- ...ctionJtaSessionClosedBeforeCommitTest.java | 14 +- ...ProxyJtaSessionClosedBeforeCommitTest.java | 20 +- .../integration/jta/JtaExceptionListener.java | 4 +- .../jta/JtaSessionClosedBeforeCommitTest.java | 2 +- .../integration/jta/JtaTransaction.java | 2 +- .../jta/JtaTransactionAfterCallbackTest.java | 10 +- ...oManyJtaSessionClosedBeforeCommitTest.java | 2 +- .../integration/manytomany/BasicList.java | 4 +- .../integration/manytomany/BasicMap.java | 4 +- .../integration/manytomany/BasicSet.java | 4 +- .../CustomComparatorEntityTest.java | 2 +- .../manytomany/IndexColumnListTest.java | 8 +- .../MappedByEmbeddableAttributeTest.java | 12 +- .../manytomany/OrderColumnListTest.java | 8 +- .../manytomany/biowned/BasicBiowned.java | 4 +- .../ManyToManyInverseToSuperclassTest.java | 2 +- .../manytomany/sametable/BasicSametable.java | 4 +- .../manytomany/ternary/TernaryMap.java | 4 +- .../manytomany/ternary/TernaryMapEntity.java | 12 +- .../manytomany/ternary/TernaryMapFlush.java | 4 +- .../unidirectional/BasicUniList.java | 4 +- .../unidirectional/BasicUniMap.java | 4 +- .../unidirectional/BasicUniSet.java | 4 +- .../unidirectional/JoinTableDetachedTest.java | 2 +- .../M2MIndexedListNotAuditedTarget.java | 2 +- .../M2MRelationNotAuditedTarget.java | 2 +- .../manytoone/DetachedUpdateTest.java | 10 +- .../EmbeddedIdManyToOneForeignKeyTest.java | 18 +- .../bidirectional/BiRefedOptionalEntity.java | 8 +- .../bidirectional/BiRefingOptionalEntity.java | 12 +- .../BidirectionalManyToOneOptionalTest.java | 2 +- .../bidirectional/ImplicitMappedByTest.java | 4 +- .../bidirectional/ManyToOneOwning.java | 12 +- .../bidirectional/OneToManyOwned.java | 8 +- .../manytoone/foreignkey/LeafLayer.java | 14 +- .../manytoone/foreignkey/MiddleLayer.java | 16 +- .../manytoone/foreignkey/RootLayer.java | 12 +- .../RelationNotAuditedTarget.java | 2 +- .../integration/merge/GivenIdStrEntity.java | 4 +- .../modifiedflags/DetachedEntityTest.java | 4 +- .../modifiedflags/HasChangedAPITest.java | 2 +- ...asChangedAuditedManyToManyRemovalTest.java | 2 +- .../HasChangedBidirectional2.java | 4 +- .../HasChangedBidirectionalTest.java | 10 +- .../HasChangedComponentCollection.java | 4 +- .../HasChangedComponentMapKey.java | 4 +- .../modifiedflags/HasChangedComponents.java | 2 +- .../HasChangedDetachedMultipleCollection.java | 4 +- ...ngedDoubleJoinColumnBidirectionalList.java | 4 +- .../modifiedflags/HasChangedEnumSet.java | 4 +- .../HasChangedForDefaultNotUsing.java | 4 +- .../modifiedflags/HasChangedIdMapKey.java | 4 +- ...hangedInsertUpdateSameTransactionTest.java | 2 +- .../modifiedflags/HasChangedManualFlush.java | 2 +- .../HasChangedManyToOneInComponent.java | 2 +- .../modifiedflags/HasChangedMergeTest.java | 2 +- .../HasChangedNullProperties.java | 4 +- .../HasChangedOneToManyInComponent.java | 4 +- .../modifiedflags/HasChangedStringMap.java | 4 +- .../modifiedflags/HasChangedStringSet.java | 4 +- .../HasChangedUnversionedProperties.java | 2 +- .../modifiedflags/ModifiedFlagSuffix.java | 4 +- .../modifiedflags/entities/EnumEntity.java | 10 +- .../entities/PartialModifiedFlagsEntity.java | 20 +- .../modifiedflags/entities/Professor.java | 20 +- .../modifiedflags/entities/Student.java | 16 +- .../WithModifiedFlagReferencingEntity.java | 8 +- .../modifiedflags/naming/OtherEntity.java | 6 +- .../modifiedflags/naming/OtherEntityId.java | 2 +- .../modifiedflags/naming/SingleIdEntity.java | 6 +- .../modifiedflags/naming/TestEmbeddable.java | 2 +- .../modifiedflags/naming/TestEntity.java | 22 +- .../multiplerelations/Address.java | 14 +- .../multiplerelations/GroupMemberTest.java | 18 +- .../MultipleAssociationsTest.java | 2 +- .../integration/multiplerelations/Person.java | 16 +- .../integration/naming/BasicNaming.java | 2 +- .../naming/DetachedNamingTestEntity.java | 10 +- .../naming/EstonianTableAlias.java | 4 +- .../envers/integration/naming/JoinNaming.java | 4 +- .../naming/JoinNamingRefEdEntity.java | 12 +- .../naming/JoinNamingRefIngEntity.java | 14 +- .../integration/naming/NamingTestEntity1.java | 10 +- .../integration/naming/NamingTestEntity2.java | 10 +- .../naming/OneToManyUnidirectionalNaming.java | 2 +- .../naming/VersionsJoinTableNaming.java | 4 +- .../VersionsJoinTableRangeComponent.java | 10 +- ...ionsJoinTableRangeComponentTestEntity.java | 20 +- ...ionsJoinTableRangeTestAlternateEntity.java | 4 +- .../VersionsJoinTableRangeTestEntity.java | 4 +- ...onsJoinTableRangeTestEntitySuperClass.java | 6 +- .../naming/VersionsJoinTableTestEntity.java | 12 +- .../integration/naming/ids/EmbIdNaming.java | 6 +- .../naming/ids/JoinEmbIdNaming.java | 2 +- .../ids/JoinEmbIdNamingRefEdEntity.java | 12 +- .../ids/JoinEmbIdNamingRefIngEntity.java | 16 +- .../naming/ids/JoinMulIdNaming.java | 4 +- .../ids/JoinMulIdNamingRefEdEntity.java | 12 +- .../ids/JoinMulIdNamingRefIngEntity.java | 16 +- .../integration/naming/ids/MulIdNaming.java | 4 +- .../naming/quotation/QuotedFieldsEntity.java | 8 +- .../naming/quotation/QuotedFieldsTest.java | 2 +- .../EntityResultNativeQueryTest.java | 2 +- .../nativequery/SecondSimpleEntity.java | 6 +- .../integration/nativequery/SimpleEntity.java | 6 +- .../envers/integration/naturalid/Account.java | 12 +- .../integration/naturalid/Customer.java | 12 +- .../envers/integration/naturalid/Device.java | 12 +- .../naturalid/JoinColumnNaturalIdTest.java | 2 +- .../notinsertable/NotInsertable.java | 4 +- .../NotInsertableTestEntity.java | 10 +- .../manytoone/ManyToOneNotInsertable.java | 2 +- .../ManyToOneNotInsertableEntity.java | 14 +- .../manytoone/NotInsertableEntityType.java | 6 +- .../PropertyNotUpdatableEntity.java | 8 +- .../PropertyNotUpdatableTest.java | 2 +- .../onetomany/BasicCollection.java | 4 +- .../integration/onetomany/BasicList.java | 4 +- .../integration/onetomany/BasicSet.java | 2 +- .../onetomany/BasicSetWithEmbId.java | 4 +- .../onetomany/BasicSetWithMulId.java | 4 +- .../onetomany/BasicSetWithNullsDelete.java | 2 +- .../onetomany/BidirectionalMapKey.java | 4 +- .../onetomany/IndexColumnListTest.java | 10 +- .../onetomany/InverseSideChanges.java | 4 +- .../onetomany/OrderColumnListTest.java | 10 +- .../onetomany/RefEdMapKeyEntity.java | 12 +- .../onetomany/RefIngMapKeyEntity.java | 10 +- .../onetomany/detached/BasicDetachedList.java | 4 +- .../onetomany/detached/BasicDetachedSet.java | 2 +- .../detached/BasicDetachedSetWithEmbId.java | 4 +- .../detached/BasicDetachedSetWithMulId.java | 4 +- .../detached/BasicJoinColumnSet.java | 4 +- .../detached/DataChangesDetachedSet.java | 4 +- .../onetomany/detached/DoubleDetachedSet.java | 4 +- .../DoubleJoinColumnBidirectionalList.java | 4 +- .../IndexedJoinColumnBidirectionalList.java | 4 +- ...nceIndexedJoinColumnBidirectionalList.java | 4 +- .../detached/JoinColumnBidirectionalList.java | 2 +- ...olumnBidirectionalListWithInheritance.java | 4 +- .../onetomany/embeddedid/Constant.java | 6 +- .../onetomany/embeddedid/MapsIdTest.java | 4 +- .../embeddedid/OneToManyCompositeKeyTest.java | 30 +- .../onetomany/embeddedid/Person.java | 10 +- .../onetomany/embeddedid/PersonTuple.java | 16 +- .../onetomany/hierarchy/HierarchyTest.java | 4 +- .../integration/onetomany/hierarchy/Node.java | 18 +- .../idclass/ManyToManyCompositeKey.java | 10 +- .../onetomany/idclass/ManyToOneOwned.java | 6 +- .../onetomany/idclass/OneToManyOwned.java | 10 +- .../OneToManyInverseToSuperclassTest.java | 2 +- .../relatedid/AuditRelatedIdInTest.java | 2 +- .../onetomany/relatedid/Company.java | 8 +- .../onetomany/relatedid/Employee.java | 8 +- .../onetoone/bidirectional/BiRefEdEntity.java | 6 +- .../bidirectional/BiRefIngEntity.java | 6 +- .../bidirectional/BiRefedOptionalEntity.java | 8 +- .../bidirectional/BiRefingOptionalEntity.java | 12 +- .../onetoone/bidirectional/Bidirectional.java | 4 +- .../bidirectional/Bidirectional2.java | 4 +- .../BidirectionalEagerAnnotationTest.java | 4 +- .../BidirectionalEagerHbmTest.java | 4 +- .../bidirectional/BidirectionalNoNulls.java | 2 +- .../bidirectional/ids/BiEmbIdRefEdEntity.java | 8 +- .../ids/BiEmbIdRefIngEntity.java | 8 +- .../bidirectional/ids/BiMulIdRefEdEntity.java | 10 +- .../ids/BiMulIdRefIngEntity.java | 10 +- .../bidirectional/ids/EmbIdBidirectional.java | 4 +- .../bidirectional/ids/MulIdBidirectional.java | 4 +- .../primarykeyjoincolumn/Account.java | 12 +- .../AccountNotAuditedOwners.java | 14 +- .../NotAuditedNoProxyPerson.java | 12 +- .../NotAuditedProxyPerson.java | 14 +- .../OneToOneWithPrimaryKeyJoinTest.java | 2 +- .../primarykeyjoincolumn/Person.java | 10 +- .../unidirectional/UniRefEdEntity.java | 4 +- .../unidirectional/UniRefIngEntity.java | 6 +- .../unidirectional/UniRefIngMulIdEntity.java | 6 +- .../unidirectional/Unidirectional.java | 2 +- .../UnidirectionalMulIdWithNulls.java | 4 +- .../UnidirectionalWithNulls.java | 4 +- .../primitive/PrimitiveAddDelete.java | 4 +- .../properties/PropertiesTestEntity.java | 8 +- .../UnversionedOptimisticLockingField.java | 2 +- ...versionedOptimisticLockingFieldEntity.java | 10 +- .../properties/VersionsProperties.java | 4 +- .../proxy/AuditedCollectionProxyTest.java | 2 +- .../integration/proxy/ProxyIdentifier.java | 2 +- .../proxy/RemovedObjectQueryTest.java | 4 +- .../AbstractEntityWithChangesQueryTest.java | 6 +- .../integration/query/AggregateQuery.java | 4 +- .../AssociationEntitiesModifiedQueryTest.java | 8 +- .../AssociationToOneLeftJoinQueryTest.java | 4 +- .../query/CustomRevEntityQuery.java | 4 +- .../integration/query/DeletedEntities.java | 2 +- .../JoinedInheritancePropertyJoinTest.java | 12 +- .../query/MaximalizePropertyQuery.java | 4 +- .../query/NotAuditedQueryTest.java | 4 +- .../integration/query/NullPropertyQuery.java | 4 +- .../query/RevisionConstraintQuery.java | 4 +- .../envers/integration/query/SimpleQuery.java | 2 +- .../integration/query/StoreDeletedData.java | 4 +- .../query/embeddables/EmbeddableQuery.java | 2 +- .../query/embeddables/NameInfo.java | 2 +- .../integration/query/embeddables/Person.java | 6 +- .../integration/query/entities/Address.java | 8 +- .../integration/query/entities/Car.java | 10 +- .../integration/query/entities/Person.java | 8 +- .../query/ids/EmbIdOneToManyQuery.java | 2 +- .../query/ids/MulIdOneToManyQuery.java | 4 +- .../reference/BidirectionalReference.java | 4 +- .../integration/reference/GreetingPO.java | 10 +- .../integration/reference/GreetingSetPO.java | 10 +- .../envers/integration/reventity/Custom.java | 2 +- .../integration/reventity/CustomBoxed.java | 2 +- .../reventity/CustomBoxedRevEntity.java | 8 +- .../reventity/CustomColumnMapping.java | 4 +- .../integration/reventity/CustomDate.java | 4 +- .../reventity/CustomNoListener.java | 4 +- .../reventity/CustomPropertyAccess.java | 4 +- .../reventity/DifferentDBSchemaTest.java | 2 +- .../reventity/ExceptionListener.java | 4 +- .../reventity/ExceptionListenerRevEntity.java | 8 +- .../GloballyConfiguredRevListenerTest.java | 2 +- .../integration/reventity/Inherited.java | 2 +- .../reventity/InheritedRevEntity.java | 2 +- .../integration/reventity/Listener.java | 2 +- .../reventity/ListenerRevEntity.java | 6 +- .../integration/reventity/LongRevNumber.java | 2 +- .../reventity/LongRevNumberRevEntity.java | 10 +- .../reventity/RevisionNumberOverflowTest.java | 6 +- .../AbstractRevisionEntityRemovalTest.java | 2 +- .../CustomTrackingEntitiesTest.java | 2 +- .../DefaultTrackingEntitiesTest.java | 2 +- .../TrackingEntitiesMultipleChangesTest.java | 4 +- .../revfordate/RevisionForDate.java | 2 +- .../sameids/SameIdTestEntity1.java | 6 +- .../sameids/SameIdTestEntity2.java | 6 +- .../envers/integration/sameids/SameIds.java | 2 +- .../integration/secondary/BasicSecondary.java | 4 +- .../secondary/NamingSecondary.java | 2 +- .../secondary/SecondaryNamingTestEntity.java | 10 +- .../secondary/SecondaryTestEntity.java | 12 +- .../secondary/ids/EmbIdSecondary.java | 4 +- .../secondary/ids/MulIdSecondary.java | 4 +- .../ids/SecondaryEmbIdTestEntity.java | 10 +- .../ids/SecondaryMulIdTestEntity.java | 12 +- .../serialization/SerializingCollection.java | 2 +- .../strategy/IdentifierReuseTest.java | 4 +- ...StrategyComponentCollectionRevEndTest.java | 14 +- .../ValidityAuditStrategyManyToManyTest.java | 2 +- ...tyAuditStrategyRevEndTestCustomRevEnt.java | 4 +- .../ValidityAuditStrategyRevEndTsTest.java | 4 +- .../AuditedMethodMappedSuperclass.java | 2 +- .../NotAuditedSubclassEntity.java | 8 +- .../AuditedAllSubclassEntity.java | 6 +- .../MappedSubclassingAllAuditedTest.java | 2 +- .../AuditedMethodSubclassEntity.java | 8 +- .../MappedSubclassingMethodAuditedTest.java | 2 +- .../AuditedAllMappedSuperclass.java | 2 +- .../NotAuditedSubclassEntity.java | 8 +- .../AuditedAllSubclassEntity.java | 6 +- .../MappedSubclassingAllAuditedTest.java | 2 +- .../AuditedMethodSubclassEntity.java | 8 +- .../MappedSubclassingMethodAuditedTest.java | 2 +- .../auditoverride/AuditClassOverrideTest.java | 2 +- .../AuditOverrideAuditJoinTableTest.java | 8 +- .../AuditPropertyOverrideTest.java | 2 +- .../auditoverride/AuditedBaseEntity.java | 6 +- .../auditoverride/AuditedSpecialEntity.java | 2 +- .../superclass/auditoverride/BaseEntity.java | 6 +- .../ClassOverrideAuditedEntity.java | 4 +- .../ClassOverrideNotAuditedEntity.java | 4 +- .../auditoverride/ExtendedBaseEntity.java | 2 +- .../auditoverride/MixedOverrideEntity.java | 2 +- .../auditoverride/MixedOverrideTest.java | 4 +- .../auditoverride/NotAuditedBaseEntity.java | 8 +- .../auditoverride/PropertyOverrideEntity.java | 2 +- .../TransitiveOverrideEntity.java | 2 +- .../auditparents/BabyCompleteEntity.java | 2 +- .../auditparents/ChildCompleteEntity.java | 2 +- .../ChildMultipleParentsEntity.java | 2 +- .../auditparents/ChildSingleParentEntity.java | 2 +- .../ExplicitTransitiveChildEntity.java | 4 +- .../ImplicitTransitiveChildEntity.java | 4 +- .../auditparents/MappedGrandparentEntity.java | 4 +- .../auditparents/MappedParentEntity.java | 4 +- .../MultipleAuditParentsTest.java | 4 +- .../auditparents/SingleAuditParentsTest.java | 4 +- .../auditparents/TotalAuditParentsTest.java | 2 +- .../TransitiveAuditParentsTest.java | 2 +- .../auditparents/TransitiveParentEntity.java | 2 +- .../tools/OrderSequenceGenerationTest.java | 2 +- .../update/SelectBeforeUpdateTest.java | 8 +- .../integrator/BasicIntegratorTest.java | 4 +- .../AbstractEntityManagerTest.java | 2 +- .../performance/ComplexInsertPerformance.java | 2 +- .../InsertsOneTransactionPerformance.java | 4 +- .../performance/InsertsPerformance.java | 2 +- .../performance/UpdatesPerformance.java | 2 +- .../performance/complex/ChildEntity1.java | 8 +- .../performance/complex/ChildEntity2.java | 8 +- .../performance/complex/RootEntity.java | 12 +- .../orm/test/envers/tools/TablePrinter.java | 8 +- .../orm/test/envers/various/Address.java | 10 +- .../orm/test/envers/various/HsqlTest.java | 6 +- .../orm/test/envers/various/Person.java | 10 +- .../envers/EntityManagerFactoryAccess.java | 2 +- .../EnversEntityManagerFactoryProducer.java | 2 +- .../EnversEntityManagerFactoryScope.java | 4 +- .../hikaricp/HikariCPSkipAutoCommitTest.java | 6 +- ...ernate-integrationtest-java-modules.gradle | 2 - .../src/test/java/module-info.java | 2 +- .../java/module/test/entity/Author.java | 8 +- .../module/test/service/AuthorService.java | 2 +- .../hibernate-micrometer.gradle | 2 - .../org/hibernate/stat/HibernateMetrics.java | 4 +- .../java/org/hibernate/test/stat/Account.java | 8 +- .../org/hibernate/test/stat/AccountId.java | 2 +- .../stat/MicrometerCacheStatisticsTest.java | 10 +- hibernate-spatial/hibernate-spatial.gradle | 33 +- .../hibernate/spatial/JTSGeometryType.java | 2 +- .../predicate/GeolatteFilterPredicate.java | 4 +- .../predicate/GeolatteSpatialPredicates.java | 6 +- .../spatial/predicate/JTSFilterPredicate.java | 4 +- .../predicate/JTSSpatialPredicates.java | 6 +- .../hana/TestHANASpatialFunctions.java | 2 +- .../spatial/dialect/postgis/PostgisTest.java | 8 +- .../postgis/hhh14523/DirtyCheckingTest.java | 18 +- .../integration/StoreAndRetrieveTests.java | 2 +- .../predicates/SpatialPredicatesTest.java | 8 +- .../testing/SpatialFunctionalTestCase.java | 2 +- .../testing/converter/GeometryConverter.java | 4 +- .../spatial/testing/converter/MyEntity.java | 8 +- .../testing/converter/package-info.java | 2 +- .../spatial/testing/domain/GeomEntity.java | 6 +- .../spatial/testing/domain/JtsGeomEntity.java | 6 +- .../hibernate-testing-jakarta.gradle | 159 ---- hibernate-testing/hibernate-testing.gradle | 26 +- .../jta/JtaAwareConnectionProviderImpl.java | 4 +- .../testing/jta/TestingJtaPlatformImpl.java | 8 +- .../junit4/BaseCoreFunctionalTestCase.java | 6 +- .../BaseNonConfigCoreFunctionalTestCase.java | 2 +- .../testing/junit4/BaseUnitTestCase.java | 2 +- .../testing/junit4/CustomParameterized.java | 6 +- .../testing/junit4/CustomRunner.java | 2 +- .../orm/domain/DomainModelDescriptor.java | 2 +- .../testing/orm/domain/MappingFeature.java | 2 +- .../orm/domain/MonetaryAmountConverter.java | 4 +- .../testing/orm/domain/animal/Address.java | 6 +- .../testing/orm/domain/animal/Animal.java | 18 +- .../testing/orm/domain/animal/Cat.java | 4 +- .../testing/orm/domain/animal/Dog.java | 4 +- .../orm/domain/animal/DomesticAnimal.java | 8 +- .../testing/orm/domain/animal/Human.java | 24 +- .../testing/orm/domain/animal/Lizard.java | 4 +- .../testing/orm/domain/animal/Mammal.java | 8 +- .../testing/orm/domain/animal/Name.java | 4 +- .../testing/orm/domain/animal/PettingZoo.java | 4 +- .../testing/orm/domain/animal/Reptile.java | 4 +- .../orm/domain/animal/StateProvince.java | 4 +- .../testing/orm/domain/animal/Zoo.java | 30 +- .../testing/orm/domain/contacts/Address.java | 2 +- .../testing/orm/domain/contacts/Contact.java | 22 +- .../orm/domain/contacts/PhoneNumber.java | 2 +- .../orm/domain/gambit/BasicEntity.java | 4 +- .../testing/orm/domain/gambit/Component.java | 2 +- .../orm/domain/gambit/EmbeddedIdEntity.java | 6 +- .../orm/domain/gambit/EntityOfArrays.java | 8 +- .../orm/domain/gambit/EntityOfBasics.java | 22 +- .../orm/domain/gambit/EntityOfComposites.java | 6 +- .../orm/domain/gambit/EntityOfLists.java | 20 +- .../orm/domain/gambit/EntityOfMaps.java | 26 +- .../orm/domain/gambit/EntityOfSets.java | 24 +- .../domain/gambit/EntityWithAggregateId.java | 6 +- .../EntityWithLazyManyToOneSelfReference.java | 12 +- .../domain/gambit/EntityWithLazyOneToOne.java | 8 +- .../gambit/EntityWithManyToOneJoinTable.java | 14 +- .../EntityWithManyToOneSelfReference.java | 10 +- .../EntityWithManyToOneWithoutJoinTable.java | 6 +- .../EntityWithNonIdAttributeNamedId.java | 4 +- .../gambit/EntityWithNotAggregateId.java | 6 +- .../domain/gambit/EntityWithOneToMany.java | 12 +- .../gambit/EntityWithOneToManyNotOwned.java | 6 +- .../orm/domain/gambit/EntityWithOneToOne.java | 6 +- .../gambit/EntityWithOneToOneJoinTable.java | 10 +- .../EntityWithOneToOneSharingPrimaryKey.java | 10 +- .../orm/domain/gambit/EnumValueConverter.java | 2 +- .../testing/orm/domain/gambit/Shirt.java | 14 +- .../orm/domain/gambit/SimpleComponent.java | 2 +- .../orm/domain/gambit/SimpleEntity.java | 10 +- .../testing/orm/domain/helpdesk/Account.java | 14 +- .../testing/orm/domain/helpdesk/Incident.java | 8 +- .../testing/orm/domain/helpdesk/Ticket.java | 6 +- .../orm/domain/retail/CardPayment.java | 2 +- .../orm/domain/retail/CashPayment.java | 2 +- .../orm/domain/retail/DomesticVendor.java | 4 +- .../orm/domain/retail/ForeignVendor.java | 4 +- .../testing/orm/domain/retail/LineItem.java | 8 +- .../testing/orm/domain/retail/Name.java | 2 +- .../testing/orm/domain/retail/Order.java | 10 +- .../testing/orm/domain/retail/Payment.java | 10 +- .../testing/orm/domain/retail/Product.java | 8 +- .../orm/domain/retail/SalesAssociate.java | 6 +- .../testing/orm/domain/retail/Vendor.java | 12 +- .../jpa/PersistenceUnitDescriptorAdapter.java | 6 +- .../orm/jpa/PersistenceUnitInfoAdapter.java | 10 +- .../orm/jpa/PersistenceUnitInfoImpl.java | 10 +- .../AbstractEntityManagerFactoryScope.java | 10 +- .../testing/orm/junit/DomainModel.java | 2 +- ...tityManagerFactoryBasedFunctionalTest.java | 10 +- .../junit/EntityManagerFactoryExtension.java | 4 +- ...EntityManagerFactoryParameterResolver.java | 2 +- .../junit/EntityManagerFactoryProducer.java | 2 +- .../orm/junit/EntityManagerFactoryScope.java | 4 +- .../EntityManagerFactoryScopeExtension.java | 2 +- .../org/hibernate/testing/orm/junit/Jpa.java | 6 +- .../orm/logger/LoggerInspectionExtension.java | 6 +- .../orm/transaction/TransactionUtil.java | 4 +- .../testing/transaction/TransactionUtil.java | 18 +- .../hibernate/testing/util/ExceptionUtil.java | 4 +- .../jpa/DelegatingPersistenceUnitInfo.java | 10 +- .../util/jpa/PersistenceUnitInfoAdapter.java | 10 +- .../PersistenceUnitInfoPropertiesWrapper.java | 10 +- .../testing/annotations/AnEntity.java | 6 +- .../hibernate-transaction-client.gradle | 46 -- .../ViburDBCPConnectionProviderTest.java | 6 +- .../jaxb2-basics-ant-patched-sources.jar | Bin 0 -> 2733 bytes .../jaxb2-basics/jaxb2-basics-ant-patched.jar | Bin 0 -> 3057 bytes .../jaxb2-basics-patched-sources.jar | Bin 0 -> 73074 bytes .../jaxb2-basics/jaxb2-basics-patched.jar | Bin 0 -> 143089 bytes .../jaxb2-basics-plugins-patched-sources.jar | Bin 0 -> 2722 bytes .../jaxb2-basics-plugins-patched.jar | Bin 0 -> 2000929 bytes .../jaxb2-basics-runtime-patched-sources.jar | Bin 0 -> 104579 bytes .../jaxb2-basics-runtime-patched.jar | Bin 0 -> 168437 bytes .../jaxb2-basics-tools-patched-sources.jar | Bin 0 -> 76706 bytes .../jaxb2-basics-tools-patched.jar | Bin 0 -> 142152 bytes release/release.gradle | 43 +- settings.gradle | 13 +- .../hibernate-enhance-maven-plugin.gradle | 36 +- .../orm/tooling/maven/ChildEntity.java | 2 +- .../orm/tooling/maven/ParentEntity.java | 2 +- .../orm/tooling/maven/TestEntity.java | 4 +- .../hibernate-gradle-plugin.gradle | 11 +- .../orm/tooling/gradle/HibernateOrmSpec.java | 2 +- .../gradle/enhance/EnhancementSpec.java | 2 +- .../gradle/enhance/EnhancementTask.java | 2 +- .../metamodel/JpaMetamodelGenerationSpec.java | 2 +- .../metamodel/JpaMetamodelGenerationTask.java | 12 +- .../model/JpaStaticMetamodelGenerator.java | 2 +- .../metamodel/model/MetamodelClass.java | 6 +- .../simple/src/main/java/TheEmbeddable.java | 4 +- .../simple/src/main/java/TheEntity.java | 16 +- .../hibernate-jpamodelgen-jakarta.gradle | 82 -- .../hibernate-jpamodelgen.gradle | 13 +- .../hibernate/jpamodelgen/ClassWriter.java | 2 +- .../JPAMetaModelEntityProcessor.java | 2 +- .../AnnotationMetaSingleAttribute.java | 2 +- .../hibernate/jpamodelgen/util/Constants.java | 72 +- ...ontextProvidingValidationEventHandler.java | 6 +- .../jpamodelgen/util/xml/XmlParserHelper.java | 6 +- .../jpamodelgen/xml/JpaDescriptorParser.java | 8 +- .../jpamodelgen/xml/XmlMetaEntity.java | 10 +- .../xml/XmlMetaSingleAttribute.java | 2 +- .../src/test/java/DefaultPackageEntity.java | 4 +- .../jpamodelgen/test/accesstype/Address.java | 10 +- .../jpamodelgen/test/accesstype/Area.java | 2 +- .../jpamodelgen/test/accesstype/Building.java | 2 +- .../jpamodelgen/test/accesstype/Country.java | 2 +- .../jpamodelgen/test/accesstype/Customer.java | 8 +- .../jpamodelgen/test/accesstype/Detail.java | 2 +- .../test/accesstype/Hominidae.java | 6 +- .../jpamodelgen/test/accesstype/Hotel.java | 4 +- .../test/accesstype/HotelRoom.java | 4 +- .../jpamodelgen/test/accesstype/House.java | 4 +- .../jpamodelgen/test/accesstype/Human.java | 2 +- .../test/accesstype/Inhabitant.java | 8 +- .../jpamodelgen/test/accesstype/Item.java | 8 +- .../test/accesstype/LivingBeing.java | 6 +- .../jpamodelgen/test/accesstype/Mammals.java | 4 +- .../jpamodelgen/test/accesstype/Pet.java | 2 +- .../jpamodelgen/test/accesstype/Product.java | 8 +- .../jpamodelgen/test/accesstype/Room.java | 4 +- .../jpamodelgen/test/accesstype/Shop.java | 4 +- .../jpamodelgen/test/accesstype/User.java | 6 +- .../jpamodelgen/test/arraytype/Image.java | 2 +- .../test/arraytype/TemperatureSamples.java | 2 +- .../test/arraytype/TestEntity.java | 4 +- .../jpamodelgen/test/blob/BlobEntity.java | 8 +- .../collectionbasictype/ConcreteLike.java | 4 +- .../test/collectionbasictype/EnumHolder.java | 2 +- .../test/collectionbasictype/Goods.java | 10 +- .../test/collectionbasictype/Item.java | 10 +- .../ItemRoleConverter.java | 2 +- .../test/collectionbasictype/Like.java | 8 +- .../test/collectionbasictype/Person.java | 4 +- .../test/collectionbasictype/PersonPhone.java | 4 +- .../test/collectionbasictype/PhoneBook.java | 4 +- .../test/collectionbasictype/Product.java | 4 +- .../collectionbasictype/RoleExternal.java | 2 +- .../collectionbasictype/RoleInternal.java | 2 +- .../StringToListConverter.java | 2 +- .../StringToUppercaseConverter.java | 2 +- .../test/elementcollection/Cleaner.java | 4 +- .../test/elementcollection/Homework.java | 2 +- .../test/elementcollection/Hostel.java | 4 +- .../test/elementcollection/Hotel.java | 12 +- .../test/elementcollection/House.java | 6 +- .../elementcollection/OfficeBuilding.java | 4 +- .../OfficeBuildingValidated.java | 4 +- .../test/elementcollection/Room.java | 2 +- .../jpamodelgen/test/embeddable/Base.java | 4 +- .../test/embeddable/EmbeddableEntity.java | 4 +- .../jpamodelgen/test/embeddable/MyEntity.java | 4 +- .../test/embeddable/SimpleEmbeddable.java | 2 +- .../test/embeddable/SimpleEntity.java | 8 +- .../jpamodelgen/test/embeddable/Stuff.java | 2 +- .../embeddable/generics/ChildEmbeddable.java | 2 +- .../embeddable/generics/ParentEmbeddable.java | 2 +- .../withinheritance/TestEntity.java | 8 +- .../embeddedid/withoutinheritance/Person.java | 4 +- .../withoutinheritance/PersonId.java | 2 +- .../test/generatedannotation/TestEntity.java | 4 +- .../jpamodelgen/test/generics/Child.java | 8 +- .../jpamodelgen/test/generics/Parent.java | 16 +- .../jpamodelgen/test/hashcode/HashEntity.java | 4 +- .../inheritance/basic/AbstractEntity.java | 6 +- .../test/inheritance/basic/Area.java | 2 +- .../test/inheritance/basic/Building.java | 2 +- .../test/inheritance/basic/Customer.java | 2 +- .../test/inheritance/basic/House.java | 4 +- .../test/inheritance/basic/Person.java | 2 +- .../test/inheritance/basic/User.java | 6 +- .../inheritance/deep/DeepInheritanceTest.java | 0 .../test/inheritance/deep/JetPlane.java | 6 +- .../inheritance/deep/PersistenceBase.java | 4 +- .../test/inheritance/deep/Plane.java | 16 +- .../unmappedclassinhierarchy/BaseEntity.java | 14 +- .../unmappedclassinhierarchy/MappedBase.java | 6 +- .../unmappedclassinhierarchy/SubA.java | 6 +- .../unmappedclassinhierarchy/SubB.java | 6 +- .../EmbeddableAndMappedSuperClass.java | 4 +- .../ConcreteProduct.java | 4 +- .../mappedsuperclasswithoutid/Product.java | 4 +- .../mappedsuperclasswithoutid/Shop.java | 4 +- .../AttachmentGroup.java | 6 +- .../AttachmentGroupInTopic.java | 2 +- .../AttachmentGroupPost.java | 2 +- .../AttachmentGroupPostInTopic.java | 2 +- .../typedmappedsuperclass/Post.java | 2 +- .../typedmappedsuperclass/UserRole.java | 2 +- .../test/mixedmode/Coordinates.java | 2 +- .../jpamodelgen/test/mixedmode/Insurance.java | 2 +- .../jpamodelgen/test/mixedmode/Location.java | 10 +- .../jpamodelgen/test/mixedmode/Person.java | 6 +- .../jpamodelgen/test/mixedmode/RentalCar.java | 2 +- .../test/mixedmode/RentalCompany.java | 6 +- .../jpamodelgen/test/mixedmode/Vehicle.java | 6 +- .../test/mixedmode/ZeroCoordinates.java | 2 +- .../test/rawtypes/DeskWithRawType.java | 14 +- .../test/rawtypes/EmployeeWithRawType.java | 10 +- .../test/separatecompilationunits/Entity.java | 2 +- .../superclass/MappedSuperclass.java | 4 +- .../test/sortedcollection/PrintJob.java | 8 +- .../test/sortedcollection/Printer.java | 8 +- .../test/supresswarnings/TestEntity.java | 4 +- .../test/targetannotation/Address.java | 2 +- .../test/targetannotation/House.java | 6 +- .../test/usertype/ContactDetails.java | 4 +- .../jpamodelgen/test/util/TestUtil.java | 4 +- .../jpamodelgen/test/xmlembeddable/Foo.java | 4 +- .../jpamodelgen/test/xmlmapped/Building.java | 2 +- .../jpamodelgen/test/xmlmapped/Superhero.java | 6 +- .../xmlmetacomplete/multiplepus/Dummy.java | 4 +- .../test/xmlmetacomplete/singlepu/Dummy.java | 4 +- 5422 files changed, 24721 insertions(+), 25479 deletions(-) delete mode 100644 hibernate-core-jakarta/hibernate-core-jakarta.gradle mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/CacheMode.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/ScrollMode.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/SessionException.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/StaleStateException.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/StatelessSession.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/action/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/cfg/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/classic/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/collection/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/dialect/function/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/dialect/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/internal/JoinHelper.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/internal/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEventListener.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/exception/DataException.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/exception/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/id/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/jdbc/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/loader/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/Backref.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/mapping/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/persister/collection/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/persister/entity/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/persister/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/pretty/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/proxy/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/query/sqm/function/PatternBasedSqmFunctionDescriptor.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/sql/DerbyCaseFragment.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/sql/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/CacheRegionStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/CollectionStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/EntityStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/QueryStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/SecondLevelCacheStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/SessionStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/Statistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/internal/CategorizedStatistics.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/internal/SessionStatisticsImpl.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/stat/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidatorTask.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/transform/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tuple/DynamicMapInstantiator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/tuple/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/AdaptedImmutableType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/CustomCollectionType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/EmbeddedComponentType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/OrderedMapType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/OrderedSetType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/type/package.html mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/usertype/EnhancedUserType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/usertype/UserVersionType.java mode change 100755 => 100644 hibernate-core/src/main/java/org/hibernate/usertype/package.html rename hibernate-core/src/main/resources/META-INF/services/{javax.persistence.spi.PersistenceProvider => jakarta.persistence.spi.PersistenceProvider} (100%) mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/jpa/test/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/File.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/Folder.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/SymbolicLink.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/File.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/Folder.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SymbolicLink.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/File.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/Folder.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/union/SymbolicLink.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/array/A.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/array/A.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/array/B.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Auction2.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/AuctionTest2.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/bidi/Bid.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cascade/A.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cascade/G.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cascade/H.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/LineItem.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Order.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/cid/Product.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Email.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/Permission.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/UserPermissions.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ecid/Course.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ecid/UniversityCourse.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/idbag/Group.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/idbag/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/idbag/UserGroup.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/Contract.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ContractVariation.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/ContractVariation.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/iterate/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/join/SecondaryTableTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/EntityManagerFactoryUnwrapTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ComponentJoinTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/EmbeddedType.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/Entity.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/components/joins/ManyToOneType.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/paths/SingularAttributeJoinTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/Node.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/NumberedNode.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/PersistTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/Group.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/UserGroup.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/UserGroupBatchLoad.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/map/Group.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/map/SessionAttribute.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/map/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/map/UserGroup.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/Group.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/UserGroup.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/math/Math.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/Salesperson.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Entity.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Org.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Entity.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Org.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/singletable/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/Node.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/NumberedNode.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/optlock/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/optlock/PublicationDate.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/ordered/Search.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Part.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/orphan/Product.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/querycache/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/sorted/SortTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/stateless/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/version/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/version/PersonThing.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/version/Task.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/version/Thing.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventory.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/CustomerInventoryPK.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/IdClassGeneratedValueManyToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e1/b2/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/batchfetch/BatchFetchTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/batchfetch/Model.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/batchfetch/ProductLine.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/cuk/Account.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/cuk/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/cuk/CompositePropertyRefTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/cuk/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/cuk/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/hql/DomesticAnimal.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/hql/Human.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/hql/Name.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/hql/PettingZoo.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/hql/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/idclass/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/idclass/CustomerId.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/idclass/IdClassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/CollectionInterceptor.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/InterceptorTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/Log.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/PropertyInterceptor.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/StatefulInterceptor.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/User.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interceptor/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentImpl.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Folder.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/FolderImpl.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/InterfaceProxyTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/ItemImpl.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocument.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/SecureDocumentImpl.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/JoinedSubclassTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinedsubclass/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/Bid.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/Category.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/Comment.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/Group.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/ItemBid.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/JoinFetchTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/joinfetch/UserGroup.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Employment.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Part.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mapcompelem/Product.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mapcompelem/ProductPart.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/Document.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/Folder.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/Item.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/Item.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/MixedTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/mixed/SecureDocument.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/onetomany/Child.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/onetomany/OneToManyTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/onetomany/Parent.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/proxy/DataPoint.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/proxy/ProxyTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/Course.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/DataPoint.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/Enrolment.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/Student.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/readonly/TextHolder.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/rowid/Point.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/rowid/Point.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/rowid/RowIdType.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselect/Alien.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselect/Being.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselect/Beings.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselect/Human.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselect/SubselectTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Child.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselectfetch/Parent.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/ternary/Employee.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/ternary/Site.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/ternary/Ternary.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/ternary/TernaryTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/timestamp/Person.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/timestamp/TimestampTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/timestamp/User.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/timestamp/User.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/tm/Item.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/AddressId.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Address.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedonetoone/AddressId.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedonetoone/Customer.java mode change 100755 => 100644 hibernate-core/src/test/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java mode change 100755 => 100644 hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/ops/Node.hbm.xml mode change 100755 => 100644 hibernate-core/src/test/resources/org/hibernate/test/subselectfetch/ParentChild.hbm.xml mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/Course.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/CriteriaQueryTest.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.hbm.xml mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/Enrolment.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/Foo.hbm.xml mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/Student.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Country.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/Person.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/UsState.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/criteria/limitexpression/domain.hbm.xml mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/hql/EJBQLTest.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/iterate/IterateTest.java mode change 100755 => 100644 hibernate-core/src/test_legacy/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java delete mode 100644 hibernate-envers-jakarta/hibernate-envers-jakarta.gradle mode change 100755 => 100644 hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java mode change 100755 => 100644 hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java delete mode 100644 hibernate-testing-jakarta/hibernate-testing-jakarta.gradle mode change 100755 => 100644 hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/DomesticAnimal.java mode change 100755 => 100644 hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Human.java mode change 100755 => 100644 hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/Name.java mode change 100755 => 100644 hibernate-testing/src/main/java/org/hibernate/testing/orm/domain/animal/PettingZoo.java delete mode 100644 hibernate-transaction-client/hibernate-transaction-client.gradle create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-ant-patched-sources.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-ant-patched.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-patched-sources.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-patched.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched-sources.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-plugins-patched.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched-sources.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-runtime-patched.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-tools-patched-sources.jar create mode 100644 patched-libs/jaxb2-basics/jaxb2-basics-tools-patched.jar delete mode 100644 tooling/metamodel-generator-jakarta/hibernate-jpamodelgen-jakarta.gradle mode change 100755 => 100644 tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/DeepInheritanceTest.java mode change 100755 => 100644 tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/JetPlane.java mode change 100755 => 100644 tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/PersistenceBase.java mode change 100755 => 100644 tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/inheritance/deep/Plane.java diff --git a/build.gradle b/build.gradle index 119b0a19b8..17235aad12 100644 --- a/build.gradle +++ b/build.gradle @@ -22,16 +22,17 @@ buildscript { plugins { + id 'org.hibernate.build.xjc-jakarta' version '1.0.2' apply false + id 'org.hibernate.matrix-test' version '3.1.1' apply false + id 'org.hibernate.orm.database-service' version '1.0.0-SNAPSHOT' apply false + id 'io.github.gradle-nexus.publish-plugin' version '1.1.0' id 'nu.studer.credentials' version '2.1' - id 'org.hibernate.orm.database-service' version '1.0.0-SNAPSHOT' apply false id 'idea' id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0' id 'eclipse' - id 'org.hibernate.build.xjc' version '2.2.0' apply false - id 'org.hibernate.matrix-test' version '3.1.1' apply false id 'biz.aQute.bnd' version '5.1.1' apply false } diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 0055e0ff3e..ad62868ab1 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -19,9 +19,10 @@ def projectsToIncludeInAggregatedJavadoc = [ ':hibernate-c3p0', ':hibernate-graalvm', ':hibernate-hikaricp', - ':hibernate-jcache', +// ':hibernate-jcache', ':hibernate-micrometer', ':hibernate-proxool', + ':hibernate-spatial', ':hibernate-vibur', ':hibernate-gradle-plugin', ':hibernate-enhance-maven-plugin', @@ -48,10 +49,8 @@ dependencies { testImplementation project(':hibernate-testing') testImplementation project(':hibernate-envers') - // todo (6.0) - add back hibernate-spatial dependency - //testImplementation project(':hibernate-spatial') - testImplementation project( ':hibernate-jcache' ) - testImplementation libraries.jcache + testImplementation project(':hibernate-spatial') +// testImplementation project( ':hibernate-jcache' ) testImplementation project( path: ':hibernate-core', configuration: 'tests' ) testImplementation 'org.apache.commons:commons-lang3:3.4' diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc index 6c4a588e81..f92f90e256 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc @@ -36,9 +36,9 @@ public class Event { ---- ==== -The `@javax.persistence.Entity` annotation is used to mark a class as an entity. It functions the same as the +The `@jakarta.persistence.Entity` annotation is used to mark a class as an entity. It functions the same as the `` mapping element discussed in <>. Additionally the -`@javax.persistence.Table` annotation explicitly specifies the table name. Without this specification, the default +`@jakarta.persistence.Table` annotation explicitly specifies the table name. Without this specification, the default table name would be _EVENT_. @@ -56,9 +56,9 @@ public Long getId() { ---- ==== -`@javax.persistence.Id` marks the property which defines the entity's identifier. +`@jakarta.persistence.Id` marks the property which defines the entity's identifier. -`@javax.persistence.GeneratedValue` and `@org.hibernate.annotations.GenericGenerator` work in tandem +`@jakarta.persistence.GeneratedValue` and `@org.hibernate.annotations.GenericGenerator` work in tandem to indicate that Hibernate should use Hibernate's `increment` generation strategy for this entity's identifier values. diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc index 9a9f58ee31..ae2920ddf7 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc @@ -47,7 +47,7 @@ public void testBasicUsage() { ==== We see that an `org.hibernate.envers.AuditReader` is obtained from the `org.hibernate.envers.AuditReaderFactory` -which wraps the `javax.persistence.EntityManager`. +which wraps the `jakarta.persistence.EntityManager`. Next, the `find` method retrieves specific revisions of the entity. The first call says to find revision number 1 of Event with id 2. The second call says to find revision number 2 of Event with id 2. diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc index 9230becf7f..0fe62c449a 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc @@ -35,12 +35,15 @@ is required to locate all JPA configuration files by classpath lookup of the `ME ==== `persistence.xml` files should provide a unique name for each "persistence unit". Applications use this name to -reference the configuration when obtaining an `javax.persistence.EntityManagerFactory` reference. +reference the configuration when obtaining an `jakarta.persistence.EntityManagerFactory` reference. The settings defined in the `` element are discussed in <>. -Here the `javax.persistence`-prefixed varieties are used when possible. Notice that the remaining +Here the `jakarta.persistence`-prefixed varieties are used when possible. Notice that the remaining Hibernate-specific configuration setting names are now prefixed with `hibernate.`. +NOTE:: Configuration properties prefixed with the legacy Java EE "namespace" (`javax.persistence.*`) are also still +supported, although the Jakarta EE version (`jakarta.persistence.*`) should be preferred + Additionally, the `` element functions the same as we saw in <>. @@ -56,7 +59,7 @@ The entity is exactly the same as in <>. The `javax.persistence.EntityManager` interface +The code is similar to <>. The `jakarta.persistence.EntityManager` interface is used instead of the `org.hibernate.Session` interface. JPA calls this operation "persist" instead of "save". diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java index c66349f9eb..d5f3c35410 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.annotations; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; @@ -80,4 +80,4 @@ public class Event { public void setTitle(String title) { this.title = title; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java index feebd89a57..645c4baeca 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java @@ -25,9 +25,9 @@ package org.hibernate.tutorial.em; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.TestCase; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java index 90fe4144f3..253d44bd98 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.em; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; @@ -80,4 +80,4 @@ public class Event { public void setTitle(String title) { this.title = title; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml index 0fc9523813..02a161f6cc 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml +++ b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml @@ -17,10 +17,10 @@ org.hibernate.tutorial.em.Event - - - - + + + + diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java index 5e29faa6b9..d821a1182e 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java @@ -25,9 +25,9 @@ package org.hibernate.tutorial.envers; import java.util.Date; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; import junit.framework.TestCase; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java index 64741a617a..36dcc05866 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java @@ -24,13 +24,13 @@ package org.hibernate.tutorial.envers; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; import org.hibernate.envers.Audited; @@ -89,4 +89,4 @@ public class Event { result = 31 * result + date.hashCode(); return result; } -} \ No newline at end of file +} diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml index 45a7dafe73..0e9e34af0f 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml +++ b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml @@ -17,10 +17,10 @@ org.hibernate.tutorial.envers.Event - - - - + + + + diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java index f324889603..d8f858ae87 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java @@ -22,7 +22,7 @@ package org.hibernate.osgitest; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.osgitest.entity.DataPoint; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2a566d8829..62b9921048 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Brett Meyer diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java index dba3609e97..3e69fbe408 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java @@ -22,7 +22,7 @@ package org.hibernate.osgitest; import java.util.List; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.osgitest.entity.DataPoint; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java index 0927f15f7d..a381075068 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2a566d8829..62b9921048 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -20,9 +20,9 @@ */ package org.hibernate.osgitest.entity; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; /** * @author Brett Meyer diff --git a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java index 2e5ef72422..227ba87474 100644 --- a/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java @@ -22,9 +22,9 @@ package org.hibernate.osgitest.entity; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.envers.Audited; diff --git a/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc b/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc index 7ac9b4d814..317cf8aa7b 100644 --- a/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc +++ b/documentation/src/main/asciidoc/topical/bootstrap/JpaBootstrapping.adoc @@ -10,9 +10,9 @@ the _Native Bootstrapping_ guide as well. == JPA-compliant bootstrapping -In JPA we are ultimately interested in bootstrapping an `javax.persistence.EntityManagerFactory` instance. The +In JPA we are ultimately interested in bootstrapping an `jakarta.persistence.EntityManagerFactory` instance. The JPA specification defines 2 primary standardized bootstrap approaches depending on how the application intends to -access the `javax.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms "EE" and +access the `jakarta.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms "EE" and "SE" for these 2 approaches, but those terms are very misleading in this context. What the JPA spec calls EE bootstrapping is cases where a container (EE, OSGi, etc) will manage and inject the persistence context on behalf of the application. What it calls SE bootstrapping is everything else. We will use the terms @@ -27,7 +27,7 @@ respectively. The container will build an `EntityManagerFactory` for each persistent-unit defined in the deployment's `META-INF/persistence.xml` and make that available to the application for injection via the -`javax.persistence.PersistenceUnit` annotation or via JNDI lookup. +`jakarta.persistence.PersistenceUnit` annotation or via JNDI lookup. [[container-bootstrap-injection-example]] .Injecting a EntityManagerFactory @@ -43,7 +43,7 @@ EntityManagerFactory emf; === Application-bootstrapping Rather than something a container building the `EntityManagerFactory` for the application, the application -can build the `EntityManagerFactory` using the `javax.persistence.Persistence` bootstrap class. The application +can build the `EntityManagerFactory` using the `jakarta.persistence.Persistence` bootstrap class. The application creates an entity manager factory by calling the createEntityManagerFactory method: [[application-bootstrap-example]] diff --git a/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc b/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc index 9aba27c3dc..48f0006916 100644 --- a/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc +++ b/documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc @@ -126,7 +126,7 @@ package p is created. managed class by appending "_" to the name of the managed class. * The metamodel class X_ must be annotated with the -`javax.persistence.StaticMetamodel` annotation. +`jakarta.persistence.StaticMetamodel` annotation. * If class X extends another class S, where S is the most derived managed class (i.e., entity or mapped superclass) extended by X, then @@ -160,7 +160,7 @@ a declaration as follows: + where K is the type of the key of the map in class X -Import statements must be included for the needed `javax.persistence.metamodel` types as +Import statements must be included for the needed `jakarta.persistence.metamodel` types as appropriate and all classes X, Y, Z, and K. [[chapter-usage]] diff --git a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc index 3c75a14c04..df1d660abd 100644 --- a/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc +++ b/documentation/src/main/asciidoc/userguide/Hibernate_User_Guide.adoc @@ -27,7 +27,6 @@ include::chapters/query/criteria/Criteria.adoc[] include::chapters/query/native/Native.adoc[] include::chapters/query/spatial/Spatial.adoc[] include::chapters/multitenancy/MultiTenancy.adoc[] -include::chapters/osgi/OSGi.adoc[] include::chapters/envers/Envers.adoc[] include::chapters/portability/Portability.adoc[] include::chapters/statistics/Statistics.adoc[] @@ -38,7 +37,6 @@ include::appendices/BestPractices.adoc[] include::appendices/Legacy_Bootstrap.adoc[] include::appendices/Legacy_DomainModel.adoc[] include::appendices/LegacyBasicTypeResolution.adoc[] -include::appendices/Legacy_Criteria.adoc[] include::appendices/Legacy_Native_Queries.adoc[] include::Bibliography.adoc[] diff --git a/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc index d5e7825abf..a02389f719 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Annotations.adoc @@ -670,7 +670,7 @@ See the <> chapter for more info. The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Cascade.html[`@Cascade`] annotation is used to apply the Hibernate specific https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/CascadeType.html[`CascadeType`] strategies (e.g. `CascadeType.LOCK`, `CascadeType.SAVE_UPDATE`, `CascadeType.REPLICATE`) on a given association. -For JPA cascading, prefer using the {jpaJavadocUrlPrefix}CascadeType.html[`javax.persistence.CascadeType`] instead. +For JPA cascading, prefer using the {jpaJavadocUrlPrefix}CascadeType.html[`jakarta.persistence.CascadeType`] instead. When combining both JPA and Hibernate `CascadeType` strategies, Hibernate will merge both sets of cascades. diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc index a5d5390c4f..f67cdefc08 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc @@ -38,24 +38,24 @@ Note that for backward compatibility, if a `CurrentSessionContext` is not config === JPA compliance `*hibernate.jpa.compliance.transaction*` (e.g. `true` or `false` (default value)):: -This setting controls if Hibernate `Transaction` should behave as defined by the spec for JPA's `javax.persistence.EntityTransaction` +This setting controls if Hibernate `Transaction` should behave as defined by the spec for JPA's `jakarta.persistence.EntityTransaction` since it extends the JPA one. `*hibernate.jpa.compliance.query*` (e.g. `true` or `false` (default value)):: -Controls whether Hibernate's handling of `javax.persistence.Query` (JPQL, Criteria and native query) should strictly follow the JPA spec. +Controls whether Hibernate's handling of `jakarta.persistence.Query` (JPQL, Criteria and native query) should strictly follow the JPA spec. + -This includes both in terms of parsing or translating a query as well as calls to the `javax.persistence.Query` methods throwing spec +This includes both in terms of parsing or translating a query as well as calls to the `jakarta.persistence.Query` methods throwing spec defined exceptions whereas Hibernate might not. `*hibernate.jpa.compliance.list*` (e.g. `true` or `false` (default value)):: Controls whether Hibernate should recognize what it considers a "bag" (`org.hibernate.collection.internal.PersistentBag`) as a List (`org.hibernate.collection.internal.PersistentList`) or as a bag. + -If enabled, we will recognize it as a List where `javax.persistence.OrderColumn` +If enabled, we will recognize it as a List where `jakarta.persistence.OrderColumn` is just missing (and its defaults will apply). `*hibernate.jpa.compliance.closed*` (e.g. `true` or `false` (default value)):: -JPA defines specific exceptions upon calling specific methods on `javax.persistence.EntityManager` and `javax.persistence.EntityManagerFactory` +JPA defines specific exceptions upon calling specific methods on `jakarta.persistence.EntityManager` and `jakarta.persistence.EntityManagerFactory` objects which have been closed previously. + This setting controls whether the JPA spec-defined behavior or the Hibernate behavior will be used. @@ -63,7 +63,7 @@ This setting controls whether the JPA spec-defined behavior or the Hibernate beh If enabled, Hibernate will operate in the JPA specified way, throwing exceptions when the spec says it should. `*hibernate.jpa.compliance.proxy*` (e.g. `true` or `false` (default value)):: -The JPA spec says that a `javax.persistence.EntityNotFoundException` should be thrown when accessing an entity proxy +The JPA spec says that a `jakarta.persistence.EntityNotFoundException` should be thrown when accessing an entity proxy which does not have an associated table row in the database. + Traditionally, Hibernate does not initialize an entity proxy when accessing its identifier since we already know the identifier value, @@ -82,16 +82,16 @@ with the same name will cause a `java.lang.IllegalArgumentException` to be throw [[configurations-database-connection]] === Database connection properties -`*hibernate.connection.driver_class*` or `*javax.persistence.jdbc.driver*` (e.g. `org.postgresql.Driver`):: +`*hibernate.connection.driver_class*` or `*jakarta.persistence.jdbc.driver*` (e.g. `org.postgresql.Driver`):: Names the JDBC `Driver` class name. -`*hibernate.connection.url*` or `*javax.persistence.jdbc.url*` (e.g. `jdbc:postgresql:hibernate_orm_test`):: +`*hibernate.connection.url*` or `*jakarta.persistence.jdbc.url*` (e.g. `jdbc:postgresql:hibernate_orm_test`):: Names the JDBC connection URL. -`*hibernate.connection.username*` or `*javax.persistence.jdbc.user*`:: +`*hibernate.connection.username*` or `*jakarta.persistence.jdbc.user*`:: Names the JDBC connection user name. -`*hibernate.connection.password*` or `*javax.persistence.jdbc.password*`:: +`*hibernate.connection.password*` or `*jakarta.persistence.jdbc.password*`:: Names the JDBC connection password. `*hibernate.connection.isolation*` (e.g. `REPEATABLE_READ` or `Connection.TRANSACTION_REPEATABLE_READ`):: @@ -289,8 +289,8 @@ meaning that an Exception is thrown when detecting such a conflict. Should all database identifiers be quoted. `*hibernate.globally_quoted_identifiers_skip_column_definitions*` (e.g. `true` or `false` (default value)):: -Assuming `hibernate.globally_quoted_identifiers` is `true`, this allows the global quoting to skip column-definitions as defined by `javax.persistence.Column`, -`javax.persistence.JoinColumn`, etc., and while it avoids column-definitions being quoted due to global quoting, they can still be explicitly quoted in the annotation/xml mappings. +Assuming `hibernate.globally_quoted_identifiers` is `true`, this allows the global quoting to skip column-definitions as defined by `jakarta.persistence.Column`, +`jakarta.persistence.JoinColumn`, etc., and while it avoids column-definitions being quoted due to global quoting, they can still be explicitly quoted in the annotation/xml mappings. `*hibernate.auto_quote_keyword*` (e.g. `true` or `false` (default value)):: Specifies whether to automatically quote any names that are deemed keywords. @@ -393,7 +393,7 @@ Unless specified, the JDBC Driver uses the default JVM time zone. If a different This setting applies to Oracle Dialect only, and it specifies whether `byte[]` or `Byte[]` arrays should be mapped to the deprecated `LONG RAW` (when this configuration property value is `true`) or to a `BLOB` column type (when this configuration property value is `false`). ==== Bean Validation options -`*javax.persistence.validation.factory*` (e.g. `javax.validation.ValidationFactory` implementation):: +`*jakarta.persistence.validation.factory*` (e.g. `jakarta.validation.ValidationFactory` implementation):: Specify the `javax.validation.ValidationFactory` implementation to use for Bean Validation. `*hibernate.check_nullability*` (e.g. `true` or `false`):: @@ -499,7 +499,7 @@ Can reference a `*hibernate.query.validate_parameters*` (e.g. `true` (default value) or `false`):: This configuration property can be used to disable parameters validation performed by `org.hibernate.query.Query#setParameter` when the Session is bootstrapped via JPA -`javax.persistence.EntityManagerFactory`. +`jakarta.persistence.EntityManagerFactory`. `*hibernate.criteria.value_handling_mode*` (e.g. `BIND` (default value) or `INLINE`):: By default, Criteria queries uses bind parameters for any value passed through the JPA Criteria API. @@ -535,7 +535,7 @@ This way, an IN clause with 5, 6, or 7 bind parameters will use the 8 IN clause, therefore reusing its execution plan. `*hibernate.query.omit_join_of_superclass_tables*` (e.g. `false` or `true` (default value)):: -When you use `javax.persistence.InheritanceType#JOINED` strategy for inheritance mapping and query +When you use `jakarta.persistence.InheritanceType#JOINED` strategy for inheritance mapping and query a value from an entity, all superclass tables are joined in the query regardless you need them. + With this setting set to true only superclass tables which are really needed are joined. @@ -680,7 +680,7 @@ Either a shortcut name (e.g. `jcache`, `ehcache`) or the fully-qualified name of `*hibernate.cache.default_cache_concurrency_strategy*`:: Setting used to give the name of the default https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/CacheConcurrencyStrategy.html[`CacheConcurrencyStrategy`] to use -when `@javax.persistence.Cacheable`, `@org.hibernate.annotations.Cache` or `@org.hibernate.annotations.Cache` is used to override the global setting. +when `@jakarta.persistence.Cacheable`, `@org.hibernate.annotations.Cache` or `@org.hibernate.annotations.Cache` is used to override the global setting. `*hibernate.cache.use_minimal_puts*` (e.g. `true` (default value) or `false`):: Optimizes second-level cache operation to minimize writes, at the cost of more frequent reads. This is most useful for clustered caches and is enabled by default for clustered cache implementations. @@ -813,7 +813,7 @@ Valid options are defined by the `externalHbm2ddlName` value of the https://docs `validate`::: Validate the database schema. `update`::: Update the database schema. -`*javax.persistence.schema-generation.database.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: +`*jakarta.persistence.schema-generation.database.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: Setting to perform `SchemaManagementTool` actions automatically as part of the `SessionFactory` lifecycle. Valid options are defined by the `externalJpaName` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/Action.html[`Action`] enum: + @@ -822,7 +822,7 @@ Valid options are defined by the `externalJpaName` value of the https://docs.jbo `drop`::: Database dropping will be generated. `drop-and-create`::: Database dropping will be generated followed by database creation. -`*javax.persistence.schema-generation.scripts.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: +`*jakarta.persistence.schema-generation.scripts.action*` (e.g. `none` (default value), `create-only`, `drop`, `create`, `create-drop`, `validate`, and `update`):: Setting to perform `SchemaManagementTool` actions writing the commands into a DDL script file. Valid options are defined by the `externalJpaName` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/Action.html[`Action`] enum: + @@ -831,77 +831,77 @@ Valid options are defined by the `externalJpaName` value of the https://docs.jbo `drop`::: Database dropping will be generated. `drop-and-create`::: Database dropping will be generated followed by database creation. -`*javax.persistence.schema-generation-connection*`:: +`*jakarta.persistence.schema-generation-connection*`:: Allows passing a specific `java.sql.Connection` instance to be used by `SchemaManagementTool`. -`*javax.persistence.database-product-name*`:: +`*jakarta.persistence.database-product-name*`:: Specifies the name of the database provider in cases where a Connection to the underlying database is not available (aka, mainly in generating scripts). In such cases, a value for this setting _must_ be specified. + The value of this setting is expected to match the value returned by `java.sql.DatabaseMetaData#getDatabaseProductName()` for the target database. + -Additionally, specifying `javax.persistence.database-major-version` and/or `javax.persistence.database-minor-version` may be required to understand exactly how to generate the required schema commands. +Additionally, specifying `jakarta.persistence.database-major-version` and/or `jakarta.persistence.database-minor-version` may be required to understand exactly how to generate the required schema commands. -`*javax.persistence.database-major-version*`:: +`*jakarta.persistence.database-major-version*`:: Specifies the major version of the underlying database, as would be returned by `java.sql.DatabaseMetaData#getDatabaseMajorVersion` for the target database. + -This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `javax.persistence.database-product-name` does not provide enough distinction. +This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `jakarta.persistence.database-product-name` does not provide enough distinction. -`*javax.persistence.database-minor-version*`:: +`*jakarta.persistence.database-minor-version*`:: Specifies the minor version of the underlying database, as would be returned by `java.sql.DatabaseMetaData#getDatabaseMinorVersion` for the target database. + -This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `javax.persistence.database-product-name` and `javax.persistence.database-major-version` does not provide enough distinction. +This value is used to help more precisely determine how to perform schema generation tasks for the underlying database in cases where `jakarta.persistence.database-product-name` and `jakarta.persistence.database-major-version` does not provide enough distinction. -`*javax.persistence.schema-generation.create-source*`:: +`*jakarta.persistence.schema-generation.create-source*`:: Specifies whether schema generation commands for schema creation are to be determined based on object/relational mapping metadata, DDL scripts, or a combination of the two. See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/SourceType.html[`SourceType`] for valid set of values. + If no value is specified, a default is assumed as follows: + -* if source scripts are specified (per `javax.persistence.schema-generation.create-script-source`), then `script` is assumed +* if source scripts are specified (per `jakarta.persistence.schema-generation.create-script-source`), then `script` is assumed * otherwise, `metadata` is assumed -`*javax.persistence.schema-generation.drop-source*`:: +`*jakarta.persistence.schema-generation.drop-source*`:: Specifies whether schema generation commands for schema dropping are to be determined based on object/relational mapping metadata, DDL scripts, or a combination of the two. See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/SourceType.html[`SourceType`] for valid set of values. + If no value is specified, a default is assumed as follows: + -* if source scripts are specified (per `javax.persistence.schema-generation.drop-script-source`), then the `script` option is assumed +* if source scripts are specified (per `jakarta.persistence.schema-generation.drop-script-source`), then the `script` option is assumed * otherwise, `metadata` is assumed -`*javax.persistence.schema-generation.create-script-source*`:: +`*jakarta.persistence.schema-generation.create-script-source*`:: Specifies the `create` script file as either a `java.io.Reader` configured for reading of the DDL script file or a string designating a file `java.net.URL` for the DDL script. + -Hibernate historically also accepted `hibernate.hbm2ddl.import_files` for a similar purpose, but `javax.persistence.schema-generation.create-script-source` should be preferred over `hibernate.hbm2ddl.import_files`. +Hibernate historically also accepted `hibernate.hbm2ddl.import_files` for a similar purpose, but `jakarta.persistence.schema-generation.create-script-source` should be preferred over `hibernate.hbm2ddl.import_files`. -`*javax.persistence.schema-generation.drop-script-source*`:: +`*jakarta.persistence.schema-generation.drop-script-source*`:: Specifies the `drop` script file as either a `java.io.Reader` configured for reading of the DDL script file or a string designating a file `java.net.URL` for the DDL script. -`*javax.persistence.schema-generation.scripts.create-target*`:: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema creation commands should be written to DDL script file, `javax.persistence.schema-generation.scripts.create-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. +`*jakarta.persistence.schema-generation.scripts.create-target*`:: +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema creation commands should be written to DDL script file, `jakarta.persistence.schema-generation.scripts.create-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. -`*javax.persistence.schema-generation.scripts.drop-target*`:: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema dropping commands should be written to DDL script file, `javax.persistence.schema-generation.scripts.drop-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. +`*jakarta.persistence.schema-generation.scripts.drop-target*`:: +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema dropping commands should be written to DDL script file, `jakarta.persistence.schema-generation.scripts.drop-target` specifies either a `java.io.Writer` configured for output of the DDL script or a string specifying the file URL for the DDL script. `*hibernate.hbm2ddl.schema-generation.script.append*` (e.g. `true` (default value) or `false`):: -For cases where the `javax.persistence.schema-generation.scripts.action` value indicates that schema commands should be written to DDL script file, `hibernate.hbm2ddl.schema-generation.script.append` specifies if schema commands should be appended to the end of the file rather than written at the beginning of the file. +For cases where the `jakarta.persistence.schema-generation.scripts.action` value indicates that schema commands should be written to DDL script file, `hibernate.hbm2ddl.schema-generation.script.append` specifies if schema commands should be appended to the end of the file rather than written at the beginning of the file. Values are `true` for appending schema commands to the end of the file, `false` for writing achema commands at the beginning of the file. -`*javax.persistence.hibernate.hbm2ddl.import_files*` (e.g. `import.sql` (default value)):: +`*jakarta.persistence.hibernate.hbm2ddl.import_files*` (e.g. `import.sql` (default value)):: Comma-separated names of the optional files containing SQL DML statements executed during the `SessionFactory` creation. File order matters, the statements of a given file are executed before the statements of the following one. + These statements are only executed if the schema is created, meaning that `hibernate.hbm2ddl.auto` is set to `create`, `create-drop`, or `update`. -`javax.persistence.schema-generation.create-script-source` / `javax.persistence.schema-generation.drop-script-source` should be preferred. +`jakarta.persistence.schema-generation.create-script-source` / `jakarta.persistence.schema-generation.drop-script-source` should be preferred. -`*javax.persistence.sql-load-script-source*`:: +`*jakarta.persistence.sql-load-script-source*`:: JPA variant of `hibernate.hbm2ddl.import_files`. Specifies a `java.io.Reader` configured for reading of the SQL load script or a string designating the file `java.net.URL` for the SQL load script. A "SQL load script" is a script that performs some database initialization (INSERT, etc). `*hibernate.hbm2ddl.import_files_sql_extractor*`:: -Reference to the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.html[`ImportSqlCommandExtractor`] implementation class to use for parsing source/import files as defined by `javax.persistence.schema-generation.create-script-source`, -`javax.persistence.schema-generation.drop-script-source` or `hibernate.hbm2ddl.import_files`. +Reference to the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/hbm2ddl/ImportSqlCommandExtractor.html[`ImportSqlCommandExtractor`] implementation class to use for parsing source/import files as defined by `jakarta.persistence.schema-generation.create-script-source`, +`jakarta.persistence.schema-generation.drop-script-source` or `hibernate.hbm2ddl.import_files`. + Reference may refer to an instance, a Class implementing `ImportSqlCommandExtractor` or the fully-qualified name of the `ImportSqlCommandExtractor` implementation. If the fully-qualified name is given, the implementation must provide a no-arg constructor. @@ -911,7 +911,7 @@ The default value is https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/ja `*hibernate.hbm2ddl.create_namespaces*` (e.g. `true` or `false` (default value)):: Specifies whether to automatically create the database schema/catalog also. -`*javax.persistence.create-database-schemas*` (e.g. `true` or `false` (default value)):: +`*jakarta.persistence.create-database-schemas*` (e.g. `true` or `false` (default value)):: The JPA variant of `hibernate.hbm2ddl.create_namespaces`. Specifies whether the persistence provider is to create the database schema(s) in addition to creating database objects (tables, sequences, constraints, etc). The value of this boolean property should be set to `true` if the persistence provider is to create schemas in the database or to generate DDL that contains "CREATE SCHEMA" commands. + @@ -925,8 +925,8 @@ Used to specify the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/jav Setting to choose the strategy used to access the JDBC Metadata. Valid options are defined by the `strategy` value of the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.html[`JdbcMetadaAccessStrategy`] enum: + -`grouped`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute a single `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call to retrieve all the database table in order to determine if all the ``javax.persistence.Entity``s have a corresponding mapped database tables. This strategy may require `hibernate.default_schema` and/or `hibernate.default_catalog` to be provided. -`individually`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute one `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call for each `javax.persistence.Entity` in order to determine if a corresponding database table exists. +`grouped`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute a single `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call to retrieve all the database table in order to determine if all the ``jakarta.persistence.Entity``s have a corresponding mapped database tables. This strategy may require `hibernate.default_schema` and/or `hibernate.default_catalog` to be provided. +`individually`::: https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaMigrator.html[`SchemaMigrator`] and https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/tool/schema/spi/SchemaValidator.html[`SchemaValidator`] execute one `java.sql.DatabaseMetaData#getTables(String, String, String, String[])` call for each `jakarta.persistence.Entity` in order to determine if a corresponding database table exists. `*hibernate.hbm2ddl.delimiter*` (e.g. `;`):: Identifies the delimiter to use to separate schema management statements in script outputs. @@ -942,7 +942,7 @@ If enabled, allows schema update and validation to support synonyms. Due to the Identifies a comma-separated list of values to specify extra table types, other than the default `TABLE` value, to recognize as defining a physical table by schema update, creation and validation. `*hibernate.hbm2ddl.default_constraint_mode*` (`CONSTRAINT` (default value) or `NO_CONSTRAINT`):: -Default `javax.persistence.ConstraintMode` for foreign key mapping if `PROVIDER_DEFAULT` strategy used. +Default `jakarta.persistence.ConstraintMode` for foreign key mapping if `PROVIDER_DEFAULT` strategy used. `*hibernate.schema_update.unique_constraint_strategy*` (e.g. `DROP_RECREATE_QUIETLY`, `RECREATE_QUIETLY`, `SKIP`):: Unique columns and unique keys both use unique constraints in most dialects. @@ -1153,7 +1153,7 @@ Defines delayed access to CDI `BeanManager`. Starting in 5.1 the preferred means Identifies an explicit `org.hibernate.resource.beans.container.spi.BeanContainer` to be used. + Note that, for CDI-based containers, setting this is not necessary. -Simply pass the `BeanManager` to use via `javax.persistence.bean.manager` and optionally specify `hibernate.delay_cdi_access`. +Simply pass the `BeanManager` to use via `jakarta.persistence.bean.manager` and optionally specify `hibernate.delay_cdi_access`. + This setting is more meant to integrate non-CDI bean containers such as Spring. @@ -1169,7 +1169,7 @@ false::: does not allow Setting which indicates whether or not the new JOINs over collection tables should be rewritten to subqueries. `*hibernate.allow_refresh_detached_entity*` (e.g. `true` (default value when using Hibernate native bootstrapping) or `false` (default value when using JPA bootstrapping)):: -Setting that allows to call `javax.persistence.EntityManager#refresh(entity)` or `Session#refresh(entity)` on a detached instance even when the `org.hibernate.Session` is obtained from a JPA `javax.persistence.EntityManager`. +Setting that allows to call `jakarta.persistence.EntityManager#refresh(entity)` or `Session#refresh(entity)` on a detached instance even when the `org.hibernate.Session` is obtained from a JPA `jakarta.persistence.EntityManager`. `*hibernate.use_entity_where_clause_for_collections*` (e.g., `true` (default) or `false`):: Setting controls whether an entity's "where" clause, mapped using `@Where(clause = "...")` or `` is taken into account when loading one-to-many or many-to-many collections of that type of entity. diff --git a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc index d5f8688b28..31b20c7a1a 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/Bootstrap.adoc @@ -182,15 +182,15 @@ The standardized approach has some limitations in certain environments, but asid [[bootstrap-jpa-compliant]] ==== JPA-compliant bootstrapping -In JPA, we are ultimately interested in bootstrapping a `javax.persistence.EntityManagerFactory` instance. -The JPA specification defines two primary standardized bootstrap approaches depending on how the application intends to access the `javax.persistence.EntityManager` instances from an `EntityManagerFactory`. +In JPA, we are ultimately interested in bootstrapping a `jakarta.persistence.EntityManagerFactory` instance. +The JPA specification defines two primary standardized bootstrap approaches depending on how the application intends to access the `jakarta.persistence.EntityManager` instances from an `EntityManagerFactory`. It uses the terms _EE_ and _SE_ for these two approaches, but those terms are very misleading in this context. What the JPA spec calls EE bootstrapping implies the existence of a container (EE, OSGi, etc), who'll manage and inject the persistence context on behalf of the application. What it calls SE bootstrapping is everything else. We will use the terms container-bootstrapping and application-bootstrapping in this guide. For compliant container-bootstrapping, the container will build an `EntityManagerFactory` for each persistent-unit defined in the `META-INF/persistence.xml` configuration file -and make that available to the application for injection via the `javax.persistence.PersistenceUnit` annotation or via JNDI lookup. +and make that available to the application for injection via the `jakarta.persistence.PersistenceUnit` annotation or via JNDI lookup. [[bootstrap-jpa-compliant-PersistenceUnit-example]] .Injecting the default `EntityManagerFactory` @@ -224,7 +224,7 @@ include::{extrasdir}/persistence.xml[] ---- ==== -For compliant application-bootstrapping, rather than the container building the `EntityManagerFactory` for the application, the application builds the `EntityManagerFactory` itself using the `javax.persistence.Persistence` bootstrap class. +For compliant application-bootstrapping, rather than the container building the `EntityManagerFactory` for the application, the application builds the `EntityManagerFactory` itself using the `jakarta.persistence.Persistence` bootstrap class. The application creates an `EntityManagerFactory` by calling the `createEntityManagerFactory` method: [[bootstrap-jpa-compliant-EntityManagerFactory-example]] @@ -240,7 +240,7 @@ include::{sourcedir}/BootstrapTest.java[tags=bootstrap-jpa-compliant-EntityManag ==== If you don't want to provide a `persistence.xml` configuration file, JPA allows you to provide all the configuration options in a {jpaJavadocUrlPrefix}spi/PersistenceUnitInfo.html[`PersistenceUnitInfo`] implementation and call -https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/jpa/HibernatePersistenceProvider.html#createContainerEntityManagerFactory-javax.persistence.spi.PersistenceUnitInfo-java.util.Map-[`HibernatePersistenceProvider.html#createContainerEntityManagerFactory`]. +https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/jpa/HibernatePersistenceProvider.html#createContainerEntityManagerFactory-jakarta.persistence.spi.PersistenceUnitInfo-java.util.Map-[`HibernatePersistenceProvider.html#createContainerEntityManagerFactory`]. ==== To inject the default Persistence Context, you can use the {jpaJavadocUrlPrefix}PersistenceContext.html[`@PersistenceContext`] annotation. diff --git a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml index e009087fed..967f9e4c5e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml +++ b/documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml @@ -14,16 +14,16 @@ file:///etc/opt/app/mappings/orm.xml - - - - org.hibernate.documentation.userguide.Document - - - - > for more on this topic. ==== @@ -69,7 +69,7 @@ This chapter covers how Hibernate determines these pieces and how to influence t [[basic-basic-annotation]] ==== @Basic -Strictly speaking, a basic type is denoted by the `javax.persistence.Basic` annotation. +Strictly speaking, a basic type is denoted by the `jakarta.persistence.Basic` annotation. Generally, the `@Basic` annotation can be ignored as it is assumed by default. Both of the following examples are ultimately the same. @@ -1381,7 +1381,7 @@ Hibernate supports the mapping of Java enums as basic value types in a number of [[basic-enums-Enumerated]] ===== `@Enumerated` -The original JPA-compliant way to map enums was via the `@Enumerated` or `@MapKeyEnumerated` annotations, working on the principle that the enum values are stored according to one of 2 strategies indicated by `javax.persistence.EnumType`: +The original JPA-compliant way to map enums was via the `@Enumerated` or `@MapKeyEnumerated` annotations, working on the principle that the enum values are stored according to one of 2 strategies indicated by `jakarta.persistence.EnumType`: `ORDINAL`:: stored according to the enum value's ordinal position within the enum class, as indicated by `java.lang.Enum#ordinal` diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc index b5e505167f..bf10b7d3d1 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc @@ -21,7 +21,7 @@ Throughout this chapter and thereafter, entity types will be simply referred to Section _2.1 The Entity Class_ of the _JPA 2.1 specification_ defines its requirements for an entity class. Applications that wish to remain portable across JPA providers should adhere to these requirements: -* The entity class must be annotated with the `javax.persistence.Entity` annotation (or be denoted as such in XML mapping). +* The entity class must be annotated with the `jakarta.persistence.Entity` annotation (or be denoted as such in XML mapping). * The entity class must have a public or protected no-argument constructor. It may define additional constructors as well. * The entity class must be a top-level class. * An enum or interface may not be designated as an entity. @@ -114,7 +114,7 @@ Hibernate offers multiple identifier generation strategies, see the <>), -or defined using the `javax.persistence.IdClass` annotation (see <>). +The primary key class may be defined using the `jakarta.persistence.EmbeddedId` annotation (see <>), +or defined using the `jakarta.persistence.IdClass` annotation (see <>). * The primary key class must be public and must have a public no-arg constructor. * The primary key class must be serializable. * The primary key class must define equals and hashCode methods, consistent with equality for the underlying database types to which the primary key is mapped. @@ -283,8 +283,8 @@ You can also auto-generate values for non-identifier attributes. For more detail Hibernate supports identifier value generation across a number of different types. Remember that JPA portably defines identifier value generation just for integer types. -Identifier value generation is indicated using the `javax.persistence.GeneratedValue` annotation. -The most important piece of information here is the specified `javax.persistence.GenerationType` which indicates how values will be generated. +Identifier value generation is indicated using the `jakarta.persistence.GeneratedValue` annotation. +The most important piece of information here is the specified `jakarta.persistence.GenerationType` which indicates how values will be generated. [NOTE] ==== @@ -348,7 +348,7 @@ It is important to note that SequenceStyleGenerator is capable of working agains This gives Hibernate a huge degree of portability across databases while still maintaining consistent id generation behavior (versus say choosing between SEQUENCE and IDENTITY). This backing storage is completely transparent to the user. -The preferred (and portable) way to configure this generator is using the JPA-defined `javax.persistence.SequenceGenerator` annotation. +The preferred (and portable) way to configure this generator is using the JPA-defined `jakarta.persistence.SequenceGenerator` annotation. The simplest form is to simply request sequence generation; Hibernate will use a single, implicitly-named sequence (`hibernate_sequence`) for all such unnamed definitions. @@ -361,7 +361,7 @@ include::{sourcedir}/SequenceGeneratorUnnamedTest.java[tag=identifiers-generator ---- ==== -Using `javax.persistence.SequenceGenerator`, you can specify a specific database sequence name. +Using `jakarta.persistence.SequenceGenerator`, you can specify a specific database sequence name. [[identifiers-generators-sequence-named]] .Named sequence @@ -372,7 +372,7 @@ include::{sourcedir}/SequenceGeneratorNamedTest.java[tag=identifiers-generators- ---- ==== -The `javax.persistence.SequenceGenerator` annotation allows you to specify additional configurations as well. +The `jakarta.persistence.SequenceGenerator` annotation allows you to specify additional configurations as well. [[identifiers-generators-sequence-configured]] .Configured sequence @@ -434,7 +434,7 @@ include::{extrasdir}/id/identifiers-generators-table-unnamed-mapping-example.sql If no table name is given Hibernate assumes an implicit name of `hibernate_sequences`. -Additionally, because no `javax.persistence.TableGenerator#pkColumnValue` is specified, +Additionally, because no `jakarta.persistence.TableGenerator#pkColumnValue` is specified, Hibernate will use the default segment (`sequence_name='default'`) from the hibernate_sequences table. However, you can configure the table identifier generator using the {jpaJavadocUrlPrefix}TableGenerator.html[`@TableGenerator`] annotation. diff --git a/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc b/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc index 1d44ac2381..1d42da70ae 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/domain/inheritance.adoc @@ -114,7 +114,7 @@ Use the `@DiscriminatorColumn` to define the discriminator column as well as the [NOTE] ==== -The enum `DiscriminatorType` used in `javax.persistence.DiscriminatorColumn` only contains the values `STRING`, `CHAR` and `INTEGER` which means that not all Hibernate supported types are available via the `@DiscriminatorColumn` annotation. +The enum `DiscriminatorType` used in `jakarta.persistence.DiscriminatorColumn` only contains the values `STRING`, `CHAR` and `INTEGER` which means that not all Hibernate supported types are available via the `@DiscriminatorColumn` annotation. You can also use `@DiscriminatorFormula` to express in SQL a virtual discriminator column. This is particularly useful when the discriminator value can be extracted from one or more columns of the table. Both `@DiscriminatorColumn` and `@DiscriminatorFormula` are to be set on the root entity (once per persisted hierarchy). diff --git a/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc b/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc index af0e847abc..af05df8efc 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/envers/Envers.adoc @@ -340,7 +340,7 @@ please see <> for a description of the additional `@Au If you want to audit a relation, where the target entity is not audited (that is the case for example with dictionary-like entities, which don't change and don't have to be audited), just annotate it with `@Audited( targetAuditMode = RelationTargetAuditMode.NOT_AUDITED )`. Then, while reading historic versions of your entity, the relation will always point to the "current" related entity. -By default Envers throws `javax.persistence.EntityNotFoundException` when "current" entity does not exist in the database. +By default Envers throws `jakarta.persistence.EntityNotFoundException` when "current" entity does not exist in the database. Apply `@NotFound( action = NotFoundAction.IGNORE )` annotation to silence the exception and assign null value instead. The hereby solution causes implicit eager loading of to-one relations. @@ -1431,7 +1431,7 @@ Although Hibernate allows this, Envers (or more precisely the database connector There are at least two ways out if you need bag semantics: -. use an indexed collection, with the `@javax.persistence.OrderColumn` annotation. +. use an indexed collection, with the `@jakarta.persistence.OrderColumn` annotation. . provide a unique id for your elements with the `@CollectionId` annotation. ==== What isn't and _will_ be supported diff --git a/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc b/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc index 19e7886ed3..4008039c4e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc @@ -144,7 +144,7 @@ There are two available approaches defined for specifying callback handling: * The second is to use a separate entity listener class. An entity listener is a stateless class with a no-arg constructor. The callback annotations are placed on a method of this class instead of the entity class. -The entity listener class is then associated with the entity using the `javax.persistence.EntityListeners` annotation +The entity listener class is then associated with the entity using the `jakarta.persistence.EntityListeners` annotation [[events-jpa-callbacks-example]] .Example of specifying JPA callbacks @@ -170,10 +170,10 @@ A callback method must not invoke `EntityManager` or `Query` methods! It is possible that multiple callback methods are defined for a particular lifecycle event. When that is the case, the defined order of execution is well defined by the JPA spec (specifically section 3.5.4): -* Any default listeners associated with the entity are invoked first, in the order they were specified in the XML. See the `javax.persistence.ExcludeDefaultListeners` annotation. +* Any default listeners associated with the entity are invoked first, in the order they were specified in the XML. See the `jakarta.persistence.ExcludeDefaultListeners` annotation. * Next, entity listener class callbacks associated with the entity hierarchy are invoked, in the order they are defined in the `EntityListeners`. If multiple classes in the entity hierarchy define entity listeners, the listeners defined for a superclass are invoked before the listeners defined for its subclasses. -See the ``javax.persistence.ExcludeSuperclassListener``'s annotation. +See the ``jakarta.persistence.ExcludeSuperclassListener``'s annotation. * Lastly, callback methods defined on the entity hierarchy are invoked. If a callback type is annotated on both an entity and one or more of its superclasses without method overriding, both would be called, the most general superclass first. An entity class is also allowed to override a callback method defined in a superclass in which case the super callback would not get invoked; the overriding method would get invoked provided it is annotated. diff --git a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc index e63f1dd9e0..6dde55ab53 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/fetching/Fetching.adoc @@ -358,7 +358,7 @@ creates a single AttributeNode with 3 distinct SubGraphs. It is functionally th [source, JAVA, indent=0] ---- Class invoiceClass = ...; -javax.persistence.EntityGraph invoiceGraph = entityManager.createEntityGraph( invoiceClass ); +jakarta.persistence.EntityGraph invoiceGraph = entityManager.createEntityGraph( invoiceClass ); invoiceGraph.addAttributeNode( "responsibleParty" ); invoiceGraph.addSubgraph( "responsibleParty" ).addAttributeNode( "taxIdNumber" ); invoiceGraph.addSubgraph( "responsibleParty", Corporation.class ).addAttributeNode( "ceo" ); diff --git a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc index adf7b217ab..32f97563e6 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc @@ -32,7 +32,8 @@ For cases where a JNDI name is given, be sure to read <>. This chapter will focus on the JPA APIs for declaring type-safe criteria queries. @@ -21,12 +21,12 @@ Users of the older Hibernate `org.hibernate.Criteria` query API will recognize t Criteria queries are essentially an object graph, where each part of the graph represents an increasing (as we navigate down this graph) more atomic part of the query. The first step in performing a criteria query is building this graph. -The `javax.persistence.criteria.CriteriaBuilder` interface is the first thing with which you need to become acquainted with before using criteria queries. +The `jakarta.persistence.criteria.CriteriaBuilder` interface is the first thing with which you need to become acquainted with before using criteria queries. Its role is that of a factory for all the individual pieces of the criteria. -You obtain a `javax.persistence.criteria.CriteriaBuilder` instance by calling the `getCriteriaBuilder()` method of either `javax.persistence.EntityManagerFactory` or `javax.persistence.EntityManager`. +You obtain a `jakarta.persistence.criteria.CriteriaBuilder` instance by calling the `getCriteriaBuilder()` method of either `jakarta.persistence.EntityManagerFactory` or `jakarta.persistence.EntityManager`. -The next step is to obtain a `javax.persistence.criteria.CriteriaQuery`. -This is accomplished using one of the three methods on `javax.persistence.criteria.CriteriaBuilder` for this purpose: +The next step is to obtain a `jakarta.persistence.criteria.CriteriaQuery`. +This is accomplished using one of the three methods on `jakarta.persistence.criteria.CriteriaBuilder` for this purpose: * ` CriteriaQuery createQuery( Class resultClass )` * `CriteriaQuery createTupleQuery()` @@ -111,7 +111,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-typedquery-multiselect-arra Technically this is classified as a typed query, but you can see from handling the results that this is sort of misleading. Anyway, the expected result type here is an array. -The example then uses the array method of `javax.persistence.criteria.CriteriaBuilder` which explicitly combines individual selections into a `javax.persistence.criteria.CompoundSelection`. +The example then uses the array method of `jakarta.persistence.criteria.CriteriaBuilder` which explicitly combines individual selections into a `jakarta.persistence.criteria.CompoundSelection`. [[criteria-typedquery-multiselect-array-implicit-example]] .Selecting an array using `multiselect` @@ -148,14 +148,14 @@ First, we see the simple definition of the wrapper object we will be using to wr Specifically, notice the constructor and its argument types. Since we will be returning `PersonWrapper` objects, we use `PersonWrapper` as the type of our criteria query. -This example illustrates the use of the `javax.persistence.criteria.CriteriaBuilder` method construct which is used to build a wrapper expression. +This example illustrates the use of the `jakarta.persistence.criteria.CriteriaBuilder` method construct which is used to build a wrapper expression. For every row in the result, we are saying we would like a `PersonWrapper` instantiated with the remaining arguments by the matching constructor. This wrapper expression is then passed as the select. [[criteria-tuple]] === Tuple criteria queries -A better approach to <> is to use either a wrapper (which we just saw in <>) or using the `javax.persistence.Tuple` contract. +A better approach to <> is to use either a wrapper (which we just saw in <>) or using the `jakarta.persistence.Tuple` contract. [[criteria-tuple-example]] .Selecting a tuple @@ -166,18 +166,18 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-tuple-example] ---- ==== -This example illustrates accessing the query results through the `javax.persistence.Tuple` interface. -The example uses the explicit `createTupleQuery()` of `javax.persistence.criteria.CriteriaBuilder`. +This example illustrates accessing the query results through the `jakarta.persistence.Tuple` interface. +The example uses the explicit `createTupleQuery()` of `jakarta.persistence.criteria.CriteriaBuilder`. An alternate approach is to use `createQuery( Tuple.class )`. Again we see the use of the `multiselect()` method, just like in <>. -The difference here is that the type of the `javax.persistence.criteria.CriteriaQuery` was defined as `javax.persistence.Tuple` so the compound selections, in this case, are interpreted to be the tuple elements. +The difference here is that the type of the `jakarta.persistence.criteria.CriteriaQuery` was defined as `jakarta.persistence.Tuple` so the compound selections, in this case, are interpreted to be the tuple elements. -The javax.persistence.Tuple contract provides three forms of access to the underlying elements: +The jakarta.persistence.Tuple contract provides three forms of access to the underlying elements: typed:: The <> example illustrates this form of access in the `tuple.get( idPath )` and `tuple.get( nickNamePath )` calls. - This allows typed access to the underlying tuple values based on the `javax.persistence.TupleElement` expressions used to build the criteria. + This allows typed access to the underlying tuple values based on the `jakarta.persistence.TupleElement` expressions used to build the criteria. positional:: Allows access to the underlying tuple values based on the position. The simple _Object get(int position)_ form is very similar to the access illustrated in <> and <>. @@ -185,7 +185,7 @@ positional:: aliased:: Allows access to the underlying tuple values based on (optionally) assigned alias. The example query did not apply an alias. - An alias would be applied via the alias method on `javax.persistence.criteria.Selection`. + An alias would be applied via the alias method on `jakarta.persistence.criteria.Selection`. Just like `positional` access, there is both a typed (__Object get(String alias)__) and an untyped (__ X get(String alias, Class type)__) form. [[criteria-from]] @@ -200,14 +200,14 @@ The root objects of the query are entities, from which the other types are reach [NOTE] ==== -All the individual parts of the FROM clause (roots, joins, paths) implement the `javax.persistence.criteria.From` interface. +All the individual parts of the FROM clause (roots, joins, paths) implement the `jakarta.persistence.criteria.From` interface. ==== [[criteria-from-root]] === Roots Roots define the basis from which all joins, paths and attributes are available in the query. -A root is always an entity type. Roots are defined and added to the criteria by the overloaded __from__ methods on `javax.persistence.criteria.CriteriaQuery`: +A root is always an entity type. Roots are defined and added to the criteria by the overloaded __from__ methods on `jakarta.persistence.criteria.CriteriaQuery`: [[criteria-from-root-methods-example]] .Root methods @@ -244,8 +244,8 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-multiple-root-example] [[criteria-from-join]] === Joins -Joins allow navigation from other `javax.persistence.criteria.From` to either association or embedded attributes. -Joins are created by the numerous overloaded __join__ methods of the `javax.persistence.criteria.From` interface. +Joins allow navigation from other `jakarta.persistence.criteria.From` to either association or embedded attributes. +Joins are created by the numerous overloaded __join__ methods of the `jakarta.persistence.criteria.From` interface. [[criteria-from-join-example]] .Join example @@ -260,7 +260,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-join-example] === Fetches Just like in HQL and JPQL, criteria queries can specify that associated data be fetched along with the owner. -Fetches are created by the numerous overloaded __fetch__ methods of the `javax.persistence.criteria.From` interface. +Fetches are created by the numerous overloaded __fetch__ methods of the `jakarta.persistence.criteria.From` interface. [[criteria-from-fetch-example]] .Join fetch example @@ -274,7 +274,7 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-from-fetch-example] [NOTE] ==== Technically speaking, embedded attributes are always fetched with their owner. -However, in order to define the fetching of _Phone#addresses_ we needed a `javax.persistence.criteria.Fetch` because element collections are `LAZY` by default. +However, in order to define the fetching of _Phone#addresses_ we needed a `jakarta.persistence.criteria.Fetch` because element collections are `LAZY` by default. ==== [[criteria-path]] @@ -297,8 +297,8 @@ include::{sourcedir}/CriteriaTest.java[tags=criteria-param-example] ---- ==== -Use the parameter method of `javax.persistence.criteria.CriteriaBuilder` to obtain a parameter reference. -Then use the parameter reference to bind the parameter value to the `javax.persistence.Query`. +Use the parameter method of `jakarta.persistence.criteria.CriteriaBuilder` to obtain a parameter reference. +Then use the parameter reference to bind the parameter value to the `jakarta.persistence.Query`. [[criteria-group-by]] === Using group by diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc index 6e116c133c..dcce557ece 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/hql/HQL.adoc @@ -46,14 +46,14 @@ include::{modeldir}/WireTransferPayment.java[tags=hql-examples-domain-model-exam When using Hibernate, you can execute entity queries either via JPA or the Hibernate-specific API. Since 5.2, the Hibernate `Session` interface extends the JPA `EntityManager` interface. -For this reason, the query API was also merged, and now the Hibernate `org.hibernate.query.Query` interface extends the JPA `javax.persistence.Query`. +For this reason, the query API was also merged, and now the Hibernate `org.hibernate.query.Query` interface extends the JPA `jakarta.persistence.Query`. Next, we are going to see how the query API differs between the standard JPA interfaces and the Hibernate-specific API. [[jpql-api]] ==== JPA Query API -In JPA, the query is represented by `javax.persistence.Query` or `javax.persistence.TypedQuery` as obtained from the `EntityManager`. +In JPA, the query is represented by `jakarta.persistence.Query` or `jakarta.persistence.TypedQuery` as obtained from the `EntityManager`. The create an inline `Query` or `TypedQuery`, you need to use the `EntityManager#createQuery` method. For named queries, the `EntityManager#createNamedQuery` method is needed. @@ -109,13 +109,13 @@ Many of the settings controlling the execution of the query are defined as hints JPA defines some standard hints (like timeout in the example), but most are provider specific. Relying on provider specific hints limits your applications portability to some degree. -`javax.persistence.query.timeout`:: +`jakarta.persistence.query.timeout`:: Defines the query timeout, in milliseconds. -`javax.persistence.fetchgraph`:: +`jakarta.persistence.fetchgraph`:: Defines a _fetchgraph_ EntityGraph. Attributes explicitly specified as `AttributeNodes` are treated as `FetchType.EAGER` (via join fetch or subsequent select). For details, see the EntityGraph discussions in <>. -`javax.persistence.loadgraph`:: +`jakarta.persistence.loadgraph`:: Defines a _loadgraph_ EntityGraph. Attributes explicitly specified as AttributeNodes are treated as `FetchType.EAGER` (via join fetch or subsequent select). Attributes that are not specified are treated as `FetchType.LAZY` or `FetchType.EAGER` depending on the attribute's definition in metadata. @@ -131,7 +131,7 @@ Relying on provider specific hints limits your applications portability to some `org.hibernate.fetchSize`:: Defines the JDBC fetch-size to use. See `org.hibernate.query.Query#setFetchSize`. `org.hibernate.flushMode`:: - Defines the Hibernate-specific `FlushMode` to use. See `org.hibernate.query.Query#setFlushMode.` If possible, prefer using `javax.persistence.Query#setFlushMode` instead. + Defines the Hibernate-specific `FlushMode` to use. See `org.hibernate.query.Query#setFlushMode.` If possible, prefer using `jakarta.persistence.Query#setFlushMode` instead. `org.hibernate.readOnly`:: Defines that entities and collections loaded by this query should be marked as read-only. See `org.hibernate.query.Query#setReadOnly`. The final thing that needs to happen before the query can be executed is to bind the values for any defined parameters. @@ -542,7 +542,7 @@ Versioned updates is a Hibernate-specific feature and will not work in a portabl Custom version types, `org.hibernate.usertype.UserVersionType`, are not allowed in conjunction with an `update versioned` statement. ==== -An `UPDATE` statement is executed using the `executeUpdate()` of either `org.hibernate.query.Query` or `javax.persistence.Query`. +An `UPDATE` statement is executed using the `executeUpdate()` of either `org.hibernate.query.Query` or `jakarta.persistence.Query`. The method is named for those familiar with the JDBC `executeUpdate()` on `java.sql.PreparedStatement`. The `int` value returned by the `executeUpdate()` method indicates the number of entities affected by the operation. @@ -582,7 +582,7 @@ include::{extrasdir}/statement_delete_bnf.txt[] ---- ==== -A `DELETE` statement is also executed using the `executeUpdate()` method of either `org.hibernate.query.Query` or `javax.persistence.Query`. +A `DELETE` statement is also executed using the `executeUpdate()` method of either `org.hibernate.query.Query` or `jakarta.persistence.Query`. [[hql-insert]] === Insert statements @@ -975,7 +975,7 @@ VALUE:: Useful to explicitly show intent. Valid for any type of collection-valued reference. INDEX:: - According to HQL rules, this is valid for both `Maps` and `Lists` which specify a `javax.persistence.OrderColumn` annotation to refer to the `Map` key or the `List` position (aka the `OrderColumn` value). + According to HQL rules, this is valid for both `Maps` and `Lists` which specify a `jakarta.persistence.OrderColumn` annotation to refer to the `Map` key or the `List` position (aka the `OrderColumn` value). JPQL however, reserves this for use in the `List` case and adds `KEY` for the `Map` case. Applications interested in JPA provider portability should be aware of this distinction. KEY:: diff --git a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc index b80324f96a..034937310e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/query/native/Native.adoc @@ -272,7 +272,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-multi-entity-query-alias-ex [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define an `addEntity` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define an `addEntity` method equivalent. ==== The `{pr.*}` and `{pt.*}` notation used above is shorthand for "all properties". @@ -337,7 +337,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-dto-query-example, indent=0 [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define a `setResultTransformer` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define a `setResultTransformer` method equivalent. ==== The above query will return a list of `PersonSummaryDTO` which has been instantiated and injected the values of `id` and `name` into its corresponding properties or fields. @@ -358,7 +358,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-inheritance-query-example] [NOTE] ==== -There's no such equivalent in JPA because the `javax.persistence.Query` interface does not define an `addEntity` method equivalent. +There's no such equivalent in JPA because the `jakarta.persistence.Query` interface does not define an `addEntity` method equivalent. ==== [[sql-query-parameters]] @@ -390,7 +390,7 @@ include::{sourcedir}/SQLTest.java[tags=sql-hibernate-query-parameters-example] Named SQL queries can also be defined during mapping and called in exactly the same way as a named HQL query. In this case, you do _not_ need to call `addEntity()` anymore. -JPA defines the `javax.persistence.NamedNativeQuery` annotation for this purpose, +JPA defines the `jakarta.persistence.NamedNativeQuery` annotation for this purpose, and the Hibernate `org.hibernate.annotations.NamedNativeQuery` annotation extends it and adds the following attributes: `flushMode()`:: diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Call.java b/documentation/src/main/java/org/hibernate/userguide/model/Call.java index 7b4fab994b..932138aefd 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Call.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Call.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.model; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java b/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java index 439ffdc54e..8d865fba85 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/CreditCardPayment.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Image.java b/documentation/src/main/java/org/hibernate/userguide/model/Image.java index 6b565db013..f5a07a7690 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Image.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Image.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Partner.java b/documentation/src/main/java/org/hibernate/userguide/model/Partner.java index 7d515e6fbc..40ce8c606d 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Partner.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Partner.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; /** * @author Vlad Mihalcea @@ -46,4 +46,4 @@ public class Partner { } //tag::hql-examples-domain-model-example[] } -//end::hql-examples-domain-model-example[] \ No newline at end of file +//end::hql-examples-domain-model-example[] diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Payment.java b/documentation/src/main/java/org/hibernate/userguide/model/Payment.java index 81e4e9966e..d2ca0ceff0 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Payment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Payment.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.model; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Person.java b/documentation/src/main/java/org/hibernate/userguide/model/Person.java index 0a236c51e1..ebe9888f7c 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Person.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Person.java @@ -11,33 +11,33 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.FieldResult; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.ParameterMode; -import javax.persistence.QueryHint; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.StoredProcedureParameter; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.QueryHint; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.StoredProcedureParameter; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Version; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/java/org/hibernate/userguide/model/Phone.java b/documentation/src/main/java/org/hibernate/userguide/model/Phone.java index 75a24c4c52..3844f85fb5 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/Phone.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/Phone.java @@ -11,24 +11,24 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OneToMany; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.NamedNativeQueries; import org.hibernate.annotations.NamedNativeQuery; diff --git a/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java b/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java index 90529edcfe..8d99d0dfea 100644 --- a/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java +++ b/documentation/src/main/java/org/hibernate/userguide/model/WireTransferPayment.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author Vlad Mihalcea diff --git a/documentation/src/main/javadoc/overview.html b/documentation/src/main/javadoc/overview.html index dcd92f879a..0c3c8d7942 100644 --- a/documentation/src/main/javadoc/overview.html +++ b/documentation/src/main/javadoc/overview.html @@ -37,7 +37,7 @@ These interfaces are fully intended to be exposed to application code.

JPA

-The JPA interfaces are all defined by the JPA specification. For details see {@link javax.persistence}. +The JPA interfaces are all defined by the JPA specification. For details see {@link jakarta.persistence}. Not that since 5.2 Hibernate extends JPA (e.g. SessionFactory extends EntityManagerFactory) rather than wrapping it.

diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java index 60746b739e..fbcbe4c88a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/BidirectionalTwoOneToManyMapsIdTest.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java index e3216fbba3..c9498ce021 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/CompositeIdAssociationTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.associations; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java index 22e9224366..536278db32 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierPrimaryKeyJoinColumnTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java index 514bda34fb..71a29a8f91 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/DerivedIdentifierTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java index 9c50991c20..3eafc82bf3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinColumnOrFormulaTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinFormula; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java index 878bdb5516..93eed47604 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/JoinFormulaTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.associations; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.JoinFormula; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java index 81fb51ead2..464bbc5c92 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java index 4f4d645945..63128f0b6c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyBidirectionalWithLinkEntityTest.java @@ -10,13 +10,13 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java index 99c5ba5c75..c8c71d374b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToManyUnidirectionalTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java index 93c98facf3..51ae543c39 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/ManyToOneTest.java @@ -6,13 +6,13 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java index 004c51a5c6..ec20e51e57 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/NotFoundTest.java @@ -1,13 +1,13 @@ package org.hibernate.userguide.associations; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -159,4 +159,4 @@ public class NotFoundTest extends BaseEntityManagerFunctionalTestCase { //tag::associations-not-found-domain-model-example[] } //end::associations-not-found-domain-model-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java index 2bd1ad8123..a4bca59571 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyBidirectionalTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java index 7e94064210..d59d2d4f0e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToManyUnidirectionalTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java index fcdd772253..9e33a15c4d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalLazyTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.LazyToOne; import org.hibernate.annotations.LazyToOneOption; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java index bb6a4ba800..1004fd6564 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneBidirectionalTest.java @@ -6,14 +6,14 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; @@ -71,7 +71,7 @@ public class OneToOneBidirectionalTest extends BaseEntityManagerFunctionalTestCa entityManager.flush(); entityManager.clear(); - //throws javax.persistence.PersistenceException: org.hibernate.HibernateException: More than one row with the given identifier was found: 1 + //throws jakarta.persistence.PersistenceException: org.hibernate.HibernateException: More than one row with the given identifier was found: 1 phone = entityManager.find( Phone.class, phone.getId() ); //end::associations-one-to-one-bidirectional-constraint-example[] phone.getDetails().getProvider(); diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java index 8b7003a22a..ac2a4195af 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneMapsIdTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java index f28a1100b8..859c4fb928 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOnePrimaryKeyJoinColumnTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapsId; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapsId; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java index b596d540da..8b774b0966 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/OneToOneUnidirectionalTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.associations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java index 401423e394..54068aeedc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/UnidirectionalManyToManyRemoveTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java index e251a73c88..4d28f57a04 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/IntegerProperty.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //tag::associations-any-property-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java index d3ffc1f72e..0646513298 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyHolder.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.Any; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java index 1c16c7c550..762d52a5f9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/PropertyRepository.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.associations.any; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.ManyToAny; diff --git a/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java b/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java index d2d68c471c..35458e56f2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java +++ b/documentation/src/test/java/org/hibernate/userguide/associations/any/StringProperty.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.associations.any; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //tag::associations-any-property-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java index 86de9f8cfd..0bec711325 100644 --- a/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/batch/BatchTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.batch; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.hibernate.CacheMode; import org.hibernate.ScrollMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java index b6fc2cf11c..a2c4b7afc1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/bootstrap/BootstrapTest.java @@ -14,20 +14,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; -import javax.persistence.AttributeConverter; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.Persistence; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceProperty; -import javax.persistence.PersistenceUnit; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.ClassTransformer; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.PersistenceProperty; +import jakarta.persistence.PersistenceUnit; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.ClassTransformer; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.EmptyInterceptor; @@ -336,7 +336,7 @@ public class BootstrapTest { } //tag::bootstrap-event-listener-registration-example[] - public class MyIntegrator implements org.hibernate.integrator.spi.Integrator { + public class MyIntegrator implements Integrator { @Override public void integrate( diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java index 32d5182b2f..c04cb2255a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/FirstLevelCacheTest.java @@ -8,18 +8,17 @@ package org.hibernate.userguide.caching; import java.util.ArrayList; import java.util.List; -import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -30,16 +29,7 @@ public class FirstLevelCacheTest extends BaseEntityManagerFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] { - Person.class - }; - } - - @Override - @SuppressWarnings( "unchecked" ) - protected void addConfigOptions(Map options) { - options.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.TRUE.toString() ); - options.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); + return new Class[] { Person.class }; } @Test diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java index 91f3398326..48e5f73ca7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/NonStrictReadWriteCacheTest.java @@ -9,25 +9,23 @@ package org.hibernate.userguide.caching; import java.util.ArrayList; import java.util.List; import java.util.Map; -import javax.cache.configuration.MutableConfiguration; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.cache.jcache.JCacheHelper; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.testing.FailureExpected; import org.junit.Test; -import org.jboss.logging.Logger; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; @@ -35,22 +33,23 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; /** * @author Vlad Mihalcea */ +@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" ) public class NonStrictReadWriteCacheTest extends BaseEntityManagerFunctionalTestCase { @Override public void buildEntityManagerFactory() { - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person", - new MutableConfiguration<>() - ); - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone", - new MutableConfiguration<>() - ); - JCacheHelper.locateStandardCacheManager().createCache( - "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones", - new MutableConfiguration<>() - ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person", +// new MutableConfiguration<>() +// ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Phone", +// new MutableConfiguration<>() +// ); +// JCacheHelper.locateStandardCacheManager().createCache( +// "hibernate.test.org.hibernate.userguide.caching.NonStrictReadWriteCacheTest$Person.phones", +// new MutableConfiguration<>() +// ); super.buildEntityManagerFactory(); } diff --git a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java index a5602e7ff9..b76302f6b4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/caching/SecondLevelCacheTest.java @@ -9,14 +9,14 @@ package org.hibernate.userguide.caching; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.Cacheable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.CacheMode; import org.hibernate.Session; @@ -162,7 +162,7 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { .setParameter( "id", 0L) .setHint( QueryHints.HINT_CACHEABLE, "true") .setHint( QueryHints.HINT_CACHE_REGION, "query.cache.person" ) - .setHint( "javax.persistence.cache.storeMode", CacheStoreMode.REFRESH ) + .setHint( "jakarta.persistence.cache.storeMode", CacheStoreMode.REFRESH ) .getResultList(); //end::caching-query-region-store-mode-jpa-example[] }); @@ -206,8 +206,8 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { doInJPA( this::entityManagerFactory, entityManager -> { //tag::caching-management-cache-mode-entity-jpa-example[] Map hints = new HashMap<>( ); - hints.put( "javax.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ); - hints.put( "javax.persistence.cache.storeMode" , CacheStoreMode.REFRESH ); + hints.put( "jakarta.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ); + hints.put( "jakarta.persistence.cache.storeMode" , CacheStoreMode.REFRESH ); Person person = entityManager.find( Person.class, 1L , hints); //end::caching-management-cache-mode-entity-jpa-example[] }); @@ -225,8 +225,8 @@ public class SecondLevelCacheTest extends BaseEntityManagerFunctionalTestCase { List persons = entityManager.createQuery( "select p from Person p", Person.class) .setHint( QueryHints.HINT_CACHEABLE, "true") - .setHint( "javax.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ) - .setHint( "javax.persistence.cache.storeMode" , CacheStoreMode.REFRESH ) + .setHint( "jakarta.persistence.cache.retrieveMode" , CacheRetrieveMode.USE ) + .setHint( "jakarta.persistence.cache.storeMode" , CacheStoreMode.REFRESH ) .getResultList(); //end::caching-management-cache-mode-query-jpa-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java index fad6eb82ab..7e6334aaf1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ArrayTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.collections; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java index edf53fcb33..30c2504155 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java @@ -8,8 +8,8 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java index f432646cac..7b83b5dd78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeElementCollectionTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java index 3d3642d3fa..50c336ce4f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeOrderColumnElementCollectionTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OrderColumn; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OrderColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java index 10f4363d29..19a11ecec3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagOrphanRemovalTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java index 6b407f7c4a..2b349977e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalBagTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java index d79517a265..d811817d85 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalComparatorSortedSetTest.java @@ -11,12 +11,12 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java index a9739f5007..2c58c2116d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalMapTest.java @@ -11,15 +11,15 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyEnumerated; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java index 118d568a93..1fde022eda 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderByListTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java index f280238eb8..27ccdd778a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalOrderColumnListTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java index 171a3bd5f4..507cdd0411 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSetTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java index 8d84af98ac..303c98009e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/BidirectionalSortedSetTest.java @@ -10,12 +10,12 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java index a1a4d272ca..805f57fbfa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/ElementCollectionMapTest.java @@ -9,15 +9,15 @@ package org.hibernate.userguide.collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java index 128fd2f537..4026353ee9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/EmbeddableTypeElementCollectionTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java index ad718cb4e5..e60536c504 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyClassTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyClass; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyClass; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java index 67c80a2e4b..312d44ea45 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/MapKeyTypeTest.java @@ -12,15 +12,15 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.MapKeyColumn; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.Table; import org.hibernate.annotations.MapKeyType; import org.hibernate.annotations.Type; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java index 71db2b6256..eec8ecf714 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderColumnListIndexBaseTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.ListIndexBase; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java index cd641a8249..3bda5525f2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/OrderedBySQLTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.dialect.H2Dialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java index 6df6e46e2d..46c7700284 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/QueueTest.java @@ -10,11 +10,11 @@ import java.util.Collection; import java.util.LinkedList; import java.util.Objects; import java.util.Queue; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.CollectionType; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java index 4cea556997..b058a3a5e4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalBagTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java index c91d76b7b4..e3ec4dca52 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalComparatorSortedSetTest.java @@ -11,11 +11,11 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortComparator; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java index 26bd94c90a..4f52eb0181 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalMapTest.java @@ -11,17 +11,17 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.HashMap; import java.util.Map; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MapKey; -import javax.persistence.MapKeyTemporal; -import javax.persistence.OneToMany; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyTemporal; +import jakarta.persistence.OneToMany; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java index 83487414ef..fc0ce302a5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderColumnListTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java index 0aaf90a899..345100b585 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalOrderedByListTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.collections; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java index 2f16438f95..f6321356fe 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSetTest.java @@ -9,11 +9,11 @@ package org.hibernate.userguide.collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java index f330b31d0d..5e958c8a58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/collections/UnidirectionalSortedSetTest.java @@ -10,11 +10,11 @@ import java.util.Objects; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.SortNatural; diff --git a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java index ce5a24d479..3c30b04d3e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/criteria/CriteriaTest.java @@ -11,18 +11,18 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.AddressType; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java index 43ac06a8d5..61e74d84ba 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/CustomRevisionEntityTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java index c9d16d1717..9fee481233 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/DefaultAuditTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java index 2f94703a7d..dcd4bfc667 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditDefaultTrackingTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Arrays; import java.util.Date; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java index 08a1d19ec3..0fdac08d41 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTest.java @@ -12,16 +12,16 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java index c902edc61d..01f2df6faf 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/EntityTypeChangeAuditTrackingRevisionListenerTest.java @@ -12,17 +12,17 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.cfg.AvailableSettings; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java index c690dd95ec..eb601c13de 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ModifiedFlagsAuditTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java index 0d43d35a4f..2d4af319e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditAdressCountryTest.java @@ -9,14 +9,14 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.dialect.HSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java index ba6903ab1d..652fd4bfd6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditTest.java @@ -12,14 +12,14 @@ import java.time.ZoneOffset; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.criteria.JoinType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.criteria.JoinType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java index 886d092bc4..0d19bbb83d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/QueryAuditWithModifiedFlagTest.java @@ -9,13 +9,13 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java index 468a66b792..5461331fc5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/envers/ValidityStrategyAuditTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.envers; import java.util.Date; import java.util.List; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NoResultException; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NoResultException; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.envers.AuditReaderFactory; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java b/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java index 213fb02685..a71a2e44ad 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/BaseEntity.java @@ -1,7 +1,7 @@ package org.hibernate.userguide.events; import java.sql.Timestamp; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java index f74570f01c..32902e89fb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/DefaultEntityListenerTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.events; -import javax.persistence.Entity; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java index 478c1d59f5..8e75804efb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/InterceptorTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.events; import java.io.Serializable; import java.util.Arrays; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java b/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java index 543eb5824d..e220cb17f3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/events/ListenerTest.java @@ -14,15 +14,15 @@ import java.time.ZoneOffset; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.EntityManagerFactory; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.PostLoad; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import org.hibernate.HibernateException; import org.hibernate.boot.Metadata; @@ -182,7 +182,7 @@ public class ListenerTest extends BaseEntityManagerFunctionalTestCase { //tag::events-interceptors-example[] public static class SecuredLoadEntityListener implements LoadEventListener { // this is the single method defined by the LoadEventListener interface - public void onLoad(LoadEvent event, LoadEventListener.LoadType loadType) + public void onLoad(LoadEvent event, LoadType loadType) throws HibernateException { if ( !Principal.isAuthorized( event.getEntityClassName(), event.getEntityId() ) ) { throw new SecurityException( "Unauthorized access" ); diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java index 1c28ac607f..2b748dd85c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/BatchFetchingTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java index e464f8150e..506ed51b05 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/DirectVsQueryFetchingTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.fetching; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java index a0ebffc424..24ea43f401 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeJoinTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java index e2172177c3..2d8a4e591b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSelectTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java index ffa08e9764..7c103452d9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchModeSubselectTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java index 2dbec1f5b6..b6f50536c7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/FetchingTest.java @@ -8,17 +8,17 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import org.hibernate.Session; import org.hibernate.annotations.ColumnTransformer; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java index 1fe3b15f88..e07d98e8aa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphFetchingTest.java @@ -9,17 +9,17 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedSubgraph; -import javax.persistence.OneToMany; -import javax.persistence.QueryHint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.OneToMany; +import jakarta.persistence.QueryHint; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.NaturalId; @@ -89,7 +89,7 @@ public class GraphFetchingTest extends BaseEntityManagerFunctionalTestCase { Employee.class, userId, Collections.singletonMap( - "javax.persistence.fetchgraph", + "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( "employee.projects" ) ) ); @@ -103,7 +103,7 @@ public class GraphFetchingTest extends BaseEntityManagerFunctionalTestCase { Project.class, 1L, Collections.singletonMap( - "javax.persistence.fetchgraph", + "jakarta.persistence.fetchgraph", entityManager.getEntityGraph( "project.employees" ) ) ); diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java index 32328d7fae..62a7ba0138 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/GraphParsingTest.java @@ -4,16 +4,16 @@ import java.io.Serializable; import java.time.LocalDateTime; import java.util.Collections; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.TypedQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.TypedQuery; import org.hibernate.dialect.H2Dialect; import org.hibernate.orm.test.entitygraph.parser.AbstractEntityGraphTest; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java index e129428979..13a577887c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/LazyCollectionTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.annotations.LazyCollection; import org.hibernate.annotations.LazyCollectionOption; diff --git a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java index 299927b757..c739cdcee8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/fetching/ProfileFetchingTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.fetching; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.Session; import org.hibernate.annotations.ColumnTransformer; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java index d3814f17bc..6e40236def 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AlwaysFlushTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java index 649d7aed4c..867221b013 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/AutoFlushTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java index a1ea96bc8a..6222509b38 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/CommitFlushTest.java @@ -8,14 +8,14 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java index d124ece225..6e73af07a9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/FlushOrderTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java index 610bf6d96f..997a9f07e2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/HibernateAutoFlushTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.flush; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; -import javax.persistence.FlushModeType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java index 0eba25231f..f9a4fca7d3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/flush/ManualFlushTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.flush; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.FlushMode; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java index fa572c4ec6..2838cfc57c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.Query; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; import org.hibernate.CacheMode; import org.hibernate.ScrollableResults; @@ -607,7 +607,7 @@ public class HQLTest extends BaseEntityManagerFunctionalTestCase { "from Person p " + "where p.name like :name" ) // timeout - in milliseconds - .setHint( "javax.persistence.query.timeout", 2000 ) + .setHint( "jakarta.persistence.query.timeout", 2000 ) // flush only at commit time .setFlushMode( FlushModeType.COMMIT ); //end::jpql-api-basic-usage-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java index 5dc9901513..32f8f14af3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionSelectClauseTest.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.hql; import java.sql.Statement; import java.util.List; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Tuple; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Tuple; import org.hibernate.Session; import org.hibernate.boot.spi.MetadataBuilderContributor; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java index a88d97dddf..1427f5c827 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/PostgreSQLFunctionWhereClauseTest.java @@ -8,8 +8,8 @@ package org.hibernate.userguide.hql; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java index fdbd5f362a..723b8ccad6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/hql/SelectDistinctTest.java @@ -9,15 +9,15 @@ package org.hibernate.userguide.hql; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.QueryHints; diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java index a4cb609d11..a2af3e78c3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/CollectionImmutabilityTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.immutability; import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Immutable; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java index 81dea2f205..92cf524d21 100644 --- a/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/immutability/EntityImmutabilityTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.immutability; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java index 16a503ef57..aa03147442 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorNotNullSingleTableTest.java @@ -11,11 +11,11 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java index a876946b11..2d5ef9715e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/DiscriminatorOptionsNotNullSingleTableTest.java @@ -11,11 +11,11 @@ import java.sql.Statement; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.Session; import org.hibernate.annotations.DiscriminatorOptions; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java index bfe845bd75..96c3edc9fb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTablePrimaryKeyJoinColumnTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.PrimaryKeyJoinColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java index 9442c377f7..db590bfe35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/JoinTableTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java index 1ddbf7f551..4a318104b1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/MappedSuperclassTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java index ec59c3bc2d..ae3e745422 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableDiscriminatorFormulaTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.annotations.DiscriminatorFormula; import org.hibernate.dialect.PostgreSQL81Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java index fc0316edfc..2123e7bb78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/SingleTableTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java index 2db426456c..640fec270d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/TablePerClassTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.inheritance; import java.math.BigDecimal; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java index 6717a1baa7..bf1f985742 100644 --- a/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/inheritance/polymorphism/ExplicitPolymorphismTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.inheritance.polymorphism; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Polymorphism; import org.hibernate.annotations.PolymorphismType; diff --git a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java index b91d472f85..b17ff34d5c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/jmx/JmxTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.jmx; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java index 763b6252b3..05e8cf9a78 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/ExplicitLockingTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.locking; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.LockModeType; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.LockMode; import org.hibernate.LockOptions; @@ -60,7 +60,7 @@ public class ExplicitLockingTest extends BaseEntityManagerFunctionalTestCase { //tag::locking-jpa-query-hints-timeout-example[] entityManager.find( Person.class, id, LockModeType.PESSIMISTIC_WRITE, - Collections.singletonMap( "javax.persistence.lock.timeout", 200 ) + Collections.singletonMap( "jakarta.persistence.lock.timeout", 200 ) ); //end::locking-jpa-query-hints-timeout-example[] } ); @@ -84,7 +84,7 @@ public class ExplicitLockingTest extends BaseEntityManagerFunctionalTestCase { Person person = entityManager.find( Person.class, id, LockModeType.PESSIMISTIC_WRITE, Collections.singletonMap( - "javax.persistence.lock.scope", + "jakarta.persistence.lock.scope", PessimisticLockScope.EXTENDED ) ); //end::locking-jpa-query-hints-scope-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java index 325b90dd2e..b9d1804ea9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.locking; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.OptimisticLock; import org.hibernate.dialect.CockroachDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java index 3fdeb88e7c..a12adb3474 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeAllTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java index 1d48c2cc72..d552e573b8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockTypeDirtyTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.OptimisticLockType; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java index f28a1ac45d..3e3e134db2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingInstantTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; import java.time.Instant; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java index a4edb3cbdb..67ccd57226 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.locking; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java index 5a1e31d322..593fa1626c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/OptimisticLockingTimestampTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.locking; import java.sql.Timestamp; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java index 3b37e4601b..fdbfca7869 100644 --- a/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/locking/VersionSourceTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.locking; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.annotations.Source; import org.hibernate.annotations.SourceType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java index 1368870be3..7dd4b87bd6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/ElementCollectionAccessTest.java @@ -8,15 +8,15 @@ package org.hibernate.userguide.mapping.access; import java.util.ArrayList; import java.util.List; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.CollectionTable; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java index 7fbc929961..086956ef58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/EmbeddableAccessTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java index b85c952489..ff52a63f35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/FieldAccessTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java index 844bddf965..19f375ffcf 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessOverrideTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java index 0a5a752127..34672b9897 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/access/PropertyAccessTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.access; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java index 4f26234c4e..4e62727c7b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/AutoQuotingTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java index 67cc88c232..6671adbe5b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigDecimalMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigDecimal; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java index ec0d1d0ee2..65ac54aa64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BigIntegerMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigInteger; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java index b42dfbbb13..1e1e44dfec 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetConverterTests.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java index 838616d189..7ab90e3dec 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetImplicitTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java index e2a8b7ee97..c7636a1109 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeRegistrationTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JavaTypeRegistration; import org.hibernate.metamodel.mapping.SingularAttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java index ef72745481..04c3544756 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJavaTypeTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JavaType; import org.hibernate.metamodel.mapping.SingularAttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java index 470187d4d7..0dfbf41964 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeCodeTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; /** - * Tests for {@link org.hibernate.annotations.JdbcTypeCode} + * Tests for {@link JdbcTypeCode} * * @author Steve Ebersole */ diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java index fac56f3f25..448cf73490 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeRegistrationTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.JdbcTypeRegistration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java index 9975436c11..0272f5e255 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetJdbcTypeTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.annotations.JdbcType; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java index 8b5b19cfce..15b57d34fd 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeDefTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.TypeDef; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java index baa87e38aa..4b683deca7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java index 91c7d25e35..4ad724b674 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java @@ -7,13 +7,13 @@ package org.hibernate.userguide.mapping.basic; import java.util.BitSet; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.annotations.Type; import org.hibernate.cfg.Configuration; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java index d8d390838e..2044af9d0f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobByteArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java index 834ebb5128..d979ea8901 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BlobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.sql.Blob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.BlobProxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java index e06ce795d8..b0e7dd2e7e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/BooleanMappingTests.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Basic; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java index f0caf607e0..9ed57fae15 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteArrayMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java index fd34ac35db..6b4ca3a28e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ByteMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.AttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java index 1c160b34c8..b5e795193a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CalendarWithTemporalTimestampTest.java @@ -8,12 +8,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Calendar; import java.util.GregorianCalendar; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java index 49d5c96f28..50388164de 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.metamodel.MappingMetamodel; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java index 5245582dab..20c95896a5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterArrayNationalizedMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java index 9f554c32a1..c588baf087 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CharacterMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java index d4069289b9..3493dd344a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClassMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.ZoneOffset; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java index 75ccb31976..d2d39fe517 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobCharArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java index 5df1221983..724f4b7409 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobStringTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java index 503413c636..38215aaa21 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ClobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; import java.sql.Clob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.Session; import org.hibernate.engine.jdbc.ClobProxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java index 2f9d044f12..79fdc4eb37 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ColumnTransformerTest.java @@ -9,8 +9,8 @@ package org.hibernate.userguide.mapping.basic; import java.math.BigDecimal; import java.util.Currency; import java.util.Locale; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java index f286161ee7..8963e4b533 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/CurrencyMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.Currency; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java index f38223d48c..20c0272017 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DatePrecisionTests.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Instant; import java.util.Date; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; @@ -45,7 +45,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.TIMESTAMP ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.TIMESTAMP ) ); } @@ -55,7 +55,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.DATE ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.DATE ) ); } @@ -65,7 +65,7 @@ public class DatePrecisionTests { final JdbcMapping jdbcMapping = attribute.getJdbcMapping(); final TemporalJavaTypeDescriptor jtd = (TemporalJavaTypeDescriptor) jdbcMapping.getJavaTypeDescriptor(); assertThat( jtd, is( attribute.getJavaTypeDescriptor() ) ); - assertThat( jtd.getJavaTypeClass(), equalTo( java.util.Date.class ) ); + assertThat( jtd.getJavaTypeClass(), equalTo( Date.class ) ); assertThat( jtd.getPrecision(), equalTo( TemporalType.TIME ) ); assertThat( jdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode(), equalTo( Types.TIME ) ); } diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java index 369220cf62..1a6907bb75 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalDateTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java index eac212fbd5..1ebb189d2f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimeTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.dialect.SybaseDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java index 25b09eda72..7ba7462dd7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DateWithTemporalTimestampTest.java @@ -7,12 +7,12 @@ package org.hibernate.userguide.mapping.basic; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java index 7558400b27..70b71ab2a3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DoubleMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java index c84792eabc..7383aed50a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/DurationMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Duration; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.AttributeMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java index 9dddf80076..d4572ff6e3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationConverterTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Converter; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Converter; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java index 186294850f..8a58bac9a6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/EnumerationCustomTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Type; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java index 6e4e3dba49..a4ab4e42b7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitBasicTypeTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java index 2f08e3906d..f1e2fed532 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitColumnNamingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java index 16f6c74b8d..4f2837e976 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ExplicitTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java index 73d9cec584..a23629592c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FloatMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java index e6eaa1f0f9..2d01dede14 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/FormulaTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java index 71fdfb310b..3407ed3bf5 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ImplicitBasicTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java index c44f13443b..5d0170466b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantLiteralTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.basic; import java.time.Instant; import java.time.format.DateTimeFormatter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java index bf218da83a..b153acbc74 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/InstantMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Duration; import java.time.Instant; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java index 6dd1201386..23ff590588 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/IntegerMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java index c038c9e491..c13ae636cc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/JpaQuotingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java index 8ecc9ede73..d53a082d80 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.Instant; import java.time.LocalDate; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java index e712cf5875..930ccd1f76 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeMappingTests.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java index e4ad710ffc..1aa5bcee1d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalDateTimeWithTemporalTimeTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.time.LocalDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java index 0c3f0ae244..27f7981e84 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocalTimeMappingTests.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java index efd1ccee0d..7d0657f495 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LocaleMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.util.Currency; import java.util.Locale; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java index f56179c106..d0c581491a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/LongMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java index 56e99942a5..c547bc8585 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobCharArrayTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java index 6514f7257b..c83326e25e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobStringTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java index 7e7af93f8b..8e2f511560 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NClobTest.java @@ -11,9 +11,9 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; import java.sql.NClob; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; import org.hibernate.annotations.Nationalized; import org.hibernate.engine.jdbc.NClobProxy; @@ -134,4 +134,4 @@ public class NClobTest { //tag::basic-nclob-example[] } //end::basic-nclob-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java index 2817452f24..180d4c052a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/NationalizedTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Nationalized; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java index 8d4c0349c9..cb347773b1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetDateTimeMappingTests.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.LocalTime; import java.time.OffsetDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java index 00de59b7ca..fa8fc30e34 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/OffsetTimeMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.OffsetDateTime; import java.time.OffsetTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java index 6a9b25b800..8f883f1a4e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ParentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java index f3a7d3bd5a..4053fe3e93 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedOrdinalTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java index 684cdc51c2..8b0363ea1e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/PhoneTypeEnumeratedStringTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.userguide.model.PhoneType; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java index 72d016adcd..0d2e82aeb3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/QuotingTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java index 9afb41d4f6..dd629846c7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ShortMappingTests.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java index d21975502f..3bae678f94 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringMappingTests.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java index b07a0cdd9b..1065ce554e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/StringNationalizedMappingTests.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import org.hibernate.annotations.Nationalized; import org.hibernate.dialect.Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java index 3328405b99..8f8da72874 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/SubselectTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.Subselect; import org.hibernate.annotations.Synchronize; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java index 1d7ac4538b..0db63286ed 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TargetTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.basic; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java index cb2376f283..788dcccfb3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TimeZoneMappingTests.java @@ -10,9 +10,9 @@ import java.sql.Types; import java.time.Duration; import java.time.ZoneId; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java index 7ec10e9e01..2195b29371 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/TypeCategoryTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.basic; import java.net.URL; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java index 2149e263fe..7aea3e2c66 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZoneOffsetMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.ZoneOffset; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java index 94aae30247..1474ebc080 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/basic/ZonedDateTimeMappingTests.java @@ -9,9 +9,9 @@ package org.hibernate.userguide.mapping.basic; import java.sql.Types; import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java index 6fc5389b29..c3c54fa2c9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/MoneyConverterTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.converter; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java index 8abecb90f5..83553ac241 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringConverter.java @@ -7,8 +7,8 @@ package org.hibernate.userguide.mapping.converter; import java.time.Period; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java index ac94713d78..5f08d3260c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/PeriodStringTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.mapping.converter; import java.time.Period; -import javax.persistence.Column; -import javax.persistence.Convert; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java index 1f1d8b0b61..b9f61de26e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/converter/hbm/MoneyConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.userguide.mapping.converter.hbm; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; //tag::basic-hbm-attribute-converter-mapping-moneyconverter-example[] public class MoneyConverter diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java index 54d1fc1312..a26b71ebc0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/dynamic/Book.java @@ -1,8 +1,8 @@ package org.hibernate.userguide.mapping.dynamic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; //tag::access-field-mapping-example[] @Entity(name = "Book") diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java index c6dc6f87f0..a163e5efbb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableImplicitOverrideTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.NaturalId; import org.hibernate.boot.MetadataBuilder; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java index 48cb1d2a6c..7a28104415 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/EmbeddableOverrideTest.java @@ -6,18 +6,18 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java index 53ac2616d0..106e0760b3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/NestedEmbeddableTest.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java index 77de0baba5..193a175be3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/ParentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Parent; import org.hibernate.annotations.Target; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java index 39890360e9..d889a8855e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableEquivalentTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java index 6ae683fde5..06f892707d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/SimpleEmbeddableTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java index 9ca7553af4..9852f77327 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/embeddable/TargetTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.embeddable; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.Target; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java index ac684c98d3..26417c1f0a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/CreationTimestampTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.generated; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java index eaecbb921f..2b810c36c4 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/DatabaseValueGenerationTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.generated; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; import org.hibernate.dialect.SybaseDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java index 2e87e64a3a..3763fe1cfc 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.generated; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java index 96777649b0..3bf885d37e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratorTypeTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.generated; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.GenerationTime; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java index 7457a51373..984d96c4ab 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/InMemoryValueGenerationTest.java @@ -9,10 +9,10 @@ package org.hibernate.userguide.mapping.generated; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.ValueGenerationType; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java index 4f6664c35e..bdea5fd8e8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/generated/UpdateTimestampTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.generated; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.UpdateTimestamp; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java index a15fb3e2a4..96b772e6b2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/AssignedIdentifierTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java index b6a98220d7..6031aa035f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/Book.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java index d5dc09344c..09e7f467b6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CacheableNaturalIdTest.java @@ -7,34 +7,34 @@ package org.hibernate.userguide.mapping.identifier; import java.util.Map; -import javax.cache.configuration.MutableConfiguration; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; import org.hibernate.annotations.NaturalIdCache; -import org.hibernate.cache.jcache.JCacheHelper; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; +import org.hibernate.testing.FailureExpected; import org.junit.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; + import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.Assert.assertEquals; /** * @author Vlad Mihalcea */ +@FailureExpected( jiraKey = "", message = "Relies on hibernate-jcache + JCache + Ehcache - Ehcache uses JAXB and has not been updated to use Jakarta" ) public class CacheableNaturalIdTest extends BaseEntityManagerFunctionalTestCase { @Override public void buildEntityManagerFactory() { - JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() ); - JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() ); - JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() ); -// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "default-update-timestamps-region", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "default-query-results-region", new MutableConfiguration<>() ); +// JCacheHelper.locateStandardCacheManager().createCache( "org.hibernate.userguide.mapping.identifier.CacheableNaturalIdTest$Book##NaturalId", new MutableConfiguration<>() ); +//// JCacheHelper.locateStandardCacheManager().createCache( "", new MutableConfiguration<>() ); super.buildEntityManagerFactory(); } diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java index d1a48f4603..6d97daf27b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/CompositeNaturalIdTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java index 3d22e6493b..cd3d335088 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdManyToOneTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java index 718d0a1348..3ebf1be29f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EmbeddedIdTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java index 8b09f7ad00..05948b3013 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableCatalogTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java index 9d57d68ab6..0dac13675b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/EntityTableSchemaTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.PostgreSQLDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java index 1b07bebcc1..0726addbb7 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/GeneratedIdentifierTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java index c839865d07..8cc46382ca 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassGeneratedValueTest.java @@ -8,10 +8,10 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java index ba38df119b..787e940d2b 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassManyToOneTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java index 584e9ae5b2..93ccacfcad 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdClassTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java index fc1f53c6e9..8ad3da3100 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/IdManyToOneTest.java @@ -8,11 +8,11 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java index c68bd26197..f92224d165 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MultipleNaturalIdTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.mapping.identifier; import java.io.Serializable; import java.util.Objects; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java index 174e1be49d..4ba0aa3591 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/MutableNaturalIdTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java index 9b201eb31a..19a8e53f2f 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaiveEqualsHashCodeEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java index a5644b6f58..ddbca05472 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/NaturalIdEqualsHashCodeEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.NaturalId; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java index dabd8ef18d..565640da08 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/PooledOptimizerTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java index 350b0d7207..50c9c2e56c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/RowIdTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Formula; import org.hibernate.annotations.RowId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java index 09a3debcfa..f202ffd248 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorConfiguredTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java index e62ba1a29f..acde5390e6 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorNamedTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.SequenceGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java index 3c4bc2dc32..ee14389f2d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SequenceGeneratorUnnamedTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java index 4baca1ee03..25e0edc793 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTableTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java index 2d6b5c874a..ca8d4aaf35 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleEntityTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.mapping.identifier; import java.util.HashSet; import java.util.Objects; import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java index cd49dc6752..f78e709d7c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/SimpleNaturalIdTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java index e05b548f71..c2e7883aeb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorConfiguredTest.java @@ -6,12 +6,12 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.TableGenerator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.TableGenerator; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java index d446fcf77d..8f058fe5e0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/TableGeneratorUnnamedTest.java @@ -6,11 +6,11 @@ */ package org.hibernate.userguide.mapping.identifier; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java index a5ad2b030e..c53f058f50 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidCustomGeneratedValueTest.java @@ -7,9 +7,9 @@ package org.hibernate.userguide.mapping.identifier; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Parameter; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java index 8463454259..5f1ad46303 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/UuidGeneratedValueTest.java @@ -7,10 +7,10 @@ package org.hibernate.userguide.mapping.identifier; import java.util.UUID; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java index b6dd7ed465..9edda16317 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/Event.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.mapping.identifier.composite; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java index 18d8bcce27..19d523ecbb 100644 --- a/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java +++ b/documentation/src/test/java/org/hibernate/userguide/mapping/identifier/composite/EventId.java @@ -9,7 +9,7 @@ package org.hibernate.userguide.mapping.identifier.composite; import java.io.Serializable; import java.sql.Timestamp; import java.util.Objects; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java index e86b5fe4be..5020b52f24 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/AbstractMultiTenancyTest.java @@ -13,8 +13,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.function.Consumer; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.MultiTenancyStrategy; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java index db3e200795..e2ba0baab0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/multitenancy/DatabaseTimeZoneMultiTenancyTest.java @@ -17,9 +17,9 @@ import java.util.Map; import java.util.Properties; import java.util.TimeZone; import java.util.function.Consumer; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.MultiTenancyStrategy; import org.hibernate.Session; diff --git a/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java b/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java index 3a9402df71..11e8d4fb2a 100644 --- a/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java +++ b/documentation/src/test/java/org/hibernate/userguide/osgi/jpa/HibernateUtil.java @@ -1,8 +1,8 @@ package org.hibernate.userguide.osgi.jpa; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.spi.PersistenceProvider; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -41,4 +41,4 @@ public class HibernateUtil { return emf; } } -//end::osgi-discover-EntityManagerFactory[] \ No newline at end of file +//end::osgi-discover-EntityManagerFactory[] diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java index e8f447acb7..168b06d9f8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/BytecodeEnhancementTest.java @@ -10,13 +10,13 @@ import java.sql.Blob; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java index 96780aaaae..95d705aaf2 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteCollectionTest.java @@ -2,13 +2,13 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -146,4 +146,4 @@ public class CascadeOnDeleteCollectionTest extends BaseEntityManagerFunctionalTe //tag::pc-cascade-on-delete-collection-mapping-Phone-example[] } //end::pc-cascade-on-delete-collection-mapping-Phone-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java index d25836f399..6fc319ee1e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/CascadeOnDeleteTest.java @@ -1,11 +1,11 @@ package org.hibernate.userguide.pc; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -130,4 +130,4 @@ public class CascadeOnDeleteTest extends BaseEntityManagerFunctionalTestCase { //tag::pc-cascade-on-delete-mapping-Phone-example[] } //end::pc-cascade-on-delete-mapping-Phone-example[] -} \ No newline at end of file +} diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java index 002ba26fc6..ce575a30f0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/DynamicUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java index aad30a91be..919b28bf75 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterJoinTableTest.java @@ -8,14 +8,14 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import org.hibernate.Session; import org.hibernate.annotations.FilterDef; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java index 27271139e5..6c7066bc11 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterSqlFragementAliasTest.java @@ -9,16 +9,16 @@ package org.hibernate.userguide.pc; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NoResultException; -import javax.persistence.OneToMany; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Filter; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java index c13f2db15e..72ad7cfbda 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/FilterTest.java @@ -8,17 +8,17 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NoResultException; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NoResultException; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Filter; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java index 6428c70411..7b737ec1ca 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/MultiLoadIdTest.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.pc; import java.util.List; import java.util.Map; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.CacheMode; import org.hibernate.Session; @@ -44,8 +44,8 @@ public class MultiLoadIdTest extends BaseEntityManagerFunctionalTestCase { @Override protected void addMappings(Map settings) { - settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true ); - settings.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); +// settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true ); +// settings.put( AvailableSettings.CACHE_REGION_FACTORY, "jcache" ); settings.put( AvailableSettings.GENERATE_STATISTICS, Boolean.TRUE.toString() ); sqlStatementInterceptor = new SQLStatementInterceptor( settings ); } diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java index 0802b8d629..e8aa9155fa 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/NoDynamicUpdateTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java index 48908b4f63..98dd319628 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/PersistenceContextTest.java @@ -10,15 +10,15 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EntityNotFoundException; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Persistence; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.PersistenceUtil; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Persistence; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.PersistenceUtil; import org.hibernate.Hibernate; import org.hibernate.LockMode; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/Person.java b/documentation/src/test/java/org/hibernate/userguide/pc/Person.java index 620af209a6..1fc93d7018 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/Person.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/Person.java @@ -2,10 +2,10 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; /** * @author Vlad Mihalcea diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java b/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java index 9208313a0c..74ee29fc84 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/Phone.java @@ -1,10 +1,10 @@ package org.hibernate.userguide.pc; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Vlad Mihalcea @@ -50,4 +50,4 @@ public class Phone { } //tag::pc-cascade-domain-model-example[] } -//end::pc-cascade-domain-model-example[] \ No newline at end of file +//end::pc-cascade-domain-model-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java index eec43345db..cad750a29e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereJoinTableTest.java @@ -9,11 +9,11 @@ package org.hibernate.userguide.pc; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import org.hibernate.Session; import org.hibernate.annotations.WhereJoinTable; diff --git a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java index c08a56470d..005a4ae87c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/pc/WhereTest.java @@ -8,13 +8,13 @@ package org.hibernate.userguide.pc; import java.util.ArrayList; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Where; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/persister/Author.java b/documentation/src/test/java/org/hibernate/userguide/persister/Author.java index 4dd34a7881..d51f11e94c 100644 --- a/documentation/src/test/java/org/hibernate/userguide/persister/Author.java +++ b/documentation/src/test/java/org/hibernate/userguide/persister/Author.java @@ -8,9 +8,9 @@ package org.hibernate.userguide.persister; import java.util.HashSet; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.Persister; diff --git a/documentation/src/test/java/org/hibernate/userguide/persister/Book.java b/documentation/src/test/java/org/hibernate/userguide/persister/Book.java index a15925d927..de9bb04c28 100644 --- a/documentation/src/test/java/org/hibernate/userguide/persister/Book.java +++ b/documentation/src/test/java/org/hibernate/userguide/persister/Book.java @@ -6,10 +6,10 @@ */ package org.hibernate.userguide.persister; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import org.hibernate.annotations.Persister; diff --git a/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java b/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java index cdab9f7b26..689314bbe9 100644 --- a/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/proxy/ProxyInterfaceTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.proxy; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.Proxy; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java index 1af55e7528..500b3ce2b0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/CheckTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; import org.hibernate.annotations.Check; import org.hibernate.annotations.NaturalId; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java index 42aac6e834..3dc091660e 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/ColumnDefaultTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java index 2d21f5bafc..2c6e3def64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/IndexTest.java @@ -6,17 +6,17 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java index dc0ecf863a..ef8bb757c0 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/SchemaGenerationTest.java @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import org.hibernate.annotations.LazyGroup; import org.hibernate.annotations.NaturalId; @@ -51,7 +51,7 @@ public class SchemaGenerationTest extends BaseEntityManagerFunctionalTestCase { AvailableSettings.HBM2DDL_IMPORT_FILES, "schema-generation.sql" ); - settings.put( org.hibernate.cfg.AvailableSettings.HBM2DDL_AUTO, "update" ); + settings.put( AvailableSettings.HBM2DDL_AUTO, "update" ); } return settings; } diff --git a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java index ba6f042ff8..0f3cc95cc1 100644 --- a/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/schema/UniqueConstraintTest.java @@ -6,16 +6,16 @@ */ package org.hibernate.userguide.schema; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java b/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java index a48168b5a5..b9de461b58 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Captain.java @@ -7,8 +7,8 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author Emmanuel Bernard @@ -34,4 +34,4 @@ public class Captain { } //tag::sql-composite-key-entity-associations_named-query-example[] } -//end::sql-composite-key-entity-associations_named-query-example[] \ No newline at end of file +//end::sql-composite-key-entity-associations_named-query-example[] diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java index 0cdf7fbd4b..78c1180c64 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CollectionLoaderTest.java @@ -10,12 +10,12 @@ import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java index c2af82b64d..3c9bdd17f3 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLSecondaryTableTest.java @@ -7,15 +7,15 @@ package org.hibernate.userguide.sql; import java.sql.Statement; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.SecondaryTable; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.SecondaryTable; +import jakarta.persistence.Table; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java index 0da5d92979..e93bcf601d 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/CustomSQLTest.java @@ -9,12 +9,12 @@ package org.hibernate.userguide.sql; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java b/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java index e34918adf3..fd50e6c237 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Dimensions.java @@ -7,7 +7,7 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java b/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java index ea195067bc..94b437e464 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/Identity.java @@ -8,7 +8,7 @@ //$Id$ package org.hibernate.userguide.sql; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java index f9a762fb7e..921452cce8 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/MySQLStoredProcedureTest.java @@ -10,8 +10,8 @@ import java.time.ZoneOffset; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java index fcc7213d7c..fca90ff534 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleCustomSQLWithStoredProcedureTest.java @@ -7,11 +7,11 @@ package org.hibernate.userguide.sql; import java.sql.Statement; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; import org.hibernate.Session; import org.hibernate.annotations.Loader; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java index cdee4b32b1..a3082e6f19 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/OracleStoredProcedureTest.java @@ -7,8 +7,8 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.Session; import org.hibernate.dialect.Oracle8iDialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java index 2c39857e11..f3ed763a49 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.Session; import org.hibernate.dialect.H2Dialect; diff --git a/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java b/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java index a9d22ff158..2cab480002 100644 --- a/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java +++ b/documentation/src/test/java/org/hibernate/userguide/sql/SpaceShip.java @@ -8,18 +8,18 @@ //$Id$ package org.hibernate.userguide.sql; -import javax.persistence.ColumnResult; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FetchType; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FetchType; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.SqlResultSetMapping; /** * @author Emmanuel Bernard diff --git a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java index 6050861d55..07c39ba988 100644 --- a/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java +++ b/documentation/src/test/java/org/hibernate/userguide/transactions/TransactionsTest.java @@ -6,9 +6,9 @@ */ package org.hibernate.userguide.transactions; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java b/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java index 66e0aec1e8..b10942d37d 100644 --- a/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java +++ b/documentation/src/test_legacy/org/hibernate/userguide/spatial/SpatialTest.java @@ -6,8 +6,8 @@ */ package org.hibernate.userguide.spatial; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.spatial.dialect.postgis.PostgisDialect; diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index d10914f2d2..0fff558307 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -54,8 +54,29 @@ if ( !project.description ) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Configurations and Dependencies -configurations.all*.exclude group: 'xml-apis', module: 'xml-apis' +configurations.all { + resolutionStrategy { + dependencySubstitution { + // will handle dependencies pulled in transitively + substitute module( 'javax.persistence:javax.persistence-api' ) with module( libraries.jakarta_jpa ) + substitute module( 'javax.transaction:jta' ) with module( libraries.jakarta_jta ) + substitute module( 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec' ) with module( libraries.jakarta_jta ) + substitute module( 'javax.validation:validation-api' ) with module( libraries.jakarta_validation ) + substitute module( 'javax.interceptor:javax.interceptor-api' ) with module( libraries.jakarta_interceptor ) + substitute module( 'javax.activation:javax.activation-api' ) with module( libraries.jakarta_activation ) + substitute module( 'javax.enterprise:cdi-api' ) with module( libraries.jakarta_cdi ) + substitute module( 'org.jboss.weld.se:weld-se-shaded' ) with module( libraries.jakarta_weld ) + substitute module( 'javax.xml.bind:jaxb-api' ) with module( libraries.jakarta_jaxb_api ) + substitute module( 'org.glassfish.jaxb:jaxb-runtime' ) with module( libraries.jakarta_jaxb_runtime ) + substitute module( 'org.jboss.narayana.jta:narayana-jta' ) with module( libraries.jboss_jta_jakarta ) + substitute module( 'org.jboss:jboss-transaction-spi' ) with module( libraries.jboss_tx_spi_jakarta ) + substitute module( 'org.hibernate.validator:hibernate-validator' ) with module( libraries.jakarta_validator ) + substitute module( 'org.glassfish:javax.el' ) with module( libraries.jakarta_el ) + } + } + exclude group: 'xml-apis', module: 'xml-apis' +} dependencies { implementation libraries.logging diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle index d5b37d59a0..5817fc251d 100644 --- a/gradle/javadoc.gradle +++ b/gradle/javadoc.gradle @@ -32,9 +32,9 @@ javadoc { encoding = 'UTF-8' links += [ 'https://docs.oracle.com/javase/8/docs/api/', - 'https://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/', - 'https://docs.jboss.org/cdi/api/2.0/', - 'https://javaee.github.io/javaee-spec/javadocs/' +// 'https://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/', +// 'https://docs.jboss.org/cdi/api/2.0/', + 'https://jakarta.ee/specifications/platform/10/apidocs/' ] tags = [ "apiNote", 'implSpec', 'implNote', 'todo' ] @@ -75,7 +75,7 @@ task javadocJar(type: Jar) { // Hibernate-specific JAR manifest attributes 'Hibernate-VersionFamily': project.ormVersion.family, - 'Hibernate-JpaVersion': project.jpaVersion.name + 'Hibernate-JpaVersion': project.jakartaJpaVersion.name ) } archiveClassifier.set( 'javadoc' ) diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index 7a7938db92..6de0f86257 100644 --- a/gradle/libraries.gradle +++ b/gradle/libraries.gradle @@ -44,7 +44,7 @@ ext { // We can't upgrade JAXB in Karaf (yet), but fortunately everything works fine with the version built in Karaf jaxbApiVersionOsgiRange = "[2.2,3)" jaxbRuntimeVersion = '2.3.1' - jakartaJaxbRuntimeVersion = '3.0.0' + jakartaJaxbRuntimeVersion = '3.0.2' //GraalVM graalvmVersion = '19.3.1' @@ -72,15 +72,6 @@ ext { // Byte Buddy byteBuddy: "net.bytebuddy:byte-buddy:${byteBuddyVersion}", - // javax - jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", - jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', - validation: "javax.validation:validation-api:${validationApiVersion}", - jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', - interceptor: 'javax.interceptor:javax.interceptor-api:1.2', - // required by JAXB from JDK 9 as it is not available anymore in JDK 9 - activation: 'javax.activation:javax.activation-api:1.2.0', - // jakarta jakarta_jpa: "jakarta.persistence:jakarta.persistence-api:${project.jakartaJpaVersion}", jakarta_jta: 'jakarta.transaction:jakarta.transaction-api:2.0.0', @@ -90,15 +81,25 @@ ext { jakarta_activation: 'jakarta.activation:jakarta.activation-api:2.0.1', jakarta_resource: 'jakarta.resource:jakarta.resource-api:2.0.0', jakarta_jaxb_api: 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1', + jakarta_jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jakartaJaxbRuntimeVersion}", jakarta_jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jakartaJaxbRuntimeVersion}", jakarta_cdi: 'jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0', + jakarta_weld: "org.jboss.weld.se:weld-se-shaded:${jakartaWeldVersion}", + jboss_jta_jakarta: "org.jboss.narayana.jta:narayana-jta-jakarta:5.11.2.Final", + jboss_tx_spi_jakarta: "org.jboss:jboss-transaction-spi-jakarta:7.6.1.Final", + jakarta_validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorJakartaVersion}", + jakarta_el: 'org.glassfish:jakarta.el:4.0.1', - // logging - logging: 'org.jboss.logging:jboss-logging:3.4.2.Final', - logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.1.0.Final', - logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final', - - // jaxb task + // javax + jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", + jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', + validation: "javax.validation:validation-api:${validationApiVersion}", + jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', + interceptor: 'javax.interceptor:javax.interceptor-api:1.2', + // required by JAXB from JDK 9 as it is not available anymore in JDK 9 + activation: 'javax.activation:javax.activation-api:1.2.0', + cdi: "javax.enterprise:cdi-api:${cdiVersion}", + weld: "org.jboss.weld.se:weld-se-shaded:${weldVersion}", jaxb_api: "javax.xml.bind:jaxb-api:${jaxbApiVersion}", jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}", jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jaxbRuntimeVersion}", @@ -106,6 +107,18 @@ ext { // See https://github.com/highsource/jaxb2-basics jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0', jaxb2_basics_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.12.0', + jboss_jta: "org.jboss.narayana.jta:narayana-jta:5.11.2.Final", + jboss_tx_spi: "org.jboss:jboss-transaction-spi:7.6.1.Final", + validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", + expression_language: "org.glassfish:javax.el:${elVersion}", + + + // logging + logging: 'org.jboss.logging:jboss-logging:3.4.2.Final', + logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.1.0.Final', + logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final', + + // jaxb task geolatte: "org.geolatte:geolatte-geom:${geolatteVersion}", @@ -152,25 +165,13 @@ ext { informix: 'com.ibm.informix:jdbc:4.10.12', firebird: 'org.firebirdsql.jdbc:jaybird:4.0.3.java8', - jboss_jta: "org.jboss.narayana.jta:narayana-jta:5.11.2.Final", - jboss_tx_spi: "org.jboss:jboss-transaction-spi:7.6.1.Final", - jboss_jta_jakarta: "org.jboss.narayana.jta:narayana-jta-jakarta:5.11.2.Final", - jboss_tx_spi_jakarta: "org.jboss:jboss-transaction-spi-jakarta:7.6.1.Final", xapool: "com.experlog:xapool:1.5.0", mockito: 'org.mockito:mockito-core:2.19.1', mockito_inline: 'org.mockito:mockito-inline:2.19.1', - validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", - // EL required by Hibernate Validator at test runtime - expression_language: "org.glassfish:javax.el:${elVersion}", - - jakarta_validator:"org.hibernate.validator:hibernate-validator:${hibernateValidatorJakartaVersion}", - // EL required by Hibernate Validator at test runtime - jakarta_el: 'org.glassfish:jakarta.el:4.0.1', - c3p0: "com.mchange:c3p0:0.9.5.5", ehcache: "net.sf.ehcache:ehcache:2.10.6", - ehcache3: "org.ehcache:ehcache:3.6.1", + ehcache3: "org.ehcache:ehcache:3.8.1", jcache: "javax.cache:cache-api:1.0.0", proxool: "proxool:proxool:0.8.3", hikaricp: "com.zaxxer:HikariCP:3.2.0", @@ -182,9 +183,6 @@ ext { atomikos: "com.atomikos:transactions:4.0.6", atomikos_jta: "com.atomikos:transactions-jta:4.0.6", - cdi: "javax.enterprise:cdi-api:${cdiVersion}", - weld: "org.jboss.weld.se:weld-se-shaded:${weldVersion}", - jakarta_weld: "org.jboss.weld.se:weld-se-shaded:${jakartaWeldVersion}", assertj: "org.assertj:assertj-core:${assertjVersion}", assertj_api: "org.assertj:assertj-core-api:${assertjVersion}", @@ -197,10 +195,7 @@ ext { shrinkwrap_descriptors_impl_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee:${shrinkwrapDescriptorsVersion}", jboss_vfs: "org.jboss:jboss-vfs:3.2.11.Final", - wildfly_transaction_client : 'org.wildfly.transaction:wildfly-transaction-client:1.1.7.Final', - // todo (jakarta): update the version when it is released - wildfly_transaction_client_jakarta : 'org.wildfly.transaction:wildfly-transaction-client-jakarta:1.2.0.Final-SNAPSHOT', - + wildfly_transaction_client : 'org.wildfly.transaction:wildfly-transaction-client-jakarta:2.0.0.Final', jboss_ejb_spec_jar : 'org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final', jboss_annotation_spec_jar : 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.0.Final', @@ -211,7 +206,7 @@ ext { // - which does not seem to work anyway // todo (6.0) : come back and verify whether this ever works asciidoclet : 'org.asciidoctor:asciidoclet:1.5.7-SNAPSHOT' - ] + ] } configurations.all { diff --git a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java index 3d707ca513..44df1a49f9 100644 --- a/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java +++ b/hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalSkipAutoCommitTest.java @@ -14,8 +14,8 @@ import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.junit.Test; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.sql.Connection; import java.sql.SQLException; import java.util.List; diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index bd3ede340f..f3102abeb6 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -12,20 +12,15 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) implementation libraries.c3p0 - testImplementation project( ':hibernate-testing' ) testImplementation libraries.mockito testImplementation libraries.mockito_inline - testImplementation( libraries.validator ) { - // for test runtime - transitive = true - } - // EL libraries are provided scope in Validator - testRuntimeOnly( libraries.expression_language ) + testImplementation libraries.jakarta_validator + testRuntimeOnly libraries.jakarta_el if ( db.equalsIgnoreCase( 'oracle' ) ) { - testRuntimeOnly( libraries.oracle ) + testRuntimeOnly libraries.oracle } } diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java index 37ca6529ed..52555f316b 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java @@ -3,8 +3,8 @@ package org.hibernate.test.c3p0; import java.sql.Connection; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java index e8560d3e74..55d4bd9ed3 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java @@ -3,8 +3,8 @@ package org.hibernate.test.c3p0; import java.sql.Connection; import java.sql.SQLException; import java.util.Map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java index 5de40e2786..fefc4d0b95 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java @@ -6,9 +6,9 @@ */ package org.hibernate.test.c3p0; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.annotations.GenericGenerator; import org.hibernate.validator.constraints.NotBlank; diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java index 568da506fc..012e3b7d9f 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java @@ -3,12 +3,12 @@ package org.hibernate.test.c3p0; import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.Id; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.Id; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; import org.hibernate.annotations.NamedNativeQuery; import org.hibernate.c3p0.internal.C3P0ConnectionProvider; @@ -125,7 +125,7 @@ public class OracleSQLCallableStatementProxyTest extends ), }) @Entity(name = "Person") - @javax.persistence.Table(name = "person") + @jakarta.persistence.Table(name = "person") public static class Person { @Id diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java index 5c9169d3e2..94fc41e249 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java @@ -8,8 +8,8 @@ package org.hibernate.test.c3p0; import java.util.List; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; import org.hibernate.Session; diff --git a/hibernate-community-dialects/hibernate-community-dialects.gradle b/hibernate-community-dialects/hibernate-community-dialects.gradle index ede2c8f31c..226d253489 100644 --- a/hibernate-community-dialects/hibernate-community-dialects.gradle +++ b/hibernate-community-dialects/hibernate-community-dialects.gradle @@ -10,22 +10,8 @@ description = 'Hibernate\'s community supported dialects' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { - api( project( ':hibernate-core' ) ) { - // Exclude access to this to avoid future use. - // todo (6.0) : this should no longer be transitive from core. Come back and verify this - exclude group: "org.javassist", module: "javassist" - } - - implementation libraries.commons_annotations - - // TODO HHH-13703: get rid of this dependency - implementation libraries.dom4j + api project( ':hibernate-core' ) testImplementation project( ':hibernate-testing' ) testImplementation project( path: ':hibernate-core', configuration: 'tests' ) } - -//test { -// dependsOn project(':hibernate-core').tasks.compileTestJava -// test.testClassesDirs = project(':hibernate-core').tasks.test.testClassesDirs -//} \ No newline at end of file diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java index e1bb0c6a08..e19c3b8f62 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CUBRIDDialect.java @@ -34,7 +34,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.query.TemporalUnit.*; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java index cb9fbd306e..1919228040 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/CacheDialect.java @@ -43,7 +43,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java index 5d121cc468..83ffecac01 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/FirebirdDialect.java @@ -66,7 +66,7 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.type.descriptor.DateTimeUtils.formatAsTimestampWithMillis; @@ -325,7 +325,7 @@ public class FirebirdDialect extends Dialect { } /** - * Firebird 2.5 doesn't have a real {@link java.sql.Types#BOOLEAN} + * Firebird 2.5 doesn't have a real {@link Types#BOOLEAN} * type, so... */ @Override diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java index 0701aeae03..ed7020299c 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/IngresDialect.java @@ -53,7 +53,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * An SQL dialect for Ingres 9.2. diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java index 8b60e3d17e..1be895dac1 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MimerSQLDialect.java @@ -32,7 +32,7 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * A dialect for Mimer SQL 11. diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java index 7aefe7a70c..db8e855843 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/RDMSOS2200Dialect.java @@ -35,7 +35,7 @@ import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import org.jboss.logging.Logger; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * This is the Hibernate dialect for the Unisys 2200 Relational Database (RDMS). diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java index cddd912db7..47586dc9b7 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SQLiteDialect.java @@ -7,7 +7,7 @@ package org.hibernate.community.dialect; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.ScrollMode; import org.hibernate.community.dialect.identity.SQLiteIdentityColumnSupport; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java index 8da51895a4..e88f5e18b9 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TeradataDialect.java @@ -55,7 +55,7 @@ import java.sql.Types; import java.util.Iterator; import java.util.Map; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate; diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java index c7015c5c7a..abc12c1b03 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java @@ -40,7 +40,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeDescriptorRegistry; import java.sql.Types; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * A SQL dialect for TimesTen 5.1. diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java index e779a1d842..91070aaf65 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java @@ -9,10 +9,10 @@ package org.hibernate.community.dialect; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java index 4324d55dbc..35531ca200 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/TestInterSystemsFunctionsClass.java @@ -14,9 +14,9 @@ import java.util.Date; */ public class TestInterSystemsFunctionsClass { private Long id; - private java.util.Date date3; - private java.util.Date date1; - private java.util.Date date; + private Date date3; + private Date date1; + private Date date; private String dateText; public TestInterSystemsFunctionsClass() { diff --git a/hibernate-core-jakarta/hibernate-core-jakarta.gradle b/hibernate-core-jakarta/hibernate-core-jakarta.gradle deleted file mode 100644 index 262459ec9f..0000000000 --- a/hibernate-core-jakarta/hibernate-core-jakarta.gradle +++ /dev/null @@ -1,232 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -description = 'Hibernate O/RM implementation of the Jakarta Persistence specification' - -apply from: rootProject.file( 'gradle/published-jakarta-java-module.gradle' ) - -evaluationDependsOn( ':hibernate-core' ) - -dependencies { - api libraries.jakarta_jpa - // This can now be made provided - // Could be made optional? - api libraries.byteBuddy - api libraries.antlr - api libraries.jakarta_jta - api libraries.jandex - api libraries.classmate - api libraries.jakarta_activation - - compileOnly libraries.jakarta_jacc - compileOnly libraries.jakarta_validation - compileOnly libraries.ant - compileOnly libraries.jakarta_cdi - - api libraries.dom4j - api libraries.commons_annotations - - api libraries.jakarta_jaxb_api - api libraries.jakarta_jaxb_runtime - - testImplementation project(':hibernate-testing-jakarta') - - testImplementation libraries.shrinkwrap_api - testImplementation libraries.shrinkwrap - testImplementation libraries.jakarta_jacc - testImplementation libraries.jakarta_validation - testImplementation libraries.jandex - testImplementation libraries.classmate - testImplementation libraries.mockito - testImplementation libraries.mockito_inline - testImplementation libraries.jodaTime - testImplementation libraries.assertj - - testImplementation libraries.jakarta_cdi - - testImplementation( libraries.jakarta_validator ) { - // for test runtime - transitive = true - } - - // for testing stored procedure support - testImplementation libraries.derby - - testRuntimeOnly 'org.hamcrest:hamcrest-all:1.3' - testRuntimeOnly "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" - testRuntimeOnly libraries.jakarta_el - testRuntimeOnly 'jaxen:jaxen:1.1' - testRuntimeOnly libraries.byteBuddy - testRuntimeOnly libraries.jakarta_weld - testRuntimeOnly libraries.atomikos - testRuntimeOnly libraries.atomikos_jta -// todo (jakarta): replace this when the jakarta artifact is released - testRuntimeOnly project(':hibernate-transaction-client') -// testRuntimeOnly libraries.wildfly_transaction_client_jakarta - - testImplementation libraries.shrinkwrap_descriptors_api_javaee - testImplementation libraries.shrinkwrap_descriptors_impl_javaee - - testImplementation libraries.jboss_ejb_spec_jar - testImplementation libraries.jboss_annotation_spec_jar -} - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// main jar -// -//tasks.jar { -// enabled false -//} -// -//task jakartafyJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.jar.archiveFile -// targetJar = tasks.jar.archiveFile -//} -// -//tasks.jar.dependsOn project(':hibernate-core').tasks.jar -//tasks.jar.finalizedBy tasks.jakartafyJar -//tasks.jakartafyJar.dependsOn tasks.jar -//tasks.jakartafyJar.mustRunAfter tasks.jar - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// javadoc jar - -//tasks.javadocJar { -// enabled false -//} -// -//task jakartafyJavadocJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.javadocJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.javadocJar.dependsOn project(':hibernate-core').tasks.javadocJar -//tasks.javadocJar.finalizedBy tasks.jakartafyJavadocJar -//tasks.jakartafyJavadocJar.dependsOn tasks.javadocJar -//tasks.jakartafyJavadocJar.mustRunAfter tasks.javadocJar - - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// sources jar - -//tasks.sourcesJar { -// enabled false -//} -// -//task jakartafySourcesJar( type: JakartaJarTransformation ) { -// sourceJar = project(':hibernate-core').tasks.sourcesJar.archiveFile -// targetJar = tasks.javadocJar.archiveFile -//} -// -//tasks.sourcesJar.dependsOn project(':hibernate-core').tasks.sourcesJar -//tasks.sourcesJar.finalizedBy tasks.jakartafySourcesJar -//tasks.jakartafySourcesJar.dependsOn tasks.sourcesJar -//tasks.jakartafySourcesJar.mustRunAfter tasks.sourcesJar -// - - -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// testing - -project.ext { - testClassesUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/classes' ) - testClassesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/classes' ) - - templateUnpackTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/unpack/templates' ) - templatesTransformationTargetDirectory = project.layout.buildDirectory.dir( 'jakarta/test/templates' ) -} - -//tasks.compileTestJava { -// enabled false -// dependsOn project(':hibernate-core').tasks.compileTestJava -// dependsOn -//} -// -//tasks.processTestResources { -// enabled false -// dependsOn project(':hibernate-core').tasks.compileTestJava -//} -// -//task unpackTests(type: Copy) { -// from project( ':hibernate-core' ).sourceSets.test.output -//// from zipTree( project( ':hibernate-core' ).tasks.testJar.archiveFile ) -// into project.testClassesUnpackTargetDirectory -// exclude 'templates/**' -//} -// -//task jakartafyTests(type: JakartaDirectoryTransformation) { -// sourceDirectory = project.testClassesUnpackTargetDirectory -// targetDirectory = project.testClassesTransformationTargetDirectory -// -// dependsOn 'compileTestJava' -// dependsOn 'unpackTests' -//} - -//tasks.test.dependsOn tasks.jakartafyTests -//tasks.jakartafyTests.dependsOn tasks.unpackTests -//tasks.unpackTests.dependsOn project( ':hibernate-core' ).tasks.testJar - -tasks.collectTests { - exclude 'templates/**' -} - -final Provider bundleCollectDir = project.getLayout().getBuildDirectory().dir( "jakarta/collect/bundles" ); -final Provider bundleTransformedDir = project.getLayout().getBuildDirectory().dir( "jakarta/transformed/bundles" ); - -task copyTestBundles(type: Copy) { - // `:hibernate-core:processTestResources` also triggers processing the - // packaging "bundle templates" into it's `${buildDir}/bundles` dir. - // we want to start with that form - dependsOn project( ':hibernate-core' ).tasks.processTestResources - - inputs.dir project( ':hibernate-core' ).layout.buildDirectory.dir( 'bundles' ) - outputs.dir bundleCollectDir - - from project( ':hibernate-core' ).layout.buildDirectory.dir( 'bundles' ) - into bundleCollectDir - - // There are persistence.xml files referencing jar files through their absolute path so we - // have to replace 'hibernate-core' references in the path with 'hibernate-core-jakarta' - filter { line -> - line.replaceAll( 'hibernate-core/target', 'hibernate-core-jakarta/target' ) - } - - doFirst { - bundleCollectDir.get().asFile.mkdirs() - } -} - -task jakartafyTemplates(type: JakartaDirectoryTransformation) { - dependsOn tasks.copyTestBundles - dependsOn tasks.jakartafyTests - - sourceDirectory = bundleCollectDir - targetDirectory = bundleTransformedDir -} - -tasks.test { - testClassesDirs += project.files( bundleTransformedDir ) - classpath += project.files( bundleTransformedDir ) - - systemProperty 'file.encoding', 'utf-8' - - if ( gradle.ext.javaVersions.test.launcher.asInt() >= 9 ) { - // See org.hibernate.boot.model.naming.NamingHelperTest.DefaultCharset.set - jvmArgs( ['--add-opens', 'java.base/java.nio.charset=ALL-UNNAMED'] ) - // Weld needs this to generate proxies - jvmArgs( ['--add-opens', 'java.base/java.security=ALL-UNNAMED'] ) - jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] ) - } - // Allow to exclude specific tests - if ( project.hasProperty( 'excludeTests' ) ) { - filter { - excludeTestsMatching project.property( 'excludeTests' ).toString() - } - } -} \ No newline at end of file diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index d598285246..f29331902b 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.hibernate.build.xjc' -} - /* * Hibernate, Relational Persistence for Idiomatic Java * @@ -10,6 +6,10 @@ plugins { */ import org.apache.tools.ant.filters.ReplaceTokens +plugins { + id 'org.hibernate.build.xjc-jakarta' +} + description = 'Hibernate\'s core ORM functionality' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) @@ -25,49 +25,50 @@ configurations { dependencies { - api libraries.jpa - api libraries.jta + api libraries.jakarta_jpa + api libraries.jakarta_jta + api libraries.jakarta_activation + api libraries.jakarta_jaxb_api + api libraries.jakarta_jaxb_runtime api libraries.jandex api libraries.classmate api libraries.commons_annotations - api libraries.jaxb_api implementation libraries.byteBuddy implementation libraries.activation implementation libraries.jaxb_runtime implementation libraries.antlr - compileOnly libraries.jacc - compileOnly libraries.validation + compileOnly libraries.jakarta_jacc + compileOnly libraries.jakarta_validation + compileOnly libraries.jakarta_cdi + compileOnly libraries.ant - compileOnly libraries.cdi testImplementation project(':hibernate-testing') testImplementation libraries.shrinkwrap_api testImplementation libraries.shrinkwrap testImplementation libraries.shrinkwrap_descriptors_api_javaee testImplementation libraries.shrinkwrap_descriptors_impl_javaee - testImplementation libraries.jacc - testImplementation libraries.validation - testImplementation( libraries.validator ) { + testImplementation libraries.jakarta_jacc + testImplementation libraries.jakarta_validation + testImplementation( libraries.jakarta_validator ) { // for test runtime transitive = true } - testImplementation libraries.jandex - testImplementation libraries.classmate testImplementation libraries.mockito testImplementation libraries.mockito_inline testImplementation libraries.jodaTime testImplementation libraries.assertj - testImplementation libraries.cdi + testImplementation libraries.jakarta_cdi testImplementation libraries.jboss_ejb_spec_jar testImplementation libraries.jboss_annotation_spec_jar testRuntimeOnly "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" - testRuntimeOnly libraries.expression_language + testRuntimeOnly libraries.jakarta_el testRuntimeOnly 'jaxen:jaxen:1.1' testRuntimeOnly libraries.byteBuddy - testRuntimeOnly libraries.weld + testRuntimeOnly libraries.jakarta_weld testRuntimeOnly libraries.atomikos testRuntimeOnly libraries.atomikos_jta testRuntimeOnly libraries.wildfly_transaction_client @@ -76,11 +77,9 @@ dependencies { antlr libraries.antlr - xjc libraries.jaxb_runtime - xjc libraries.jaxb_xjc - xjc libraries.jaxb2_basics - xjc libraries.jaxb2_basics_ant - xjc libraries.activation + xjc libraries.jakarta_jaxb_xjc + xjc libraries.jakarta_jaxb_runtime + xjc rootProject.fileTree(dir: 'patched-libs/jaxb2-basics', include: '*.jar') } jar { diff --git a/hibernate-core/src/main/java/org/hibernate/Cache.java b/hibernate-core/src/main/java/org/hibernate/Cache.java index c8e2393620..18ccf06654 100644 --- a/hibernate-core/src/main/java/org/hibernate/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/Cache.java @@ -19,7 +19,7 @@ import java.io.Serializable; * @author Steve Ebersole */ @SuppressWarnings( {"UnusedDeclaration"}) -public interface Cache extends javax.persistence.Cache { +public interface Cache extends jakarta.persistence.Cache { /** * Access to the SessionFactory this Cache is bound to. * diff --git a/hibernate-core/src/main/java/org/hibernate/CacheMode.java b/hibernate-core/src/main/java/org/hibernate/CacheMode.java old mode 100755 new mode 100644 index 5a7c6c20e5..9a56e53f22 --- a/hibernate-core/src/main/java/org/hibernate/CacheMode.java +++ b/hibernate-core/src/main/java/org/hibernate/CacheMode.java @@ -7,8 +7,8 @@ package org.hibernate; import java.util.Locale; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; /** * Controls how the session interacts with the second-level cache and query cache. diff --git a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java index 2761e96fb8..d3260076f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ConnectionAcquisitionMode.java @@ -10,7 +10,7 @@ import org.hibernate.internal.util.StringHelper; /** * Indicates the manner in which JDBC Connections should be acquired. Inverse to - * {@link org.hibernate.ConnectionReleaseMode}. + * {@link ConnectionReleaseMode}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/FetchMode.java index a34557e16f..6397722109 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FetchMode.java @@ -13,7 +13,7 @@ package org.hibernate; *
* For HQL queries, use the FETCH keyword instead. * - * @see Criteria#setFetchMode(java.lang.String, FetchMode) + * @see Criteria#setFetchMode(String, FetchMode) * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateException.java b/hibernate-core/src/main/java/org/hibernate/HibernateException.java index 7d3d1a8e10..d35a402177 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateException.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateException.java @@ -6,7 +6,7 @@ */ package org.hibernate; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * The base exception type for Hibernate exceptions. diff --git a/hibernate-core/src/main/java/org/hibernate/JDBCException.java b/hibernate-core/src/main/java/org/hibernate/JDBCException.java index 12402613e2..3efdce55a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/JDBCException.java +++ b/hibernate-core/src/main/java/org/hibernate/JDBCException.java @@ -13,7 +13,7 @@ import java.sql.SQLException; * * @author Gavin King * - * @see java.sql.SQLException + * @see SQLException */ public class JDBCException extends HibernateException { private final SQLException sqlException; @@ -47,7 +47,7 @@ public class JDBCException extends HibernateException { * * @return The X/Open or ANSI SQL SQLState error code; may return null. * - * @see java.sql.SQLException#getSQLState() + * @see SQLException#getSQLState() */ public String getSQLState() { return sqlException.getSQLState(); @@ -58,7 +58,7 @@ public class JDBCException extends HibernateException { * * @return The vendor specific error code * - * @see java.sql.SQLException#getErrorCode() + * @see SQLException#getErrorCode() */ public int getErrorCode() { return sqlException.getErrorCode(); diff --git a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java index df10981d61..07d408428d 100644 --- a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java +++ b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java @@ -15,8 +15,8 @@ import org.jboss.logging.Logger; * * For example, when an uninitialized proxy or collection is accessed after the session was closed. * - * @see Hibernate#initialize(java.lang.Object) - * @see Hibernate#isInitialized(java.lang.Object) + * @see Hibernate#initialize(Object) + * @see Hibernate#isInitialized(Object) * @author Gavin King */ public class LazyInitializationException extends HibernateException { diff --git a/hibernate-core/src/main/java/org/hibernate/LobHelper.java b/hibernate-core/src/main/java/org/hibernate/LobHelper.java index 85b6d5c481..42188e98d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/LobHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/LobHelper.java @@ -39,11 +39,11 @@ public interface LobHelper { public Blob createBlob(InputStream stream, long length); /** - * Create a new {@link java.sql.Clob} from content. + * Create a new {@link Clob} from content. * * @param string The string data * - * @return The created {@link java.sql.Clob} + * @return The created {@link Clob} */ public Clob createClob(String string); diff --git a/hibernate-core/src/main/java/org/hibernate/LockMode.java b/hibernate-core/src/main/java/org/hibernate/LockMode.java index 18e5498df5..a0d2c63e4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockMode.java +++ b/hibernate-core/src/main/java/org/hibernate/LockMode.java @@ -76,7 +76,7 @@ public enum LockMode { FORCE( 15, "force" ), /** - * start of javax.persistence.LockModeType equivalent modes + * start of jakarta.persistence.LockModeType equivalent modes */ /** diff --git a/hibernate-core/src/main/java/org/hibernate/Metamodel.java b/hibernate-core/src/main/java/org/hibernate/Metamodel.java index 923c64f876..853dea1361 100644 --- a/hibernate-core/src/main/java/org/hibernate/Metamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/Metamodel.java @@ -6,7 +6,7 @@ */ package org.hibernate; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; @@ -19,7 +19,7 @@ import org.hibernate.metamodel.model.domain.JpaMetamodel; * @see JpaMetamodel */ @Deprecated -public interface Metamodel extends javax.persistence.metamodel.Metamodel { +public interface Metamodel extends jakarta.persistence.metamodel.Metamodel { /** * Access to the SessionFactory that this Metamodel instance is bound to. * diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java old mode 100755 new mode 100644 index d30e648d96..63419cbb58 --- a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java @@ -17,14 +17,14 @@ public enum ScrollMode { /** * Requests a scrollable result that is only scrollable forwards. * - * @see java.sql.ResultSet#TYPE_FORWARD_ONLY + * @see ResultSet#TYPE_FORWARD_ONLY */ FORWARD_ONLY( ResultSet.TYPE_FORWARD_ONLY ), /** * Requests a scrollable result which is sensitive to changes in the underlying data. * - * @see java.sql.ResultSet#TYPE_SCROLL_SENSITIVE + * @see ResultSet#TYPE_SCROLL_SENSITIVE */ SCROLL_SENSITIVE( ResultSet.TYPE_SCROLL_SENSITIVE ), @@ -35,7 +35,7 @@ public enum ScrollMode { * might need to explicitly evict objects, if you need to see * changes made by other transactions. * - * @see java.sql.ResultSet#TYPE_SCROLL_INSENSITIVE + * @see ResultSet#TYPE_SCROLL_INSENSITIVE */ SCROLL_INSENSITIVE( ResultSet.TYPE_SCROLL_INSENSITIVE ); diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index 6bdb06c3ca..64bf8932d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -9,12 +9,12 @@ package org.hibernate; import java.io.Closeable; import java.sql.Connection; import java.util.List; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.FlushModeType; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.graph.RootGraph; import org.hibernate.stat.SessionStatistics; @@ -422,7 +422,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * @param object a transient or detached instance containing new or updated state * - * @see Session#save(java.lang.Object) + * @see Session#save(Object) * @see Session#update(Object object) */ void saveOrUpdate(Object object); @@ -918,7 +918,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * To get the default read-only/modifiable setting used for * entities and proxies that are loaded into the session: - * @see org.hibernate.Session#isDefaultReadOnly() + * @see Session#isDefaultReadOnly() * * @param entityOrProxy an entity or HibernateProxy * @return {@code true} if the entity or proxy is read-only, {@code false} if the entity or proxy is modifiable. @@ -935,7 +935,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose * * To set the default read-only/modifiable setting used for * entities and proxies that are loaded into the session: - * @see org.hibernate.Session#setDefaultReadOnly(boolean) + * @see Session#setDefaultReadOnly(boolean) * * To override this session's read-only/modifiable setting for entities * and proxies loaded by a Query: diff --git a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java index 1522d8099c..b7a2ecbffd 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionBuilder.java @@ -82,7 +82,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.SynchronizationType#SYNCHRONIZED + * @see jakarta.persistence.SynchronizationType#SYNCHRONIZED */ T autoJoinTransactions(boolean autoJoinTransactions); @@ -102,7 +102,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.PersistenceContextType + * @see jakarta.persistence.PersistenceContextType */ T flushMode(FlushMode flushMode); @@ -136,7 +136,7 @@ public interface SessionBuilder { /** * Should {@link org.hibernate.query.Query#setParameter} perform parameter validation - * when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory} + * when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory} * * @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise *

@@ -157,7 +157,7 @@ public interface SessionBuilder { * * @return {@code this}, for method chaining * - * @see javax.persistence.PersistenceContextType + * @see jakarta.persistence.PersistenceContextType * * @deprecated Only integrations can specify autoClosing behavior of individual sessions. See * {@link org.hibernate.engine.spi.SessionOwner} diff --git a/hibernate-core/src/main/java/org/hibernate/SessionException.java b/hibernate-core/src/main/java/org/hibernate/SessionException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java index 074935eeb1..b242bc905e 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java @@ -13,7 +13,7 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import javax.naming.Referenceable; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.spi.FilterDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java index 88d7450c20..2314457143 100644 --- a/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/SharedSessionContract.java @@ -8,10 +8,10 @@ package org.hibernate; import java.io.Serializable; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; @@ -88,7 +88,7 @@ public interface SharedSessionContract extends QueryProducer, Serializable { * * @return The ProcedureCall * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery */ ProcedureCall getNamedProcedureCall(String name); diff --git a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java index 701ff448b3..18763bf487 100644 --- a/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/SimpleNaturalIdLoadAccess.java @@ -19,7 +19,7 @@ import java.util.Optional; */ public interface SimpleNaturalIdLoadAccess { /** - * Specify the {@link org.hibernate.LockOptions} to use when retrieving the entity. + * Specify the {@link LockOptions} to use when retrieving the entity. * * @param lockOptions The lock options to use. * diff --git a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java index 0654347676..c9ef1eb40d 100644 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/StatelessSessionBuilder.java @@ -41,7 +41,7 @@ public interface StatelessSessionBuilder { /** * Should {@link org.hibernate.query.Query#setParameter} perform parameter validation - * when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory} + * when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory} * * @param enabled {@code true} indicates the validation should be performed, {@code false} otherwise *

diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java index 6ac446908d..971eae41c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/Transaction.java +++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java @@ -6,8 +6,8 @@ */ package org.hibernate; -import javax.persistence.EntityTransaction; -import javax.transaction.Synchronization; +import jakarta.persistence.EntityTransaction; +import jakarta.transaction.Synchronization; import org.hibernate.resource.transaction.spi.TransactionStatus; @@ -17,7 +17,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus; * implementation (eg. JTA, JDBC). *

* A transaction is associated with a {@link Session} and is usually initiated by a call to - * {@link org.hibernate.Session#beginTransaction()}. A single session might span multiple transactions since + * {@link Session#beginTransaction()}. A single session might span multiple transactions since * the notion of a session (a conversation between the application and the datastore) is of coarser granularity than * the notion of a transaction. However, it is intended that there be at most one uncommitted transaction associated * with a particular {@link Session} at any time. diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java index 9931f40e42..5f386b6750 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java @@ -35,7 +35,7 @@ import org.hibernate.sql.ast.tree.insert.InsertStatement; import org.hibernate.sql.exec.spi.ExecutionContext; /** - * An {@link org.hibernate.engine.spi.ActionQueue} {@link org.hibernate.action.spi.Executable} for ensuring + * An {@link org.hibernate.engine.spi.ActionQueue} {@link Executable} for ensuring * shared cache cleanup in relation to performed bulk HQL queries. *

* NOTE: currently this executes for INSERT queries as well as diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java index ad7c6e5c86..5fd9ba2a2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityActionVetoException.java @@ -8,7 +8,7 @@ package org.hibernate.action.internal; import org.hibernate.HibernateException; /** - * An exception indicating that an {@link org.hibernate.action.internal.EntityAction} was vetoed. + * An exception indicating that an {@link EntityAction} was vetoed. * * @author Vlad Mihalcea */ @@ -20,7 +20,7 @@ public class EntityActionVetoException extends HibernateException { * Constructs a EntityActionVetoException * * @param message Message explaining the exception condition - * @param entityAction The {@link org.hibernate.action.internal.EntityAction} was vetoed that was vetoed. + * @param entityAction The {@link EntityAction} was vetoed that was vetoed. */ public EntityActionVetoException(String message, EntityAction entityAction) { super( message ); diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java index 9e487cedb4..6408baabb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java @@ -87,14 +87,14 @@ public class UnresolvedEntityInsertActions { } /** - * Throws {@link org.hibernate.PropertyValueException} if there are any unresolved + * Throws {@link PropertyValueException} if there are any unresolved * entity insert actions that depend on non-nullable associations with * a transient entity. This method should be called on completion of * an operation (after all cascades are completed) that saves an entity. * - * @throws org.hibernate.PropertyValueException if there are any unresolved entity - * insert actions; {@link org.hibernate.PropertyValueException#getEntityName()} - * and {@link org.hibernate.PropertyValueException#getPropertyName()} will + * @throws PropertyValueException if there are any unresolved entity + * insert actions; {@link PropertyValueException#getEntityName()} + * and {@link PropertyValueException#getPropertyName()} will * return the entity name and property value for the first unresolved * entity insert action. */ diff --git a/hibernate-core/src/main/java/org/hibernate/action/package.html b/hibernate-core/src/main/java/org/hibernate/action/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java index 331d673ed0..d153a7dd2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java @@ -6,8 +6,8 @@ */ package org.hibernate.annotations; import java.lang.annotation.Retention; -import javax.persistence.Column; -import javax.persistence.FetchType; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java index f98c27996c..11f1c9e2b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AttributeAccessor.java @@ -16,7 +16,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Names a persistent property access strategy ({@link org.hibernate.property.access.spi.PropertyAccessStrategy}) to use. + * Names a persistent property access strategy ({@link PropertyAccessStrategy}) to use. * * Can be specified at either:

    *
  • @@ -28,13 +28,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; *
    • *
* - * Should only be used to name custom {@link org.hibernate.property.access.spi.PropertyAccessStrategy}. For - * {@code property/field} access, the JPA {@link javax.persistence.Access} annotation should be preferred - * using the appropriate {@link javax.persistence.AccessType}. However, if this annotation is used with + * Should only be used to name custom {@link PropertyAccessStrategy}. For + * {@code property/field} access, the JPA {@link jakarta.persistence.Access} annotation should be preferred + * using the appropriate {@link jakarta.persistence.AccessType}. However, if this annotation is used with * either {@code value="property"} or {@code value="field"}, it will act just as the corresponding usage - * of {@link javax.persistence.Access}. + * of {@link jakarta.persistence.Access}. * - * @see org.hibernate.property.access.spi.PropertyAccessStrategy + * @see PropertyAccessStrategy * @see org.hibernate.property.access.spi.PropertyAccessStrategyResolver * * @author Steve Ebersole @@ -44,14 +44,14 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) public @interface AttributeAccessor { /** - * Names the {@link org.hibernate.property.access.spi.PropertyAccessStrategy} strategy. + * Names the {@link PropertyAccessStrategy} strategy. * * @deprecated use {@link #strategy()} */ @Deprecated String value() default ""; /** - * A class implementing {@link org.hibernate.property.access.spi.PropertyAccessStrategy}. + * A class implementing {@link PropertyAccessStrategy}. */ Class strategy() default PropertyAccessStrategy.class; } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java index 088743b796..6ff5fa2062 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java @@ -14,8 +14,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Apply a cascade strategy on an association. Used to apply Hibernate specific cascades. For JPA cascading, prefer - * using {@link javax.persistence.CascadeType} on {@link javax.persistence.OneToOne}, - * {@link javax.persistence.OneToMany}, etc. Hibernate will merge together both sets of cascades. + * using {@link jakarta.persistence.CascadeType} on {@link jakarta.persistence.OneToOne}, + * {@link jakarta.persistence.OneToMany}, etc. Hibernate will merge together both sets of cascades. * * @author Emmanuel Bernard * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java index b5e873e6e2..910f1a65b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java @@ -16,22 +16,22 @@ public enum CascadeType { ALL, /** - * Corresponds to {@link javax.persistence.CascadeType#PERSIST}. + * Corresponds to {@link jakarta.persistence.CascadeType#PERSIST}. */ PERSIST, /** - * Corresponds to {@link javax.persistence.CascadeType#MERGE}. + * Corresponds to {@link jakarta.persistence.CascadeType#MERGE}. */ MERGE, /** - * Corresponds to {@link javax.persistence.CascadeType#REMOVE}. + * Corresponds to {@link jakarta.persistence.CascadeType#REMOVE}. */ REMOVE, /** - * Corresponds to {@link javax.persistence.CascadeType#REFRESH}. + * Corresponds to {@link jakarta.persistence.CascadeType#REFRESH}. */ REFRESH, @@ -64,7 +64,7 @@ public enum CascadeType { LOCK, /** - * Corresponds to {@link javax.persistence.CascadeType#DETACH}. + * Corresponds to {@link jakarta.persistence.CascadeType#DETACH}. */ DETACH } diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java index 4bdecabe92..96ff35bcd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java @@ -1,41 +1,41 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.persistence.Column; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Describe an identifier column for a bag (ie an idbag). - * - * EXPERIMENTAL: the structure of this annotation might slightly change (generator() mix strategy and generator - * - * @author Emmanuel Bernard - */ -@Target({METHOD, FIELD}) -@Retention(RUNTIME) -public @interface CollectionId { - /** - * Collection id column(s). - */ - Column[] columns(); - - /** - * id type, type.type() must be set. - */ - Type type(); - - /** - * The generator name. For example 'identity' or a defined generator name - */ - String generator(); -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import jakarta.persistence.Column; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Describe an identifier column for a bag (ie an idbag). + * + * EXPERIMENTAL: the structure of this annotation might slightly change (generator() mix strategy and generator + * + * @author Emmanuel Bernard + */ +@Target({METHOD, FIELD}) +@Retention(RUNTIME) +public @interface CollectionId { + /** + * Collection id column(s). + */ + Column[] columns(); + + /** + * id type, type.type() must be set. + */ + Type type(); + + /** + * The generator name. For example 'identity' or a defined generator name + */ + String generator(); +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java index 242076de2f..d0b3104794 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java @@ -8,7 +8,7 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.Column; +import jakarta.persistence.Column; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java index 4c4fd9fe09..11c35275f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Used to apply a Hibernate formula (derived value) as the inheritance discriminator "column". Used in place of - * the JPA {@link javax.persistence.DiscriminatorColumn} when a formula is wanted. + * the JPA {@link jakarta.persistence.DiscriminatorColumn} when a formula is wanted. * * To be placed on the root entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java index fa1e03a764..46014d4bbd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java @@ -1,28 +1,28 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -/** - * Fetch options on associations. Defines more of the "how" of fetching, whereas JPA {@link javax.persistence.FetchType} - * focuses on the "when". - * - * @author Emmanuel Bernard - */ -public enum FetchMode { - /** - * Use a secondary select for each individual entity, collection, or join load. - */ - SELECT, - /** - * Use an outer join to load the related entities, collections or joins. - */ - JOIN, - /** - * Available for collections only.  When accessing a non-initialized collection, this fetch mode will trigger loading all elements of all collections of the same role for all owners associated with the persistence context using a single secondary select. - */ - SUBSELECT -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +/** + * Fetch options on associations. Defines more of the "how" of fetching, whereas JPA {@link jakarta.persistence.FetchType} + * focuses on the "when". + * + * @author Emmanuel Bernard + */ +public enum FetchMode { + /** + * Use a secondary select for each individual entity, collection, or join load. + */ + SELECT, + /** + * Use an outer join to load the related entities, collections or joins. + */ + JOIN, + /** + * Available for collections only.  When accessing a non-initialized collection, this fetch mode will trigger loading all elements of all collections of the same role for all owners associated with the persistence context using a single secondary select. + */ + SUBSELECT +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java index 2686c3448b..a26c6a477c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java @@ -7,7 +7,7 @@ package org.hibernate.annotations; /** - * Enumeration extending javax.persistence flush modes. + * Enumeration extending jakarta.persistence flush modes. * * @author Carlos Gonzalez-Cadenas */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java index d3693beffc..6b9e3b05fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java @@ -1,37 +1,37 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Define the foreign key name. - * - * @deprecated Prefer the JPA 2.1 introduced {@link javax.persistence.ForeignKey} instead. - */ -@Target({FIELD, METHOD, TYPE}) -@Retention(RUNTIME) -@Deprecated -public @interface ForeignKey { - /** - * Name of the foreign key. Used in OneToMany, ManyToOne, and OneToOne - * relationships. Used for the owning side in ManyToMany relationships - */ - String name(); - - /** - * Used for the non-owning side of a ManyToMany relationship. Ignored - * in other relationships - */ - String inverseName() default ""; -} +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later. + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.annotations; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Define the foreign key name. + * + * @deprecated Prefer the JPA 2.1 introduced {@link jakarta.persistence.ForeignKey} instead. + */ +@Target({FIELD, METHOD, TYPE}) +@Retention(RUNTIME) +@Deprecated +public @interface ForeignKey { + /** + * Name of the foreign key. Used in OneToMany, ManyToOne, and OneToOne + * relationships. Used for the owning side in ManyToMany relationships + */ + String name(); + + /** + * Used for the non-owning side of a ManyToMany relationship. Ignored + * in other relationships + */ + String inverseName() default ""; +} diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java index 9103b35a09..9584262e5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java @@ -17,7 +17,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Emmanuel Bernard * - * @deprecated Using {@link javax.persistence.Index} instead. + * @deprecated Using {@link jakarta.persistence.Index} instead. */ @Target({FIELD, METHOD}) @Retention(RUNTIME) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java index b0b0615919..96dc2164fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java @@ -18,7 +18,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * @author Matthew Inger * - * @deprecated Prefer the standard JPA {@link javax.persistence.OrderColumn} annotation and the Hibernate specific + * @deprecated Prefer the standard JPA {@link jakarta.persistence.OrderColumn} annotation and the Hibernate specific * {@link ListIndexBase} (for replacing {@link #base()}). */ @Target({METHOD, FIELD}) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java index eb6fab8376..6ca32d9c5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java @@ -42,9 +42,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * ```` * * Other forms of influencing the JDBC type used include:
    - *
  • {@link javax.persistence.Enumerated} / {@link javax.persistence.EnumType}
    • - *
  • {@link javax.persistence.TemporalType}
    • - *
  • {@link javax.persistence.Lob}
    • + *
  • {@link jakarta.persistence.Enumerated} / {@link jakarta.persistence.EnumType}
    • + *
  • {@link jakarta.persistence.TemporalType}
    • + *
  • {@link jakarta.persistence.Lob}
    • *
  • {@link Nationalized}
    • *
  • {@link JdbcType}
    • *
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java index 1a2c832f0e..6b08a774ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java @@ -9,7 +9,7 @@ package org.hibernate.annotations; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java index 943cdebeda..09253d0080 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java @@ -17,9 +17,9 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; * * By default list indexes are stored starting at zero. * - * Generally used in conjunction with {@link javax.persistence.OrderColumn}. + * Generally used in conjunction with {@link jakarta.persistence.OrderColumn}. * - * @see javax.persistence.OrderColumn + * @see jakarta.persistence.OrderColumn * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java index aac5ede2d8..d98fac3b6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java @@ -7,8 +7,8 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; -import javax.persistence.Column; -import javax.persistence.FetchType; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java index ba48a40523..d54b66a24d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * A grouping of Hibernate-specific {@link NamedNativeQuery} definitions. Effectively extends the named native - * query definitions made available through {@link javax.persistence.NamedNativeQueries}. + * query definitions made available through {@link jakarta.persistence.NamedNativeQueries}. * * @author Emmanuel Bernard */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java index 1158a031b1..9eec23ef56 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java @@ -15,7 +15,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Extends {@link javax.persistence.NamedNativeQuery} with Hibernate features. + * Extends {@link jakarta.persistence.NamedNativeQuery} with Hibernate features. * * @author Emmanuel Bernard * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java index 7b648b7826..99eb8bb1b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java @@ -14,7 +14,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * A grouping of Hibernate-specific {@link NamedQuery} definitions. Effectively extends the named query - * definitions made available through {@link javax.persistence.NamedQueries}. + * definitions made available through {@link jakarta.persistence.NamedQueries}. * * @author Emmanuel Bernard * @author Carlos Gonzalez-Cadenas diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java index 850155c4df..95b5b835f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java @@ -15,7 +15,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Extends {@link javax.persistence.NamedQuery} with Hibernate features. + * Extends {@link jakarta.persistence.NamedQuery} with Hibernate features. * * @author Carlos Gonzalez-Cadenas * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java index 0f5e7886f2..80f7b36f06 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NoAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.annotations; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java index 731e824822..731a090321 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java @@ -19,7 +19,7 @@ public enum OptimisticLockType { /** * Perform optimistic locking using a dedicated version column. * - * @see javax.persistence.Version + * @see jakarta.persistence.Version */ VERSION, /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java index cf930daa3a..4e638a30d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java @@ -15,13 +15,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; /** * Order a collection using SQL ordering (not HQL ordering). * - * Different from {@link javax.persistence.OrderBy} in that this expects SQL fragment, JPA OrderBy expects a + * Different from {@link jakarta.persistence.OrderBy} in that this expects SQL fragment, JPA OrderBy expects a * valid JPQL order-by fragment. * * @author Emmanuel Bernard * @author Steve Ebersole * - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see SortComparator * @see SortNatural */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java index 39166baa23..8b1c49a979 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java @@ -100,9 +100,9 @@ public class QueryHints { /** * Available to apply lock mode to a native SQL query since JPA requires that - * {@link javax.persistence.Query#setLockMode} throw an IllegalStateException if called for a native query. + * {@link jakarta.persistence.Query#setLockMode} throw an IllegalStateException if called for a native query. *

- * Accepts a {@link javax.persistence.LockModeType} or a {@link org.hibernate.LockMode} + * Accepts a {@link jakarta.persistence.LockModeType} or a {@link org.hibernate.LockMode} */ public static final String NATIVE_LOCKMODE = "org.hibernate.lockMode"; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java index 51db734f35..1f060e0842 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java @@ -14,7 +14,7 @@ import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; /** - * Optional annotation in conjunction with {@link javax.persistence.Version} and timestamp version properties + * Optional annotation in conjunction with {@link jakarta.persistence.Version} and timestamp version properties * indicating the source of the timestamp value. * * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java index 2a0dddb164..6073d9f81e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/AttributeConverterInfo.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.spi.MetadataBuildingContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java index 664b9f3cb4..bf4efb38d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/Metadata.java @@ -40,14 +40,14 @@ import org.hibernate.query.sqm.function.SqmFunctionDescriptor; */ public interface Metadata extends Mapping { /** - * Get the builder for {@link org.hibernate.SessionFactory} instances based on this metamodel. + * Get the builder for {@link SessionFactory} instances based on this metamodel. * - * @return The builder for {@link org.hibernate.SessionFactory} instances. + * @return The builder for {@link SessionFactory} instances. */ SessionFactoryBuilder getSessionFactoryBuilder(); /** - * Short-hand form of building a {@link org.hibernate.SessionFactory} through the builder without any additional + * Short-hand form of building a {@link SessionFactory} through the builder without any additional * option overrides. * * @return THe built SessionFactory. @@ -55,7 +55,7 @@ public interface Metadata extends Mapping { SessionFactory buildSessionFactory(); /** - * Gets the {@link java.util.UUID} for this metamodel. + * Gets the {@link UUID} for this metamodel. * * @return the UUID. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java index 70621d65fa..6f07c374d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot; -import javax.persistence.AttributeConverter; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.archive.scan.spi.ScanEnvironment; import org.hibernate.boot.archive.scan.spi.ScanOptions; @@ -119,7 +119,7 @@ public interface MetadataBuilder { * @return {@code this}, for method chaining * * @see org.hibernate.cfg.AvailableSettings#DEFAULT_CACHE_CONCURRENCY_STRATEGY - * @see #applySharedCacheMode(javax.persistence.SharedCacheMode) + * @see #applySharedCacheMode(jakarta.persistence.SharedCacheMode) */ MetadataBuilder applyAccessType(AccessType accessType); @@ -189,10 +189,10 @@ public interface MetadataBuilder { /** * Should we enable support for the "new" (since 3.2) identifier generator mappings for * handling:

    - *
  • {@link javax.persistence.GenerationType#SEQUENCE}
    • - *
  • {@link javax.persistence.GenerationType#IDENTITY}
    • - *
  • {@link javax.persistence.GenerationType#TABLE}
    • - *
  • {@link javax.persistence.GenerationType#AUTO}
    • + *
  • {@link jakarta.persistence.GenerationType#SEQUENCE}
    • + *
  • {@link jakarta.persistence.GenerationType#IDENTITY}
    • + *
  • {@link jakarta.persistence.GenerationType#TABLE}
    • + *
  • {@link jakarta.persistence.GenerationType#AUTO}
    • *
*

* Its default is defined by the {@link org.hibernate.cfg.AvailableSettings#USE_NEW_ID_GENERATOR_MAPPINGS} @@ -338,7 +338,7 @@ public interface MetadataBuilder { * Ideally we should avoid accessing ClassLoaders when perform 1st phase of bootstrap. This * is a ClassLoader that can be used in cases when we have to. IN EE managed environments, this * is the ClassLoader mandated by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}. This ClassLoader + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}. This ClassLoader * is thrown away by the container afterwards. The idea being that the Class can still be enhanced * in the application ClassLoader. In other environments, pass a ClassLoader that performs the * same function if desired. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java index 7edc26dfa1..b42a84e29b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataSources.java @@ -178,7 +178,7 @@ public class MetadataSources implements Serializable { */ private MetadataBuilder getCustomBuilderOrDefault(MetadataBuilderImpl defaultBuilder) { final ClassLoaderService cls = serviceRegistry.getService( ClassLoaderService.class ); - final java.util.Collection discoveredBuilderFactories = cls.loadJavaServices( MetadataBuilderFactory.class ); + final Collection discoveredBuilderFactories = cls.loadJavaServices( MetadataBuilderFactory.class ); MetadataBuilder builder = null; List activeFactoryNames = null; @@ -206,7 +206,7 @@ public class MetadataSources implements Serializable { /** * Short-hand form of calling {@link #getMetadataBuilder()} and using its - * {@link org.hibernate.boot.MetadataBuilder#build()} method in cases where the application wants + * {@link MetadataBuilder#build()} method in cases where the application wants * to accept the defaults. * * @return The built metadata. @@ -363,11 +363,11 @@ public class MetadataSources implements Serializable { /** * Read mappings from a particular XML file * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addFile(java.io.File) + * @see #addFile(File) */ public MetadataSources addFile(String path) { addFile( new File( path ) ); @@ -401,13 +401,13 @@ public class MetadataSources implements Serializable { } /** - * See {@link #addCacheableFile(java.io.File)} for description + * See {@link #addCacheableFile(File)} for description * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addCacheableFile(java.io.File) + * @see #addCacheableFile(File) */ public MetadataSources addCacheableFile(String path) { addCacheableFile( new File( path ) ); @@ -415,13 +415,13 @@ public class MetadataSources implements Serializable { } /** - * See {@link #addCacheableFile(java.io.File)} for description + * See {@link #addCacheableFile(File)} for description * - * @param path The path to a file. Expected to be resolvable by {@link java.io.File#File(String)} + * @param path The path to a file. Expected to be resolvable by {@link File#File(String)} * * @return this (for method chaining purposes) * - * @see #addCacheableFile(java.io.File) + * @see #addCacheableFile(File) */ public MetadataSources addCacheableFile(String path, File cacheDirectory) { addCacheableFile( new File( path ), cacheDirectory ); @@ -468,15 +468,15 @@ public class MetadataSources implements Serializable { /** * INTENDED FOR TESTSUITE USE ONLY! *

- * Much like {@link #addCacheableFile(java.io.File)} except that here we will fail immediately if + * Much like {@link #addCacheableFile(File)} except that here we will fail immediately if * the cache version cannot be found or used for whatever reason * * @param file The xml file, not the bin! * * @return The dom "deserialized" from the cached file. * - * @throws org.hibernate.type.SerializationException Indicates a problem deserializing the cached dom tree - * @throws java.io.FileNotFoundException Indicates that the cached file was not found or was not usable. + * @throws SerializationException Indicates a problem deserializing the cached dom tree + * @throws FileNotFoundException Indicates that the cached file was not found or was not usable. */ public MetadataSources addCacheableFileStrictly(File file) throws SerializationException { final XmlSource xmlSource = XmlSources.fromCacheableFile( file, true ); @@ -488,15 +488,15 @@ public class MetadataSources implements Serializable { /** * INTENDED FOR TESTSUITE USE ONLY! *

- * Much like {@link #addCacheableFile(java.io.File)} except that here we will fail immediately if + * Much like {@link #addCacheableFile(File)} except that here we will fail immediately if * the cache version cannot be found or used for whatever reason * * @param file The xml file, not the bin! * * @return The dom "deserialized" from the cached file. * - * @throws org.hibernate.type.SerializationException Indicates a problem deserializing the cached dom tree - * @throws java.io.FileNotFoundException Indicates that the cached file was not found or was not usable. + * @throws SerializationException Indicates a problem deserializing the cached dom tree + * @throws FileNotFoundException Indicates that the cached file was not found or was not usable. */ public MetadataSources addCacheableFileStrictly(File file, File cacheDir) throws SerializationException { final XmlSource xmlSource = XmlSources.fromCacheableFile( file, cacheDir, true ); @@ -506,7 +506,7 @@ public class MetadataSources implements Serializable { } /** - * Read metadata from an {@link java.io.InputStream} access + * Read metadata from an {@link InputStream} access * * @param xmlInputStreamAccess Access to an input stream containing a DOM. * @@ -520,7 +520,7 @@ public class MetadataSources implements Serializable { } /** - * Read metadata from an {@link java.io.InputStream}. + * Read metadata from an {@link InputStream}. * * @param xmlInputStream The input stream containing a DOM. * @@ -534,7 +534,7 @@ public class MetadataSources implements Serializable { } /** - * Read mappings from a {@link java.net.URL} + * Read mappings from a {@link URL} * * @param url The url for the mapping document to be read. * @@ -548,7 +548,7 @@ public class MetadataSources implements Serializable { } /** - * Read mappings from a DOM {@link org.w3c.dom.Document} + * Read mappings from a DOM {@link Document} * * @param document The DOM document * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java index 2cb0caddcf..1d67fd9915 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java @@ -30,7 +30,7 @@ import org.hibernate.tuple.entity.EntityTuplizer; import org.hibernate.tuple.entity.EntityTuplizerFactory; /** - * The contract for building a {@link org.hibernate.SessionFactory} given a number of options. + * The contract for building a {@link SessionFactory} given a number of options. * * @author Steve Ebersole * @author Gail Badner @@ -178,7 +178,7 @@ public interface SessionFactoryBuilder { /** * Specifies a custom entity dirtiness strategy to be applied to the SessionFactory. See the contract - * of {@link org.hibernate.CustomEntityDirtinessStrategy} for details. + * of {@link CustomEntityDirtinessStrategy} for details. * * @param strategy The custom strategy to be used. * @@ -189,7 +189,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder applyCustomEntityDirtinessStrategy(CustomEntityDirtinessStrategy strategy); /** - * Specifies one or more entity name resolvers to be applied to the SessionFactory (see the {@link org.hibernate.EntityNameResolver} + * Specifies one or more entity name resolvers to be applied to the SessionFactory (see the {@link EntityNameResolver} * contract for more information.. Can be called multiple times to add additional resolvers.. * * @param entityNameResolvers The entityNameResolvers to add @@ -199,7 +199,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder addEntityNameResolver(EntityNameResolver... entityNameResolvers); /** - * Names the {@link org.hibernate.proxy.EntityNotFoundDelegate} to be applied to the SessionFactory. EntityNotFoundDelegate is a + * Names the {@link EntityNotFoundDelegate} to be applied to the SessionFactory. EntityNotFoundDelegate is a * strategy that accounts for different exceptions thrown between Hibernate and JPA when an entity cannot be found. * * @param entityNotFoundDelegate The delegate/strategy to use. @@ -267,7 +267,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder applyEntityTuplizerFactory(EntityTuplizerFactory entityTuplizerFactory); /** - * Register the default {@link org.hibernate.tuple.entity.EntityTuplizer} to be applied to the SessionFactory. + * Register the default {@link EntityTuplizer} to be applied to the SessionFactory. * * @param entityMode The entity mode that which this tuplizer will be applied. * @param tuplizerClass The custom tuplizer class. @@ -402,10 +402,10 @@ public interface SessionFactoryBuilder { /** * If using the built-in Hibernate JTA-based TransactionCoordinator/Builder, should it prefer to use - * {@link javax.transaction.UserTransaction} over {@link javax.transaction.Transaction}? + * {@link jakarta.transaction.UserTransaction} over {@link jakarta.transaction.Transaction}? * - * @param preferUserTransactions {@code true} indicates we should prefer {@link javax.transaction.UserTransaction}; - * {@code false} indicates we should prefer {@link javax.transaction.Transaction} + * @param preferUserTransactions {@code true} indicates we should prefer {@link jakarta.transaction.UserTransaction}; + * {@code false} indicates we should prefer {@link jakarta.transaction.Transaction} * * @return {@code this}, for method chaining * @@ -702,7 +702,7 @@ public interface SessionFactoryBuilder { /** * Apply a SQLFunction to the underlying {@link org.hibernate.query.sqm.function.SqmFunctionRegistry}. *

- * TODO : Ultimately I would like this to move to {@link org.hibernate.boot.MetadataBuilder} in conjunction with allowing mappings to reference SQLFunctions. + * TODO : Ultimately I would like this to move to {@link MetadataBuilder} in conjunction with allowing mappings to reference SQLFunctions. * today mappings can only name SQL functions directly, not through the SQLFunctionRegistry indirection * * @param registrationName The name to register it under. @@ -715,7 +715,7 @@ public interface SessionFactoryBuilder { SessionFactoryBuilder allowOutOfTransactionUpdateOperations(boolean allow); /** - * Should resources held by {@link javax.persistence.EntityManager} instance be released immediately on close? + * Should resources held by {@link jakarta.persistence.EntityManager} instance be released immediately on close? *

* The other option is to release them as part of an after-transaction callback. * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java index 2c5c650c8d..11454fdb3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/ArchiveHelper.java @@ -152,7 +152,7 @@ public class ArchiveHelper { * * @throws IOException Indicates a problem accessing the stream * - * @see #getBytesFromInputStreamSafely(java.io.InputStream) + * @see #getBytesFromInputStreamSafely(InputStream) */ public static byte[] getBytesFromInputStream(InputStream inputStream) throws IOException { // Optimized by HHH-7835 diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java index af53a5ef8c..7b014dff8d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarFileBasedArchiveDescriptor.java @@ -27,7 +27,7 @@ import org.hibernate.boot.archive.spi.InputStreamAccess; import static org.hibernate.internal.log.UrlMessageBundle.URL_MESSAGE_LOGGER; /** - * An ArchiveDescriptor implementation leveraging the {@link java.util.jar.JarFile} API for processing. + * An ArchiveDescriptor implementation leveraging the {@link JarFile} API for processing. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java index 7c44e447a3..0c5aa54c1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/internal/JarInputStreamBasedArchiveDescriptor.java @@ -22,7 +22,7 @@ import org.hibernate.boot.archive.spi.InputStreamAccess; import static org.hibernate.internal.log.UrlMessageBundle.URL_MESSAGE_LOGGER; /** - * An ArchiveDescriptor implementation that works on archives accessible through a {@link java.util.jar.JarInputStream}. + * An ArchiveDescriptor implementation that works on archives accessible through a {@link JarInputStream}. * NOTE : This is less efficient implementation than {@link JarFileBasedArchiveDescriptor} * * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/DisabledScanner.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java index 8679accff6..37fa7f7d00 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/spi/ClassFileArchiveEntryHandler.java @@ -8,10 +8,10 @@ package org.hibernate.boot.archive.scan.spi; import java.io.IOException; import java.io.InputStream; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import org.hibernate.boot.archive.scan.internal.ClassDescriptorImpl; import org.hibernate.boot.archive.scan.internal.ScanResultCollector; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java index 71a34abb54..e96cf24438 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/internal/JaxbCfgProcessor.java @@ -18,12 +18,12 @@ import org.jboss.logging.Logger; import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java index 82f680bedd..d6dbfd0525 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/cfgxml/spi/MappingReference.java @@ -45,19 +45,19 @@ public class MappingReference { public static MappingReference consume(JaxbCfgMappingReferenceType jaxbMapping) { if ( StringHelper.isNotEmpty( jaxbMapping.getClazz() ) ) { - return new MappingReference( MappingReference.Type.CLASS, jaxbMapping.getClazz() ); + return new MappingReference( Type.CLASS, jaxbMapping.getClazz() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getFile() ) ) { - return new MappingReference( MappingReference.Type.FILE, jaxbMapping.getFile() ); + return new MappingReference( Type.FILE, jaxbMapping.getFile() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getResource() ) ) { - return new MappingReference( MappingReference.Type.RESOURCE, jaxbMapping.getResource() ); + return new MappingReference( Type.RESOURCE, jaxbMapping.getResource() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getJar() ) ) { - return new MappingReference( MappingReference.Type.JAR, jaxbMapping.getJar() ); + return new MappingReference( Type.JAR, jaxbMapping.getJar() ); } else if ( StringHelper.isNotEmpty( jaxbMapping.getPackage() ) ) { - return new MappingReference( MappingReference.Type.PACKAGE, jaxbMapping.getPackage() ); + return new MappingReference( Type.PACKAGE, jaxbMapping.getPackage() ); } else { throw new ConfigurationException( " named unexpected reference type" ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java index f6cd496811..77d5f655b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/DefaultCustomEntityDirtinessStrategy.java @@ -11,7 +11,7 @@ import org.hibernate.Session; import org.hibernate.persister.entity.EntityPersister; /** - * The default implementation of {@link org.hibernate.CustomEntityDirtinessStrategy} which does nada. + * The default implementation of {@link CustomEntityDirtinessStrategy} which does nada. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java index 725a902a04..a995979de4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/IdGeneratorInterpreterImpl.java @@ -8,9 +8,9 @@ package org.hibernate.boot.internal; import java.util.ArrayList; import java.util.UUID; -import javax.persistence.GenerationType; -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; +import jakarta.persistence.GenerationType; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.TableGenerator; import org.hibernate.boot.model.IdGeneratorStrategyInterpreter; import org.hibernate.boot.model.IdentifierGeneratorDefinition; @@ -215,7 +215,7 @@ public class IdGeneratorInterpreterImpl implements IdGeneratorStrategyInterprete return "identity"; } case SEQUENCE: { - return org.hibernate.id.enhanced.SequenceStyleGenerator.class.getName(); + return SequenceStyleGenerator.class.getName(); } case TABLE: { return org.hibernate.id.enhanced.TableGenerator.class.getName(); @@ -232,7 +232,7 @@ public class IdGeneratorInterpreterImpl implements IdGeneratorStrategyInterprete return UUIDGenerator.class.getName(); } - return org.hibernate.id.enhanced.SequenceStyleGenerator.class.getName(); + return SequenceStyleGenerator.class.getName(); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java index 2d3089b178..a789ab3706 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java @@ -20,10 +20,10 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.AttributeConverter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MapsId; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MapsId; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -1124,7 +1124,7 @@ public class InFlightMetadataCollectorImpl implements InFlightMetadataCollector else if ( clazz.isAnnotationPresent( Embeddable.class ) ) { type = AnnotatedClassType.EMBEDDABLE; } - else if ( clazz.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + else if ( clazz.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { type = AnnotatedClassType.EMBEDDABLE_SUPERCLASS; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java index e5b87b4fd4..0f6f16a5ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java @@ -10,9 +10,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; -import javax.persistence.AttributeConverter; -import javax.persistence.ConstraintMode; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.HibernateException; import org.hibernate.MultiTenancyStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java index 01d7f4737e..5b644c93df 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java @@ -11,9 +11,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureParameter; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureParameter; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -38,7 +38,7 @@ import static org.hibernate.procedure.spi.NamedCallableQueryMemento.ParameterMem * * @author Steve Ebersole * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery */ public class NamedProcedureCallDefinitionImpl implements NamedProcedureCallDefinition { private final String registeredName; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java index 9efe198188..142d7b3ec9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java @@ -135,7 +135,7 @@ import static org.hibernate.internal.CoreLogging.messageLogger; import static org.hibernate.jpa.AvailableSettings.DISCARD_PC_ON_CLOSE; /** - * In-flight state of {@link org.hibernate.boot.spi.SessionFactoryOptions} + * In-flight state of {@link SessionFactoryOptions} * during {@link org.hibernate.boot.SessionFactoryBuilder} processing. * * The intention is that SessionFactoryBuilder internally creates and populates diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java index 30c21ac2d3..a4775c3462 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java @@ -7,9 +7,9 @@ package org.hibernate.boot.jaxb.internal; import java.io.InputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java index 6f0b31232b..bd0dad1733 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java @@ -6,9 +6,9 @@ */ package org.hibernate.boot.jaxb.internal; -import javax.xml.bind.ValidationEvent; -import javax.xml.bind.ValidationEventHandler; -import javax.xml.bind.ValidationEventLocator; +import jakarta.xml.bind.ValidationEvent; +import jakarta.xml.bind.ValidationEventHandler; +import jakarta.xml.bind.ValidationEventLocator; /** * ValidationEventHandler implementation providing easier access to where (line/column) an error occurred. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java index 50732a690d..6cf11d0148 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot.jaxb.internal; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java index f1a3242cac..125023d403 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java @@ -27,7 +27,7 @@ import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.w3c.dom.Document; /** - * Helper for building and handling {@link org.hibernate.boot.jaxb.spi.XmlSource} references + * Helper for building and handling {@link XmlSource} references * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java index 1a91f9be60..f202a79a7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java @@ -17,9 +17,9 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; /** - * Base class for {@link javax.xml.stream.XMLEventReader}s that want to modify or remove events from the reader stream. - * If a {@link javax.xml.stream.events.StartElement} event is removed the subclass's {@link #filterEvent(javax.xml.stream.events.XMLEvent, boolean)} will - * not see any events until after the matching {@link javax.xml.stream.events.EndElement} event. + * Base class for {@link XMLEventReader}s that want to modify or remove events from the reader stream. + * If a {@link StartElement} event is removed the subclass's {@link #filterEvent(XMLEvent, boolean)} will + * not see any events until after the matching {@link EndElement} event. * * Note, copied from the uPortal project by permission of author. See * https://github.com/Jasig/uPortal/blob/master/uportal-war/src/main/java/org/jasig/portal/xml/stream/FilteringXMLEventReader.java diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java index 12f4477673..50f3b0ec9a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java @@ -7,7 +7,6 @@ package org.hibernate.boot.jaxb.internal.stax; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import javax.xml.namespace.QName; @@ -21,11 +20,10 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.EventReaderDelegate; -import org.hibernate.boot.xsd.LocalXsdResolver; import org.hibernate.boot.xsd.MappingXsdSupport; /** - * A JPA {@code orm.xml} specific StAX EVentReader to handle a few oddities. + * StAX EVentReader which handles a few oddities specific to JPA {@code orm.xml} * * Mainly we handle the namespace change. * @@ -40,11 +38,6 @@ import org.hibernate.boot.xsd.MappingXsdSupport; */ public class JpaOrmXmlEventReader extends EventReaderDelegate { - private static final List NAMESPACE_URIS_TO_MAP = Collections.singletonList( - // JPA 1.0 and 2.0 namespace uri - "http://java.sun.com/xml/ns/persistence/orm" - ); - private static final String ROOT_ELEMENT_NAME = "entity-mappings"; private static final String VERSION_ATTRIBUTE_NAME = "version"; @@ -82,8 +75,8 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { } private StartElement wrap(StartElement startElement) { - List newElementAttributeList = mapAttributes( startElement ); - List newNamespaceList = mapNamespaces( startElement ); + final List newElementAttributeList = mapAttributes( startElement ); + final List newNamespaceList = mapNamespaces( startElement ); // Transfer the location info from the incoming event to the event factory // so that the event we ask it to generate for us has the same location info @@ -98,7 +91,7 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { private List mapAttributes(StartElement startElement) { final List mappedAttributes = new ArrayList<>(); - Iterator existingAttributesIterator = existingXmlAttributesIterator( startElement ); + final Iterator existingAttributesIterator = existingXmlAttributesIterator( startElement ); while ( existingAttributesIterator.hasNext() ) { final Attribute originalAttribute = existingAttributesIterator.next(); final Attribute attributeToUse = mapAttribute( startElement, originalAttribute ); @@ -126,11 +119,11 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { if ( VERSION_ATTRIBUTE_NAME.equals( originalAttribute.getName().getLocalPart() ) ) { final String specifiedVersion = originalAttribute.getValue(); - if ( !LocalXsdResolver.isValidJpaVersion( specifiedVersion ) ) { + if ( ! MappingXsdSupport.isValidJpaVersion( specifiedVersion ) ) { throw new BadVersionException( specifiedVersion ); } - return xmlEventFactory.createAttribute( VERSION_ATTRIBUTE_NAME, LocalXsdResolver.latestJpaVerison() ); + return xmlEventFactory.createAttribute( VERSION_ATTRIBUTE_NAME, MappingXsdSupport.latestJpaDescriptor().getVersion() ); } } @@ -169,9 +162,12 @@ public class JpaOrmXmlEventReader extends EventReaderDelegate { } private Namespace mapNamespace(Namespace originalNamespace) { - if ( NAMESPACE_URIS_TO_MAP.contains( originalNamespace.getNamespaceURI() ) ) { + if ( MappingXsdSupport.shouldBeMappedToLatestJpaDescriptor( originalNamespace.getNamespaceURI() ) ) { // this is a namespace "to map" so map it - return xmlEventFactory.createNamespace( originalNamespace.getPrefix(), MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri() ); + return xmlEventFactory.createNamespace( + originalNamespace.getPrefix(), + MappingXsdSupport.INSTANCE.latestJpaDescriptor().getNamespaceUri() + ); } return originalNamespace; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java index 0897b2bece..9f22cb2ff3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchema.java @@ -68,7 +68,7 @@ public enum LocalSchema { return schema; } - private static javax.xml.validation.Schema resolveLocalSchema(String schemaName) { + private static Schema resolveLocalSchema(String schemaName) { return resolveLocalSchema( resolveLocalSchemaUrl( schemaName ) ); } @@ -80,7 +80,7 @@ public enum LocalSchema { return url; } - private static javax.xml.validation.Schema resolveLocalSchema(URL schemaUrl) { + private static Schema resolveLocalSchema(URL schemaUrl) { try { InputStream schemaStream = schemaUrl.openStream(); try { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java index 89a749a2d1..87a3f5c1d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java @@ -12,10 +12,13 @@ import java.net.URL; import javax.xml.stream.XMLStreamException; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; -import org.hibernate.internal.log.DeprecationLogger; +import org.hibernate.boot.xsd.ConfigXsdSupport; +import org.hibernate.boot.xsd.MappingXsdSupport; import org.jboss.logging.Logger; +import static org.hibernate.internal.log.DeprecationLogger.DEPRECATION_LOGGER; + /** * @author Steve Ebersole */ @@ -36,72 +39,57 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { if ( namespace != null ) { log.debugf( "Interpreting namespace : %s", namespace ); - if ( INITIAL_JPA_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( INITIAL_JPA_XSD_MAPPING.getMappedLocalUrl() ); + if ( MappingXsdSupport.jpa10.getNamespaceUri().matches( namespace ) ) { + // JPA 1.0 and 2.0 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.jpa10.getLocalResourceName() ) ); } - else if ( JPA_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( JPA_XSD_MAPPING.getMappedLocalUrl() ); + else if ( MappingXsdSupport.jpa21.getNamespaceUri().matches( namespace ) ) { + // JPA 2.1 and 2.2 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.jpa21.getLocalResourceName() ) ); } - else if ( PERSISTENCE_ORM_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.getJPA10().getNamespaceUri().matches( namespace ) ) { + // JPA 1.0 and 2.0 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.getJPA10().getLocalResourceName() ) ); } - else if ( PERSISTENCE_ORM_XSD_MAPPING2.matches( namespace ) ) { - return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING2.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.getJPA21().getNamespaceUri().matches( namespace ) ) { + // JPA 2.1 and 2.2 share the same namespace URI + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.getJPA21().getLocalResourceName() ) ); } - else if ( HBM_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( HBM_XSD_MAPPING.getMappedLocalUrl() ); + else if ( MappingXsdSupport.hibernateMappingXml.getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.hibernateMappingXml.getLocalResourceName() ) ); } - else if ( HBM_XSD_MAPPING2.matches( namespace ) ) { - return openUrlStream( HBM_XSD_MAPPING2.getMappedLocalUrl() ); + else if ( MappingXsdSupport.hbmXml.getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( MappingXsdSupport.hbmXml.getLocalResourceName() ) ); } - else if ( CFG_XSD_MAPPING.matches( namespace ) ) { - return openUrlStream( CFG_XSD_MAPPING.getMappedLocalUrl() ); + else if ( ConfigXsdSupport.cfgXsd().getNamespaceUri().matches( namespace ) ) { + return openUrlStream( LocalSchemaLocator.resolveLocalSchemaUrl( ConfigXsdSupport.cfgXsd().getLocalResourceName() ) ); } } if ( publicID != null || systemID != null ) { - log.debugf( "Interpreting public/system identifier : [%s] - [%s]", publicID, systemID ); - if ( HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - log.debug( - "Recognized hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + log.debugf( "Checking public/system identifiers `%s`/`%s` as DTD references", publicID, systemID ); + + if ( MAPPING_DTD.matches( publicID, systemID ) ) { + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( LEGACY_HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY_HBM_DTD_MAPPING.getIdentifierBase(), - HBM_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY_MAPPING_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY_MAPPING_DTD.getIdentifierBase(), MAPPING_DTD.getIdentifierBase() ); + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( LEGACY2_HBM_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY2_HBM_DTD_MAPPING.getIdentifierBase(), - HBM_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized legacy hibernate-mapping identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( HBM_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY2_MAPPING_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY2_MAPPING_DTD.getIdentifierBase(), MAPPING_DTD.getIdentifierBase() ); + return openUrlStream( MAPPING_DTD.localSchemaUrl ); } - else if ( CFG_DTD_MAPPING.matches( publicID, systemID ) ) { - log.debug( - "Recognized hibernate-configuration identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( CFG_DTD_MAPPING.getMappedLocalUrl() ); + + if ( CFG_DTD.matches( publicID, systemID ) ) { + return openUrlStream( CFG_DTD.localSchemaUrl ); } - else if ( LEGACY_CFG_DTD_MAPPING.matches( publicID, systemID ) ) { - DeprecationLogger.DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( - LEGACY_CFG_DTD_MAPPING.getIdentifierBase(), - CFG_DTD_MAPPING.getIdentifierBase() - ); - log.debug( - "Recognized hibernate-configuration identifier; attempting to resolve on classpath under org/hibernate/" - ); - return openUrlStream( CFG_DTD_MAPPING.getMappedLocalUrl() ); + + if ( LEGACY_CFG_DTD.matches( publicID, systemID ) ) { + DEPRECATION_LOGGER.recognizedObsoleteHibernateNamespace( LEGACY_CFG_DTD.getIdentifierBase(), CFG_DTD.getIdentifierBase() ); + return openUrlStream( CFG_DTD.localSchemaUrl ); } } @@ -143,119 +131,58 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver { } } - /** - * Maps the namespace for the orm.xml xsd for jpa 1.0 and 2.0 - */ - public static final NamespaceSchemaMapping INITIAL_JPA_XSD_MAPPING = new NamespaceSchemaMapping( - "http://java.sun.com/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_0.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for jpa 2.1+ - */ - public static final NamespaceSchemaMapping JPA_XSD_MAPPING = new NamespaceSchemaMapping( - "http://xmlns.jcp.org/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_1.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for Jakarta Persistence 2.2 - */ - public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING = new NamespaceSchemaMapping( - "http://xmlns.jcp.org/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_2_2.xsd" - ); - - /** - * Maps the namespace for the orm.xml xsd for Jakarta Persistence 3.0 - */ - public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING2 = new NamespaceSchemaMapping( - "https://jakarta.ee/xml/ns/persistence/orm", - "org/hibernate/jpa/orm_3_0.xsd" - ); - - public static final NamespaceSchemaMapping HBM_XSD_MAPPING = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/orm/hbm", - "org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd" - ); - - public static final NamespaceSchemaMapping HBM_XSD_MAPPING2 = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/hibernate-mapping", - "org/hibernate/hibernate-mapping-4.0.xsd" - ); - - public static final NamespaceSchemaMapping CFG_XSD_MAPPING = new NamespaceSchemaMapping( - "http://www.hibernate.org/xsd/orm/cfg", - "org/hibernate/xsd/cfg/legacy-configuration-4.0.xsd" - ); - - public static final DtdMapping HBM_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-mapping", + public static final DtdDescriptor MAPPING_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping LEGACY_HBM_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-mapping", + public static final DtdDescriptor LEGACY_MAPPING_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping LEGACY2_HBM_DTD_MAPPING = new DtdMapping( - "http://hibernate.sourceforge.net/hibernate-mapping", + public static final DtdDescriptor LEGACY2_MAPPING_DTD = new DtdDescriptor( + "hibernate.sourceforge.net/hibernate-mapping", "org/hibernate/hibernate-mapping-3.0.dtd" ); - public static final DtdMapping CFG_DTD_MAPPING = new DtdMapping( - "http://www.hibernate.org/dtd/hibernate-configuration", + public static final DtdDescriptor CFG_DTD = new DtdDescriptor( + "www.hibernate.org/dtd/hibernate-configuration", "org/hibernate/hibernate-configuration-3.0.dtd" ); - public static final DtdMapping LEGACY_CFG_DTD_MAPPING = new DtdMapping( - "http://hibernate.sourceforge.net/hibernate-configuration", + public static final DtdDescriptor LEGACY_CFG_DTD = new DtdDescriptor( + "hibernate.sourceforge.net/hibernate-configuration", "org/hibernate/hibernate-configuration-3.0.dtd" ); - public static class NamespaceSchemaMapping { - private final String namespace; + public static class DtdDescriptor { + private final String httpBase; + private final String httpsBase; private final URL localSchemaUrl; - public NamespaceSchemaMapping(String namespace, String resourceName) { - this.namespace = namespace; - this.localSchemaUrl = LocalSchemaLocator.resolveLocalSchemaUrl( resourceName ); - } - - public boolean matches(String namespace) { - return this.namespace.equals( namespace ); - } - - public URL getMappedLocalUrl() { - return localSchemaUrl; - } - } - - public static class DtdMapping { - private final String identifierBase; - private final URL localSchemaUrl; - - public DtdMapping(String identifierBase, String resourceName) { - this.identifierBase = identifierBase; + public DtdDescriptor(String identifierBase, String resourceName) { + this.httpBase = "http://" + identifierBase; + this.httpsBase = "https://" + identifierBase; this.localSchemaUrl = LocalSchemaLocator.resolveLocalSchemaUrl( resourceName ); } public String getIdentifierBase() { - return identifierBase; + return httpBase; } public boolean matches(String publicId, String systemId) { if ( publicId != null ) { - if ( publicId.startsWith( identifierBase ) ) { + if ( publicId.startsWith( httpBase ) + || publicId.matches( httpsBase ) ) { return true; } } if ( systemId != null ) { - if ( systemId.startsWith( identifierBase ) ) { + if ( systemId.startsWith( httpBase ) + || systemId.matches( httpsBase ) ) { return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java index 6d413c8024..9795d689a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Marshalling support for dealing with JPA AccessType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java index 48049d56a7..0fdfea728a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.ConstraintMode; +import jakarta.persistence.ConstraintMode; /** * Marshalling support for dealing with JPA ConstraintMode enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java index 06ece7dff1..7e83f88b57 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorType; /** * Marshalling support for dealing with JPA DiscriminatorType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java index 9164ad6e6f..e0784744ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; /** * Marshalling support for dealing with JPA EnumType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java index 537c76377d..d4415f9ea1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.FetchType; +import jakarta.persistence.FetchType; /** * Marshalling support for dealing with JPA FetchType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java index 04e815d939..a2c4308f36 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.GenerationType; +import jakarta.persistence.GenerationType; /** * Marshalling support for dealing with JPA GenerationType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java index 93668921b7..22ad54e650 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.InheritanceType; +import jakarta.persistence.InheritanceType; /** * Marshalling support for dealing with JPA InheritanceType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java index fb975cc756..2990e96d53 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; /** * Marshalling support for dealing with JPA LockModeType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java index a481933400..f4389454a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; /** * Marshalling support for dealing with JPA ParameterMode enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java index 09ace499db..fb23ff6842 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.internal; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * Marshalling support for dealing with JPA TemporalType enums. Plugged into JAXB for binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java index dc81a6f224..8cf4df7e00 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/CollectionAttribute.java @@ -7,8 +7,8 @@ package org.hibernate.boot.jaxb.mapping.spi; import java.util.List; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; /** * Common interface for Jaxb bindings that represent persistent collection attributes. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java index edce1ae655..03ce9ef0b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/FetchableAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.FetchType; +import jakarta.persistence.FetchType; /** * Common interface for JAXB bindings that represent attributes with laziness and fetch style. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java index 7d8da934bd..a2498e78ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/ManagedType.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Common interface for JAXB bindings representing entities, mapped-superclasses and embeddables (JPA collective diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java index 79ded21dc1..0345884f43 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/NamedQuery.java @@ -8,7 +8,7 @@ package org.hibernate.boot.jaxb.mapping.spi; import java.io.Serializable; import java.util.List; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; public interface NamedQuery extends Serializable { String getDescription(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java index f1ee13b1ed..bd879814d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/mapping/spi/PersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.jaxb.mapping.spi; -import javax.persistence.AccessType; +import jakarta.persistence.AccessType; /** * Common interface for JAXB bindings that represent persistent attributes. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java b/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java index 81ea7c2136..404fedff5b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/IdGeneratorStrategyInterpreter.java @@ -6,10 +6,10 @@ */ package org.hibernate.boot.model; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.SequenceGenerator; -import javax.persistence.TableGenerator; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.TableGenerator; /** * Strategy for interpreting identifier generator related information. @@ -43,7 +43,7 @@ public interface IdGeneratorStrategyInterpreter { * For implementations that need it, the {@link GeneratedValue#generator()} * is passed as part of the `context`. * - * @param generationType The {@link javax.persistence.GeneratedValue#strategy} value + * @param generationType The {@link jakarta.persistence.GeneratedValue#strategy} value * @param context The context for resolution (method parameter object) * * @return The {@link org.hibernate.id.IdentifierGenerator} name (FQN, short name, etc) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java index 2cd08e243f..6972b44f26 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java @@ -41,13 +41,13 @@ import org.hibernate.usertype.UserType; /** * Models the information pertaining to a custom type definition supplied by the user. Used - * to delay instantiation of the actual {@link org.hibernate.type.Type} instance. + * to delay instantiation of the actual {@link Type} instance. * * Generally speaking this information would come from annotations * ({@link org.hibernate.annotations.TypeDef}) or XML mappings. An alternative form of * supplying custom types is programmatically via one of:

    - *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType)}
    • - *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, String[])}
    • + *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(BasicType)}
    • + *
  • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(UserType, String[])}
    • *
  • {@link org.hibernate.boot.MetadataBuilder#applyTypes(TypeContributor)}
    • *
* diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java index 24d6159298..1df2f073cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java @@ -7,8 +7,8 @@ package org.hibernate.boot.model.convert.internal; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.hibernate.AnnotationException; import org.hibernate.boot.internal.ClassmateContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java index 2df2223341..73d2d05a0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java index f391d6a078..f2e9d6ad2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java index aa9910407b..4a71715e53 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/package-info.java @@ -7,7 +7,7 @@ /** * Package defining boot-time handling of JPA's - * {@link javax.persistence.AttributeConverter} + * {@link jakarta.persistence.AttributeConverter} * * The general paradigm is that handling converters is split into a * boot-time piece and a run-time piece. This package defines the diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java index 8bca894438..ce92598779 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/spi/ConverterDescriptor.java @@ -6,7 +6,7 @@ */ package org.hibernate.boot.model.convert.spi; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java index 340f656c82..ef36d878ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/EntityNaming.java @@ -31,7 +31,7 @@ public interface EntityNaming { public String getEntityName(); /** - * The JPA-specific entity name. See {@link javax.persistence.Entity#name()} for details. + * The JPA-specific entity name. See {@link jakarta.persistence.Entity#name()} for details. * * @return The JPA entity name, if one was specified. May return {@code null} if one * was not explicitly specified. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java index a796e38187..b2d1e0ae5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitBasicColumnNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.Column + * @see jakarta.persistence.Column */ public interface ImplicitBasicColumnNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java index 14f6e53cff..b12a5da472 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitCollectionTableNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.CollectionTable + * @see jakarta.persistence.CollectionTable */ public interface ImplicitCollectionTableNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java index 0a16ee3fec..40da30c853 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinColumnNameSource.java @@ -10,11 +10,11 @@ import org.hibernate.boot.model.source.spi.AttributePath; /** * Context for determining the implicit name of a "join column" (think - * {@link javax.persistence.JoinColumn}). + * {@link jakarta.persistence.JoinColumn}). * * @author Steve Ebersole * - * @see javax.persistence.JoinColumn + * @see jakarta.persistence.JoinColumn */ public interface ImplicitJoinColumnNameSource extends ImplicitNameSource { public static enum Nature { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java index a2368abe7e..116de065dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitJoinTableNameSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.model.source.spi.AttributePath; * * @author Steve Ebersole * - * @see javax.persistence.JoinTable + * @see jakarta.persistence.JoinTable */ public interface ImplicitJoinTableNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java index 7c77c574cd..f06c69e2d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitMapKeyColumnNameSource.java @@ -11,13 +11,13 @@ import org.hibernate.boot.model.source.spi.AttributePath; /** * Context for determining the implicit name of a column used to back the key * of a {@link java.util.Map}. This is used for both - * {@link javax.persistence.MapKeyColumn} and - * {@link javax.persistence.MapKeyJoinColumn} cases. + * {@link jakarta.persistence.MapKeyColumn} and + * {@link jakarta.persistence.MapKeyJoinColumn} cases. * * @author Steve Ebersole * - * @see javax.persistence.MapKeyColumn - * @see javax.persistence.MapKeyJoinColumn + * @see jakarta.persistence.MapKeyColumn + * @see jakarta.persistence.MapKeyJoinColumn */ public interface ImplicitMapKeyColumnNameSource extends ImplicitNameSource { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java index 57eea2b2be..9e3e9c151b 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategy.java @@ -18,10 +18,10 @@ package org.hibernate.boot.model.naming; *
  • * Entity primary table - {@link #determinePrimaryTableName}. Used when the * primary table for an entity is not explicitly named in the metadata. See - * {@link javax.persistence.Table} for details. + * {@link jakarta.persistence.Table} for details. *
    • *
  • - * Join table - {@link #determineJoinTableName}. See {@link javax.persistence.JoinTable} + * Join table - {@link #determineJoinTableName}. See {@link jakarta.persistence.JoinTable} * for details. Join table covers basically any entity association whether in the form * of a collection of entities (one-to-many, many-to-many) or a singular entity association * (many-to-one, and occasionally one-to-one). @@ -29,7 +29,7 @@ package org.hibernate.boot.model.naming; *
  • * Collection table - {@link #determineCollectionTableName} - Collection table * refers to any non-entity collection (basic, component/embeddable, any). See - * {@link javax.persistence.CollectionTable} for details. + * {@link jakarta.persistence.CollectionTable} for details. *
    • *
  • * Notice that secondary tables are not mentioned, since they must always be explicitly named @@ -114,7 +114,7 @@ public interface ImplicitNamingStrategy { public Identifier determineBasicColumnName(ImplicitBasicColumnNameSource source); /** - * Determine the column name related to {@link javax.persistence.JoinColumn}. In + * Determine the column name related to {@link jakarta.persistence.JoinColumn}. In * {@code hbm.xml} terms, this would be a {@code } defined for a collection * or the column associated with a many-to-one. * @@ -125,7 +125,7 @@ public interface ImplicitNamingStrategy { public Identifier determineJoinColumnName(ImplicitJoinColumnNameSource source); /** - * Determine the column name related to {@link javax.persistence.PrimaryKeyJoinColumn}. In + * Determine the column name related to {@link jakarta.persistence.PrimaryKeyJoinColumn}. In * {@code hbm.xml} terms, this would be a {@code } defined for a {@code } * or a {@code } (others?) * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java index 4ae2299aae..ae96d6a7f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyJpaCompliantImpl.java @@ -18,7 +18,7 @@ import org.hibernate.internal.util.StringHelper; * to JPA standards. *

    * For the legacy JPA-based naming standards initially implemented by Hibernate, - * see/use {@link org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl} + * see/use {@link ImplicitNamingStrategyLegacyJpaImpl} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java index 1f0c88826a..cdaaa08c93 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingStrategyHelper.java @@ -16,12 +16,12 @@ public interface NamingStrategyHelper { * Called when the user supplied no explicit name/identifier for the given database object. *

    * Typically implementations will access the {@link ImplicitNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getImplicitNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param buildingContext The building context in which this is called. @@ -34,12 +34,12 @@ public interface NamingStrategyHelper { * Called when the user has supplied an explicit name for the database object. *

    * Typically implementations will access the {@link ImplicitNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getImplicitNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param explicitName The explicit object name. @@ -53,12 +53,12 @@ public interface NamingStrategyHelper { * Handle converting a logical name to a physical name *

    * Typically implementations will access the {@link PhysicalNamingStrategy} via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getBuildingOptions()} -> + * {@link MetadataBuildingContext#getBuildingOptions()} -> * {@link org.hibernate.boot.spi.MetadataBuildingOptions#getPhysicalNamingStrategy()} *

    * For proper quoting, {@link org.hibernate.boot.model.relational.Database#toIdentifier(String)} * should be used via - * {@link org.hibernate.boot.spi.MetadataBuildingContext#getMetadataCollector()} -> + * {@link MetadataBuildingContext#getMetadataCollector()} -> * {@link org.hibernate.boot.spi.InFlightMetadataCollector#getDatabase()} * * @param logicalName The logical name to convert to a physical name diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java index 824b009ad3..cfb17768aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ObjectNameNormalizer.java @@ -95,8 +95,8 @@ public abstract class ObjectNameNormalizer { /** * Intended only for use in handling quoting requirements for {@code column-definition} - * as defined by {@link javax.persistence.Column#columnDefinition()}, - * {@link javax.persistence.JoinColumn#columnDefinition}, etc. This method should not + * as defined by {@link jakarta.persistence.Column#columnDefinition()}, + * {@link jakarta.persistence.JoinColumn#columnDefinition}, etc. This method should not * be called in any other scenario. * * @param text The specified column definition @@ -112,9 +112,9 @@ public abstract class ObjectNameNormalizer { /** * Access the contextual information related to the current process of building metadata. Here, * that typically might be needed for accessing:

      - *
    • {@link org.hibernate.boot.model.naming.ImplicitNamingStrategy}
      • - *
    • {@link org.hibernate.boot.model.naming.PhysicalNamingStrategy}
      • - *
    • {@link org.hibernate.boot.model.relational.Database}
      • + *
    • {@link ImplicitNamingStrategy}
      • + *
    • {@link PhysicalNamingStrategy}
      • + *
    • {@link Database}
      • *
    * * @return The current building context diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java index 3fc7f8c721..bfde63a91a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java @@ -10,8 +10,8 @@ import java.io.Serializable; import java.lang.reflect.Type; import java.util.function.Function; import java.util.function.Supplier; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.hibernate.MappingException; import org.hibernate.mapping.BasicValue; @@ -49,7 +49,7 @@ public class InferredBasicValueResolver { public static BasicValue.Resolution from( Function explicitJavaTypeAccess, Function explicitSqlTypeAccess, - java.lang.reflect.Type resolvedJavaType, + Type resolvedJavaType, Supplier reflectedJtdResolver, JdbcTypeDescriptorIndicators stdIndicators, Table table, @@ -364,7 +364,7 @@ public class InferredBasicValueResolver { TemporalJavaTypeDescriptor reflectedJtd, BasicJavaDescriptor explicitJavaType, JdbcTypeDescriptor explicitJdbcType, - java.lang.reflect.Type resolvedJavaType, + Type resolvedJavaType, JdbcTypeDescriptorIndicators stdIndicators, TypeConfiguration typeConfiguration) { final TemporalType requestedTemporalPrecision = stdIndicators.getTemporalPrecision(); @@ -384,7 +384,7 @@ public class InferredBasicValueResolver { if ( requestedTemporalPrecision != null && explicitTemporalJtd.getPrecision() != requestedTemporalPrecision ) { throw new MappingException( - "Temporal precision (`javax.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision + + "Temporal precision (`jakarta.persistence.TemporalType`) mismatch... requested precision = " + requestedTemporalPrecision + "; explicit JavaTypeDescriptor (`" + explicitTemporalJtd + "`) precision = " + explicitTemporalJtd.getPrecision() ); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java index f7ce186370..cb49823700 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/NamedConverterResolution.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.process.internal; import java.util.function.Function; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java index f7d0f76c29..d1ad65e694 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/ScanningCoordinator.java @@ -39,7 +39,7 @@ import org.hibernate.service.ServiceRegistry; import org.jboss.logging.Logger; /** - * Coordinates the process of executing {@link org.hibernate.boot.archive.scan.spi.Scanner} (if enabled) + * Coordinates the process of executing {@link Scanner} (if enabled) * and applying the resources (classes, packages and mappings) discovered. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java index 4403bbc18f..b85dce92d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.process.internal; import java.util.function.Function; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.mapping.BasicValue; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java index 9273c0c779..f6cdf8d96f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java @@ -52,7 +52,7 @@ import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; /** - * Represents the process of of transforming a {@link org.hibernate.boot.MetadataSources} + * Represents the process of of transforming a {@link MetadataSources} * reference into a {@link org.hibernate.boot.Metadata} reference. Allows for 2 different process paradigms:
      *
    • * Single step : as defined by the {@link #build} method; internally leverages the 2-step paradigm @@ -356,7 +356,7 @@ public class MetadataBuildingProcess { final TypeContributions typeContributions = new TypeContributions() { @Override - public void contributeType(org.hibernate.type.BasicType type) { + public void contributeType(BasicType type) { getBasicTypeRegistry().register( type ); final JavaTypeDescriptor jtd; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java index c504f42d02..99f1479671 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java @@ -11,11 +11,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import org.hibernate.annotations.common.reflection.MetadataProviderInjector; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -245,7 +245,7 @@ public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProc private void insertMappedSuperclasses(List original, List copy) { final boolean debug = log.isDebugEnabled(); for ( XClass clazz : original ) { - if ( clazz.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + if ( clazz.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { if ( debug ) { log.debugf( "Skipping explicit MappedSuperclass %s, the class will be discovered analyzing the implementing class", @@ -260,7 +260,7 @@ public class AnnotationMetadataSourceProcessorImpl implements MetadataSourceProc && !reflectionManager.equals( superClass, Object.class ) && !copy.contains( superClass ) ) { if ( superClass.isAnnotationPresent( Entity.class ) - || superClass.isAnnotationPresent( javax.persistence.MappedSuperclass.class ) ) { + || superClass.isAnnotationPresent( jakarta.persistence.MappedSuperclass.class ) ) { copy.add( superClass ); } superClass = superClass.getSuperclass(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java index 9236cec881..3b0f6aabe8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AttributesHelper.java @@ -8,7 +8,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.util.Collections; import java.util.List; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.MappingException; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmAnyAssociationType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java index 046149d1b2..6362b658e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FetchProfileBinder.java @@ -23,7 +23,7 @@ public class FetchProfileBinder { *

      * This form handles fetch profiles defined at the {@code } * root. For handling of fetch profiles defined within an entity, see - * {@link #processFetchProfile(HbmLocalMetadataBuildingContext, org.hibernate.boot.jaxb.hbm.spi.JaxbHbmFetchProfileType, String)} + * {@link #processFetchProfile(HbmLocalMetadataBuildingContext, JaxbHbmFetchProfileType, String)} * * @param context Access to information relative to the mapping document containing this binding * @param fetchProfileBinding The {@code } binding diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java index f250a10d78..21a81fc6dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/FilterDefinitionBinder.java @@ -9,7 +9,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.MappingException; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmFilterDefinitionType; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java index 37247ca177..76f7ae27af 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/NamedQueryBinder.java @@ -7,7 +7,7 @@ package org.hibernate.boot.model.source.internal.hbm; import java.util.Locale; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedNativeQueryType; import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNamedQueryType; @@ -97,7 +97,7 @@ public class NamedQueryBinder { String prefix) { if ( namedQueryBinding.isCallable() ) { DeprecationLogger.DEPRECATION_LOGGER.warn( - "Marking named native queries as callable is no longer supported; use `@javax.persistence.NamedStoredProcedureQuery` instead. Ignoring." + "Marking named native queries as callable is no longer supported; use `@jakarta.persistence.NamedStoredProcedureQuery` instead. Ignoring." ); } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java index 957c91400a..fe1b1df9d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/RelationalValueSourceHelper.java @@ -144,7 +144,7 @@ public class RelationalValueSourceHelper { public static RelationalValueSource buildValueSource( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -189,7 +189,7 @@ public class RelationalValueSourceHelper { public static ColumnSource buildColumnSource( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -257,7 +257,7 @@ public class RelationalValueSourceHelper { public static List buildColumnSources( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { final List sources = buildValueSources( mappingDocument, containingTableName, @@ -306,7 +306,7 @@ public class RelationalValueSourceHelper { public static List buildValueSources( MappingDocument mappingDocument, String containingTableName, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { List result = new ArrayList<>(); if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getFormulaAttribute() ) ) { @@ -383,7 +383,7 @@ public class RelationalValueSourceHelper { private static void validateUseOfFormulaAttribute( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { // 1) make sure there is no column attribute if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getColumnAttribute() ) ) { final String errorMessage; @@ -436,7 +436,7 @@ public class RelationalValueSourceHelper { private static void validateUseOfColumnOrFormulaNestedElements( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource) { + ColumnsAndFormulasSource columnsAndFormulasSource) { if ( StringHelper.isNotEmpty( columnsAndFormulasSource.getColumnAttribute() ) ) { final String errorMessage; if ( columnsAndFormulasSource.getSourceType().canBeNamed() @@ -463,7 +463,7 @@ public class RelationalValueSourceHelper { private static void validateCustomWriteFragment( MappingDocument sourceDocument, - RelationalValueSourceHelper.ColumnsAndFormulasSource columnsAndFormulasSource, + ColumnsAndFormulasSource columnsAndFormulasSource, JaxbHbmColumnType columnMapping, String customWrite) { if ( customWrite != null && !customWrite.matches("[^?]*\\?[^?]*") ) { diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java index 790debf82a..5a89f66f20 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java @@ -10,8 +10,8 @@ import org.hibernate.boot.model.IdentifierGeneratorDefinition; /** * Common contract for composite identifiers. Specific sub-types include aggregated - * (think {@link javax.persistence.EmbeddedId}) and non-aggregated (think - * {@link javax.persistence.IdClass}). + * (think {@link jakarta.persistence.EmbeddedId}) and non-aggregated (think + * {@link jakarta.persistence.IdClass}). * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java index e51f65fd00..8309f9941c 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifiableTypeSource.java @@ -13,7 +13,7 @@ import org.hibernate.boot.jaxb.Origin; /** * Common contract between Entity and MappedSuperclass sources. The - * terminology is taken from JPA's {@link javax.persistence.metamodel.IdentifiableType} + * terminology is taken from JPA's {@link jakarta.persistence.metamodel.IdentifiableType} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java index af327460aa..e916b783a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceAggregatedComposite.java @@ -14,7 +14,7 @@ import java.util.List; * {@link org.hibernate.id.EntityIdentifierNature#AGGREGATED_COMPOSITE}. *

      * This equates to an identifier which is made up of multiple values which are - * defined as part of a component/embedded; i.e. {@link javax.persistence.EmbeddedId} + * defined as part of a component/embedded; i.e. {@link jakarta.persistence.EmbeddedId} * * @author Strong Liu * @author Steve Ebersole @@ -28,7 +28,7 @@ public interface IdentifierSourceAggregatedComposite extends CompositeIdentifier public SingularAttributeSourceEmbedded getIdentifierAttributeSource(); /** - * Obtain the mapping of attributes annotated with {@link javax.persistence.MapsId}. + * Obtain the mapping of attributes annotated with {@link jakarta.persistence.MapsId}. * * @return The MapsId sources. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java index 860eaf87b8..dab1693f68 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/IdentifierSourceNonAggregatedComposite.java @@ -12,7 +12,7 @@ import java.util.List; * Additional contract describing the source of an identifier mapping whose {@link #getNature() nature} is * {@link org.hibernate.id.EntityIdentifierNature#NON_AGGREGATED_COMPOSITE }. *

      - * Think {@link javax.persistence.IdClass} + * Think {@link jakarta.persistence.IdClass} * * @author Steve Ebersole */ @@ -25,7 +25,7 @@ public interface IdentifierSourceNonAggregatedComposite extends CompositeIdentif public List getAttributeSourcesMakingUpIdentifier(); /** - * Retrieve the source information for the {@link javax.persistence.IdClass} definition + * Retrieve the source information for the {@link jakarta.persistence.IdClass} definition * * @return The IdClass source information, or {@code null} if none. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java index b2863de750..0e8de30e4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/JpaCallbackSource.java @@ -14,22 +14,22 @@ import java.lang.annotation.Annotation; public interface JpaCallbackSource { /** - * @param callbackType {@link javax.persistence.PrePersist}, {@link javax.persistence.PreRemove}, {@link javax.persistence.PreUpdate}, {@link javax.persistence.PostLoad}, - * {@link javax.persistence.PostPersist}, {@link javax.persistence.PostRemove}, or {@link javax.persistence.PostUpdate} - * @return the name of the JPA callback method defined for the associated {@link javax.persistence.Entity entity} or {@link javax.persistence.MappedSuperclass + * @param callbackType {@link jakarta.persistence.PrePersist}, {@link jakarta.persistence.PreRemove}, {@link jakarta.persistence.PreUpdate}, {@link jakarta.persistence.PostLoad}, + * {@link jakarta.persistence.PostPersist}, {@link jakarta.persistence.PostRemove}, or {@link jakarta.persistence.PostUpdate} + * @return the name of the JPA callback method defined for the associated {@link jakarta.persistence.Entity entity} or {@link jakarta.persistence.MappedSuperclass * mapped superclass} and for the supplied callback annotation class. */ String getCallbackMethod(Class callbackType); /** - * @return the name of the instantiated container where the JPA callbacks for the associated {@link javax.persistence.Entity entity} or - * {@link javax.persistence.MappedSuperclass mapped superclass} are defined. This can be either the entity/mapped superclass itself or an - * {@link javax.persistence.EntityListeners entity listener}. + * @return the name of the instantiated container where the JPA callbacks for the associated {@link jakarta.persistence.Entity entity} or + * {@link jakarta.persistence.MappedSuperclass mapped superclass} are defined. This can be either the entity/mapped superclass itself or an + * {@link jakarta.persistence.EntityListeners entity listener}. */ String getName(); /** - * @return true if this callback class represents callbacks defined within an {@link javax.persistence.EntityListeners entity + * @return true if this callback class represents callbacks defined within an {@link jakarta.persistence.EntityListeners entity * listener}. */ boolean isListener(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java index 17e422924b..4e965cb539 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/MapsIdSource.java @@ -7,13 +7,13 @@ package org.hibernate.boot.model.source.spi; /** - * Describes a relationship annotated with {@link javax.persistence.MapsId} + * Describes a relationship annotated with {@link jakarta.persistence.MapsId} * * @author Steve Ebersole */ public interface MapsIdSource { /** - * Obtain the {@link javax.persistence.MapsId#value()} naming the attribute + * Obtain the {@link jakarta.persistence.MapsId#value()} naming the attribute * within the EmbeddedId mapped by this relationship. * * @return The corresponding id attribute name. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java index 67c1333a07..e08c60b7f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/Orderable.java @@ -26,7 +26,7 @@ public interface Orderable { * If the ordering element is not specified, ordering by * the primary key of the associated entity is assumed * - * @see javax.persistence.OrderBy#value() + * @see jakarta.persistence.OrderBy#value() * * @return The {@code ORDER BY} fragment used during loading this plural attribute from DB. */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java index f3c37f7d50..989a7e5cce 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/PluralAttributeMapKeySource.java @@ -20,7 +20,7 @@ package org.hibernate.boot.model.source.spi; *

    *

    * {@link PluralAttributeMapKeySourceEntityAttribute} is only relevant from - * annotations when using {@link javax.persistence.MapKey}. + * annotations when using {@link jakarta.persistence.MapKey}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java index 0d21c45aed..25d2ce2c1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java @@ -294,7 +294,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryReturnType + * @see JaxbHbmNativeQueryReturnType */ public static class EntityResultDescriptor implements ResultDescriptor, HbmFetchParent { private final String entityName; @@ -480,7 +480,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryPropertyReturnType + * @see JaxbHbmNativeQueryPropertyReturnType */ public static class PropertyFetchDescriptor implements HbmFetchDescriptor { private final HbmFetchParent parent; @@ -562,7 +562,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryJoinReturnType + * @see JaxbHbmNativeQueryJoinReturnType */ public static class JoinDescriptor implements HbmFetchDescriptor, HbmFetchParent { private final String ownerTableAlias; @@ -688,7 +688,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryCollectionLoadReturnType + * @see JaxbHbmNativeQueryCollectionLoadReturnType */ public static class CollectionResultDescriptor implements ResultDescriptor, HbmFetchParent { private final NavigablePath collectionPath; @@ -776,7 +776,7 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see org.hibernate.boot.jaxb.hbm.spi.JaxbHbmNativeQueryScalarReturnType + * @see JaxbHbmNativeQueryScalarReturnType */ public static class ScalarDescriptor implements ResultDescriptor { private final String columnName; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java index 2f6f205b7c..f55fa6f070 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedHqlQueryDefinition.java @@ -17,7 +17,7 @@ import org.hibernate.query.hql.spi.NamedHqlQueryMemento; * Boot-time descriptor of a named HQL query, as defined in * annotations or xml * - * @see javax.persistence.NamedQuery + * @see jakarta.persistence.NamedQuery * @see org.hibernate.annotations.NamedQuery * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java index 5f2c2cddca..51347d5905 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedNativeQueryDefinition.java @@ -20,7 +20,7 @@ import org.hibernate.query.sql.spi.NamedNativeQueryMemento; * Boot-time descriptor of a named native query, as defined in * annotations or xml * - * @see javax.persistence.NamedNativeQuery + * @see jakarta.persistence.NamedNativeQuery * @see org.hibernate.annotations.NamedNativeQuery * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java index 595e3c13f6..e905420ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/NamedProcedureCallDefinition.java @@ -13,7 +13,7 @@ import org.hibernate.procedure.spi.NamedCallableQueryMemento; * Boot-time descriptor of a named procedure/function query, as defined in * annotations or xml * - * @see javax.persistence.NamedStoredProcedureQuery + * @see jakarta.persistence.NamedStoredProcedureQuery * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java index d7ac23f427..e04720a77e 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java @@ -11,11 +11,11 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.EntityResult; -import javax.persistence.FieldResult; -import javax.persistence.SqlResultSetMapping; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.EntityResult; +import jakarta.persistence.FieldResult; +import jakarta.persistence.SqlResultSetMapping; import org.hibernate.LockMode; import org.hibernate.MappingException; @@ -135,7 +135,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr /** - * @see javax.persistence.ColumnResult + * @see jakarta.persistence.ColumnResult */ private static class JpaColumnResultDescriptor implements ResultDescriptor { private final ColumnResult columnResult; @@ -161,7 +161,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see javax.persistence.ConstructorResult + * @see jakarta.persistence.ConstructorResult */ private static class ConstructorResultDescriptor implements ResultDescriptor { private static class ArgumentDescriptor { @@ -228,7 +228,7 @@ public class SqlResultSetMappingDescriptor implements NamedResultSetMappingDescr } /** - * @see javax.persistence.EntityResult + * @see jakarta.persistence.EntityResult */ public static class EntityResultDescriptor implements ResultDescriptor { @SuppressWarnings( { "FieldCanBeLocal", "FieldMayBeFinal", "unused" } ) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java index d91e7a8247..8574fe03f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistry.java @@ -9,7 +9,7 @@ package org.hibernate.boot.registry; import org.hibernate.service.ServiceRegistry; /** - * Specialization of the {@link org.hibernate.service.ServiceRegistry} contract mainly for type safety. + * Specialization of the {@link ServiceRegistry} contract mainly for type safety. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java index a756631729..0df5ed6246 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/registry/StandardServiceRegistryBuilder.java @@ -28,12 +28,12 @@ import org.hibernate.service.internal.ProvidedService; import org.hibernate.service.spi.ServiceContributor; /** - * Builder for standard {@link org.hibernate.service.ServiceRegistry} instances. + * Builder for standard {@link ServiceRegistry} instances. * * @author Steve Ebersole * * @see StandardServiceRegistryImpl - * @see org.hibernate.boot.registry.BootstrapServiceRegistryBuilder + * @see BootstrapServiceRegistryBuilder */ public class StandardServiceRegistryBuilder { /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java index a80ef689d6..c624cf73fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java @@ -6,8 +6,8 @@ */ package org.hibernate.boot.spi; -import javax.persistence.AttributeConverter; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.SharedCacheMode; import org.hibernate.boot.CacheRegionDefinition; import org.hibernate.boot.Metadata; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java index bf959a7f62..2c52169dc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuildingOptions.java @@ -7,7 +7,7 @@ package org.hibernate.boot.spi; import java.util.List; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.HibernateException; import org.hibernate.MultiTenancyStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java index 6aec5582b7..c3436a7053 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java @@ -9,7 +9,7 @@ package org.hibernate.boot.spi; import java.util.Collection; import java.util.Map; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import javax.xml.stream.XMLInputFactory; import org.hibernate.Incubating; @@ -56,7 +56,7 @@ public interface BootstrapContext { /** * Access the temporary ClassLoader passed to us as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. * * @return The tempo ClassLoader */ @@ -119,7 +119,7 @@ public interface BootstrapContext { /** * Access to the Jandex index passed by call to - * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(org.jboss.jandex.IndexView)}, if any. + * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(IndexView)}, if any. *

    * Note that Jandex is currently not used. See https://github.com/hibernate/hibernate-orm/wiki/Roadmap7.0 * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java index 44e50cb3ff..27d980a41a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/InFlightMetadataCollector.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.function.Function; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.DuplicateMappingException; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java index 206c258de2..16625a758a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingOptions.java @@ -7,7 +7,7 @@ package org.hibernate.boot.spi; import java.util.List; -import javax.persistence.SharedCacheMode; +import jakarta.persistence.SharedCacheMode; import org.hibernate.MultiTenancyStrategy; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -66,7 +66,7 @@ public interface MetadataBuildingOptions { * registered via calls to:

      *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType)}
      • *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.type.BasicType, String[])}
      • - *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, java.lang.String[])}
      • + *
    • {@link org.hibernate.boot.MetadataBuilder#applyBasicType(org.hibernate.usertype.UserType, String[])}
      • *
    * * @return The BasicType registrations @@ -89,7 +89,7 @@ public interface MetadataBuildingOptions { /** * Access to the Jandex index passed by call to - * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(org.jboss.jandex.IndexView)}, if any. + * {@link org.hibernate.boot.MetadataBuilder#applyIndexView(IndexView)}, if any. * * @return The Jandex index * @@ -145,7 +145,7 @@ public interface MetadataBuildingOptions { /** * Access the temporary ClassLoader passed to us as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()}, if any. * * @return The tempo ClassLoader * @@ -242,7 +242,7 @@ public interface MetadataBuildingOptions { /** * Should we create constraint by default? * - * @see javax.persistence.ConstraintMode#PROVIDER_DEFAULT + * @see jakarta.persistence.ConstraintMode#PROVIDER_DEFAULT * @see org.hibernate.cfg.AvailableSettings#DEFAULT_CONSTRAINT_MODE * * @return {@code true} if not create constraint by default; {@code false} otherwise. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java index 0c07666632..bf4d889af8 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataContributor.java @@ -12,7 +12,7 @@ import org.jboss.jandex.IndexView; * Contract for contributing to Metadata (InFlightMetadataCollector). * * This hook occurs just after all processing of all {@link org.hibernate.boot.MetadataSources}, - * and just before {@link org.hibernate.boot.spi.AdditionalJaxbMappingProducer}. + * and just before {@link AdditionalJaxbMappingProducer}. * * @author Steve Ebersole * diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java index 9cf29cba63..553af0e1d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java @@ -320,7 +320,7 @@ public interface SessionFactoryOptions extends QueryEngineOptions { /** * Controls whether Hibernate should try to map named parameter names * specified in a {@link org.hibernate.procedure.ProcedureCall} or - * {@link javax.persistence.StoredProcedureQuery} to named parameters in + * {@link jakarta.persistence.StoredProcedureQuery} to named parameters in * the JDBC {@link java.sql.CallableStatement}. *

    * As JPA is defined, the use of named parameters is essentially of dubious diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java index d68773b857..166747a122 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java @@ -6,6 +6,8 @@ */ package org.hibernate.boot.xsd; +import org.hibernate.Internal; + /** * Support for XSD handling related to Hibernate's `cfg.xml` and * JPA's `persistence.xml`. @@ -16,6 +18,7 @@ package org.hibernate.boot.xsd; * @author Steve Ebersole * @author Sanne Grinovero */ +@Internal @SuppressWarnings("unused") public class ConfigXsdSupport { @@ -35,6 +38,11 @@ public class ConfigXsdSupport { return getJPA22(); } + public static boolean shouldBeMappedToLatestJpaDescriptor(String uri) { + // JPA 1.0 and 2.0 share the same namespace URI + return getJPA10().getNamespaceUri().matches( uri ); + } + public XsdDescriptor jpaXsd(String version) { switch ( version ) { case "1.0": { @@ -58,7 +66,7 @@ public class ConfigXsdSupport { } } - public XsdDescriptor cfgXsd() { + public static XsdDescriptor cfgXsd() { final int index = 0; synchronized ( xsdCache ) { XsdDescriptor cfgXml = xsdCache[index]; @@ -74,7 +82,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA10() { + public static XsdDescriptor getJPA10() { final int index = 1; synchronized ( xsdCache ) { XsdDescriptor jpa10 = xsdCache[index]; @@ -90,7 +98,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA20() { + public static XsdDescriptor getJPA20() { final int index = 2; synchronized ( xsdCache ) { XsdDescriptor jpa20 = xsdCache[index]; @@ -106,7 +114,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA21() { + public static XsdDescriptor getJPA21() { final int index = 3; synchronized ( xsdCache ) { XsdDescriptor jpa21 = xsdCache[index]; @@ -122,7 +130,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA22() { + public static XsdDescriptor getJPA22() { final int index = 4; synchronized ( xsdCache ) { XsdDescriptor jpa22 = xsdCache[index]; @@ -138,7 +146,7 @@ public class ConfigXsdSupport { } } - private XsdDescriptor getJPA30() { + public static XsdDescriptor getJPA30() { final int index = 5; synchronized ( xsdCache ) { XsdDescriptor jpa30 = xsdCache[index]; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java index 0ba5ee2ab8..876b0ef7ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java @@ -6,6 +6,8 @@ */ package org.hibernate.boot.xsd; +import org.hibernate.Internal; + /** * Support for XSD handling related to Hibernate's `hbm.xml` and * JPA's `orm.xml`. @@ -13,6 +15,7 @@ package org.hibernate.boot.xsd; * @author Steve Ebersole */ @SuppressWarnings("unused") +@Internal public class MappingXsdSupport { /** @@ -20,50 +23,74 @@ public class MappingXsdSupport { */ public static final MappingXsdSupport INSTANCE = new MappingXsdSupport(); - private final XsdDescriptor jpa10 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa10 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_1_0.xsd", "1.0", "http://java.sun.com/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa20 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa20 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_0.xsd", "2.0", "http://java.sun.com/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa21 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa21 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_1.xsd", "2.1", "http://xmlns.jcp.org/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa22 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa22 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_2_2.xsd", "2.2", "http://xmlns.jcp.org/xml/ns/persistence/orm" ); - private final XsdDescriptor jpa30 = LocalXsdResolver.buildXsdDescriptor( + public static final XsdDescriptor jpa30 = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/jpa/orm_3_0.xsd", "3.0", "https://jakarta.ee/xml/ns/persistence/orm" ); - - private final XsdDescriptor hbmXml = LocalXsdResolver.buildXsdDescriptor( + + public static final XsdDescriptor hbmXml = LocalXsdResolver.buildXsdDescriptor( "org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd", "4.0", "http://www.hibernate.org/xsd/orm/hbm" ); + public static final XsdDescriptor hibernateMappingXml = LocalXsdResolver.buildXsdDescriptor( + "org/hibernate/hibernate-mapping-4.0.xsd", + "4.0", + "http://www.hibernate.org/xsd/hibernate-mapping" + ); + private MappingXsdSupport() { //Do not construct new instances } - public XsdDescriptor latestJpaDescriptor() { + public static XsdDescriptor latestJpaDescriptor() { return jpa22; } + public static boolean shouldBeMappedToLatestJpaDescriptor(String uri) { + // JPA 1.0 and 2.0 share the same namespace URI + return jpa10.getNamespaceUri().equals( uri ); + } + + public static boolean isValidJpaVersion(String version) { + switch ( version ) { + case "1.0": + case "2.0": + case "2.1": + case "2.2": + case "3.0": + return true; + default: + return false; + } + } + public XsdDescriptor jpaXsd(String version) { switch ( version ) { case "1.0": { diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java index 2c27732a7e..7579386afa 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/BiDirectionalAssociationHandler.java @@ -11,12 +11,12 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import net.bytebuddy.utility.OpenedClassReader; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java index d142264bd9..6ea74e6a62 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.persistence.Access; -import javax.persistence.AccessType; -import javax.persistence.Transient; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; +import jakarta.persistence.Transient; import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker; import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker; @@ -359,7 +359,7 @@ public class EnhancerImpl implements Enhancer { // See HHH-10977 HHH-11284 HHH-11404 --- check for declaration of Managed interface on the class, not inherited private boolean alreadyEnhanced(TypeDescription managedCtClass) { - for ( TypeDescription.Generic declaredInterface : managedCtClass.getInterfaces() ) { + for ( Generic declaredInterface : managedCtClass.getInterfaces() ) { if ( declaredInterface.asErasure().isAssignableTo( Managed.class ) ) { return true; } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java index 7bb0f27e9b..e20d733ddb 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/FieldAccessEnhancer.java @@ -9,7 +9,7 @@ package org.hibernate.bytecode.enhance.internal.bytebuddy; import static net.bytebuddy.matcher.ElementMatchers.hasDescriptor; import static net.bytebuddy.matcher.ElementMatchers.named; -import javax.persistence.Id; +import jakarta.persistence.Id; import net.bytebuddy.description.NamedElement; import net.bytebuddy.description.type.TypeDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java index 1c61641c29..cb9f5b49bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java @@ -9,9 +9,9 @@ package org.hibernate.bytecode.enhance.internal.bytebuddy; import java.util.Collection; import java.util.Objects; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Id; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Id; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java index 4ede4c2af9..6d62c10c30 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/PersistentAttributeTransformer.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Objects; -import javax.persistence.Embedded; +import jakarta.persistence.Embedded; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java index 861515bcc4..0feb06c8ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/DefaultEnhancementContext.java @@ -6,15 +6,15 @@ */ package org.hibernate.bytecode.enhance.spi; -import javax.persistence.Basic; -import javax.persistence.Convert; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.Convert; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; /** * default implementation of EnhancementContext. May be sub-classed as needed. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java index d9b242728a..f4a2c4ec16 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/EnhancementContext.java @@ -24,7 +24,7 @@ public interface EnhancementContext { /** * Obtain access to the ClassLoader that can be used to load Class references. In JPA SPI terms, this * should be a "temporary class loader" as defined by - * {@link javax.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()} + * {@link jakarta.persistence.spi.PersistenceUnitInfo#getNewTempClassLoader()} * * @return The class loader that the enhancer can use. */ diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/LazyPropertyInitializer.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java index 9cd3bbebff..fc18a2ea8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/spi/ClassTransformer.java @@ -19,7 +19,7 @@ import java.security.ProtectionDomain; * @author Bill Burke * @author Emmanuel Bernard */ -public interface ClassTransformer extends javax.persistence.spi.ClassTransformer { +public interface ClassTransformer extends jakarta.persistence.spi.ClassTransformer { /** * Invoked when a class is being loaded or redefined to add hooks for persistence bytecode manipulation. * diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java index 025bdf25eb..f491d87bf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/EnabledCaching.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.HibernateException; import org.hibernate.cache.cfg.spi.CollectionDataCachingConfig; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/package.html b/hibernate-core/src/main/java/org/hibernate/cache/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/FilterKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java index 7ed60687f5..f405649f2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/Region.java @@ -47,7 +47,7 @@ public interface Region { * during {@link org.hibernate.SessionFactory#close()} to give * the region a chance to cleanup. * - * @throws org.hibernate.cache.CacheException Indicates problem shutting down + * @throws CacheException Indicates problem shutting down */ void destroy() throws CacheException; } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java index 0fd21f1fc0..82862bd95e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/RegionFactory.java @@ -44,7 +44,7 @@ public interface RegionFactory extends Service, Stoppable { * @param settings The settings in effect. * @param configValues The available config values * - * @throws org.hibernate.cache.CacheException Indicates problems starting the L2 cache impl; + * @throws CacheException Indicates problems starting the L2 cache impl; * considered as a sign to stop {@link org.hibernate.SessionFactory} * building. */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java index 5aaf7a66d1..c161e6d9f3 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/access/CachedDomainDataAccess.java @@ -7,7 +7,7 @@ package org.hibernate.cache.spi.access; import java.io.Serializable; -import javax.persistence.Cache; +import jakarta.persistence.Cache; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.DomainDataRegion; @@ -190,7 +190,7 @@ public interface CachedDomainDataAccess { * isolation and/or locking. This behavior is exactly Hibernate legacy behavior, but * it is also required by JPA - so we cannot remove it. *

    - * Used from JPA's {@link javax.persistence.Cache#evict(Class, Object)}, as well as the + * Used from JPA's {@link jakarta.persistence.Cache#evict(Class, Object)}, as well as the * Hibernate extension {@link org.hibernate.Cache#evictEntityData(Class, Serializable)} * and {@link org.hibernate.Cache#evictEntityData(String, Serializable)} * diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CacheEntryStructure.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/CollectionCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCollectionCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredMapCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/UnstructuredCacheEntry.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html b/hibernate-core/src/main/java/org/hibernate/cache/spi/entry/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java index c5e39b2fff..a5bf9aa7e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionNonStrictReadWriteAccess.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java index bcbc4fe45a..d62441fd42 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadOnlyAccess.java @@ -13,7 +13,7 @@ import org.hibernate.cache.spi.access.AccessType; /** * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java index d5ec0c7036..c67a024859 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/CollectionReadWriteAccess.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.collection.CollectionPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.CollectionDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link CollectionDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Chris Cranford * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java index 1b2f71ba1d..12ac7ffbd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityNonStrictReadWriteAccess.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java index a39260fdee..2a61b8f3d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadOnlyAccess.java @@ -18,7 +18,7 @@ import org.jboss.logging.Logger; /** * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java index 093426a416..5d3f2e6017 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/EntityReadWriteAccess.java @@ -19,8 +19,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.persister.entity.EntityPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.EntityDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link EntityDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java index 34bcfd8c5f..c749ae88ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdNonStrictReadWriteAccess.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#NONSTRICT_READ_WRITE} access type. + * using the {@link AccessType#NONSTRICT_READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java index e0f6980e0d..f115cfbbeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadOnlyAccess.java @@ -16,7 +16,7 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; /** * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_ONLY} access type. + * using the {@link AccessType#READ_ONLY} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java index b4f53f4297..eda3f2ffd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/support/NaturalIdReadWriteAccess.java @@ -18,8 +18,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.persister.entity.EntityPersister; /** - * Standard support for {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - * using the {@link org.hibernate.cache.spi.access.AccessType#READ_WRITE} access type. + * Standard support for {@link NaturalIdDataAccess} + * using the {@link AccessType#READ_WRITE} access type. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java index 3880d4ffcc..d3af3f930f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java @@ -11,17 +11,17 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.AssociationOverride; -import javax.persistence.AssociationOverrides; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.ForeignKey; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.AssociationOverride; +import jakarta.persistence.AssociationOverrides; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.MappedSuperclass; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java index 5aad2f6076..8103e31e52 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java @@ -72,11 +72,11 @@ public enum AccessType { * * @return The Hibernate AccessType */ - public static AccessType getAccessStrategy(javax.persistence.AccessType type) { - if ( javax.persistence.AccessType.PROPERTY.equals( type ) ) { + public static AccessType getAccessStrategy(jakarta.persistence.AccessType type) { + if ( jakarta.persistence.AccessType.PROPERTY.equals( type ) ) { return PROPERTY; } - else if ( javax.persistence.AccessType.FIELD.equals( type ) ) { + else if ( jakarta.persistence.AccessType.FIELD.equals( type ) ) { return FIELD; } else { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 34b3d531fd..588ead5e82 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -18,58 +18,58 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.Set; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Basic; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.MapKeyJoinColumn; -import javax.persistence.MapKeyJoinColumns; -import javax.persistence.MappedSuperclass; -import javax.persistence.MapsId; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.NamedStoredProcedureQueries; -import javax.persistence.NamedStoredProcedureQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.PrimaryKeyJoinColumn; -import javax.persistence.PrimaryKeyJoinColumns; -import javax.persistence.SequenceGenerator; -import javax.persistence.SequenceGenerators; -import javax.persistence.SharedCacheMode; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.TableGenerators; -import javax.persistence.UniqueConstraint; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Basic; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.MapKeyJoinColumn; +import jakarta.persistence.MapKeyJoinColumns; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.MapsId; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.NamedStoredProcedureQueries; +import jakarta.persistence.NamedStoredProcedureQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.PrimaryKeyJoinColumns; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.SequenceGenerators; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; +import jakarta.persistence.TableGenerator; +import jakarta.persistence.TableGenerators; +import jakarta.persistence.UniqueConstraint; +import jakarta.persistence.Version; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -620,9 +620,9 @@ public final class AnnotationBinder { String table = ""; //might be no @Table annotation on the annotated class String catalog = ""; List uniqueConstraints = new ArrayList<>(); - javax.persistence.Table tabAnn = null; - if ( clazzToProcess.isAnnotationPresent( javax.persistence.Table.class ) ) { - tabAnn = clazzToProcess.getAnnotation( javax.persistence.Table.class ); + jakarta.persistence.Table tabAnn = null; + if ( clazzToProcess.isAnnotationPresent( jakarta.persistence.Table.class ) ) { + tabAnn = clazzToProcess.getAnnotation( jakarta.persistence.Table.class ); table = tabAnn.name(); schema = tabAnn.schema(); catalog = tabAnn.catalog(); @@ -707,11 +707,11 @@ public final class AnnotationBinder { inheritanceStatePerClass ); - javax.persistence.SecondaryTable secTabAnn = clazzToProcess.getAnnotation( - javax.persistence.SecondaryTable.class + jakarta.persistence.SecondaryTable secTabAnn = clazzToProcess.getAnnotation( + jakarta.persistence.SecondaryTable.class ); - javax.persistence.SecondaryTables secTabsAnn = clazzToProcess.getAnnotation( - javax.persistence.SecondaryTables.class + jakarta.persistence.SecondaryTables secTabsAnn = clazzToProcess.getAnnotation( + jakarta.persistence.SecondaryTables.class ); entityBinder.firstLevelSecondaryTablesBinding( secTabAnn, secTabsAnn ); @@ -908,15 +908,15 @@ public final class AnnotationBinder { final boolean isRoot = !inheritanceState.hasParents(); Ejb3DiscriminatorColumn discriminatorColumn = null; - javax.persistence.DiscriminatorColumn discAnn = clazzToProcess.getAnnotation( - javax.persistence.DiscriminatorColumn.class + jakarta.persistence.DiscriminatorColumn discAnn = clazzToProcess.getAnnotation( + jakarta.persistence.DiscriminatorColumn.class ); DiscriminatorType discriminatorType = discAnn != null ? discAnn.discriminatorType() : DiscriminatorType.STRING; - org.hibernate.annotations.DiscriminatorFormula discFormulaAnn = clazzToProcess.getAnnotation( - org.hibernate.annotations.DiscriminatorFormula.class + DiscriminatorFormula discFormulaAnn = clazzToProcess.getAnnotation( + DiscriminatorFormula.class ); if ( isRoot ) { discriminatorColumn = Ejb3DiscriminatorColumn.buildDiscriminatorColumn( @@ -1345,7 +1345,7 @@ public final class AnnotationBinder { if ( !classType.equals( AnnotatedClassType.ENTITY ) ) { throw new AnnotationException( - "Annotated class should have a @javax.persistence.Entity, @javax.persistence.Embeddable or @javax.persistence.EmbeddedSuperclass annotation: " + clazzToProcess + "Annotated class should have a @jakarta.persistence.Entity, @jakarta.persistence.Embeddable or @jakarta.persistence.EmbeddedSuperclass annotation: " + clazzToProcess .getName() ); } @@ -2040,7 +2040,7 @@ public final class AnnotationBinder { collectionBinder.setBatchSize( property.getAnnotation( BatchSize.class ) ); - collectionBinder.setJpaOrderBy( property.getAnnotation( javax.persistence.OrderBy.class ) ); + collectionBinder.setJpaOrderBy( property.getAnnotation( jakarta.persistence.OrderBy.class ) ); collectionBinder.setSqlOrderBy( property.getAnnotation( OrderBy.class ) ); collectionBinder.setNaturalSort( property.getAnnotation( SortNatural.class ) ); @@ -2603,7 +2603,7 @@ public final class AnnotationBinder { final UniqueConstraint[] uniqueConstraints; final JoinColumn[] joins; final JoinColumn[] inverseJoins; - final javax.persistence.Index[] jpaIndexes; + final jakarta.persistence.Index[] jpaIndexes; //JPA 2 has priority @@ -3387,10 +3387,10 @@ public final class AnnotationBinder { propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() ); } - private static EnumSet convertToHibernateCascadeType(javax.persistence.CascadeType[] ejbCascades) { + private static EnumSet convertToHibernateCascadeType(jakarta.persistence.CascadeType[] ejbCascades) { EnumSet hibernateCascadeSet = EnumSet.noneOf( CascadeType.class ); if ( ejbCascades != null && ejbCascades.length > 0 ) { - for ( javax.persistence.CascadeType cascade : ejbCascades ) { + for ( jakarta.persistence.CascadeType cascade : ejbCascades ) { switch ( cascade ) { case ALL: hibernateCascadeSet.add( CascadeType.ALL ); @@ -3418,7 +3418,7 @@ public final class AnnotationBinder { } private static String getCascadeStrategy( - javax.persistence.CascadeType[] ejbCascades, + jakarta.persistence.CascadeType[] ejbCascades, Cascade hibernateCascadeAnnotation, boolean orphanRemoval, boolean forcePersist) { @@ -3494,7 +3494,7 @@ public final class AnnotationBinder { public static void bindForeignKeyNameAndDefinition( SimpleValue value, XProperty property, - javax.persistence.ForeignKey fkOverride, + jakarta.persistence.ForeignKey fkOverride, JoinColumn joinColumn, JoinColumns joinColumns, MetadataBuildingContext context) { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java index 44058599a4..9a451dbde8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConversionInfo.java @@ -6,13 +6,13 @@ */ package org.hibernate.cfg; -import javax.persistence.AttributeConverter; -import javax.persistence.Convert; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Convert; import org.hibernate.annotations.common.reflection.XAnnotatedElement; /** - * Describes a {@link javax.persistence.Convert} conversion + * Describes a {@link jakarta.persistence.Convert} conversion * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java index c4376ee3d3..f588f3e3fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java @@ -13,8 +13,8 @@ import java.lang.reflect.TypeVariable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; @@ -30,7 +30,7 @@ import org.hibernate.boot.spi.MetadataBuildingContext; * * @deprecated (since 5.3) forces the converter instance to be built too early, * which precludes the ability to resolve them from CDI, etc. See - * {@link org.hibernate.boot.model.convert.spi.ConverterDescriptor} instead + * {@link ConverterDescriptor} instead */ @Deprecated public class AttributeConverterDefinition implements AttributeConverterInfo { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java index ac61a55d60..9811c2da4e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java @@ -7,7 +7,7 @@ package org.hibernate.cfg; import java.util.function.Supplier; -import javax.persistence.GeneratedValue; +import jakarta.persistence.GeneratedValue; import org.hibernate.HibernateException; import org.hibernate.Transaction; @@ -39,7 +39,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** - * The name of the {@link javax.persistence.spi.PersistenceProvider} implementor + * The name of the {@link jakarta.persistence.spi.PersistenceProvider} implementor *

    * See JPA 2 sections 9.4.3 and 8.2.1.4 */ @@ -115,7 +115,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * enabled as per the rules defined in JPA 2 section 3.1.7. *

    * See JPA 2 sections 9.4.3 and 8.2.1.7 - * @see javax.persistence.SharedCacheMode + * @see jakarta.persistence.SharedCacheMode */ String JPA_SHARED_CACHE_MODE = "javax.persistence.sharedCache.mode"; @@ -125,9 +125,9 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to retrieve requested data * in the shared cache. * - * @see javax.persistence.CacheRetrieveMode + * @see jakarta.persistence.CacheRetrieveMode */ - String JPA_SHARED_CACHE_RETRIEVE_MODE ="javax.persistence.cache.retrieveMode"; + String JPA_SHARED_CACHE_RETRIEVE_MODE ="jakarta.persistence.cache.retrieveMode"; /** * NOTE : Not a valid EMF property... @@ -135,23 +135,23 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to store data loaded from the database * in the shared cache. * - * @see javax.persistence.CacheStoreMode + * @see jakarta.persistence.CacheStoreMode */ - String JPA_SHARED_CACHE_STORE_MODE ="javax.persistence.cache.storeMode"; + String JPA_SHARED_CACHE_STORE_MODE ="jakarta.persistence.cache.storeMode"; /** * Used to indicate what form of automatic validation is in effect as per rules defined * in JPA 2 section 3.6.1.1 *

    * See JPA 2 sections 9.4.3 and 8.2.1.8 - * @see javax.persistence.ValidationMode + * @see jakarta.persistence.ValidationMode */ String JPA_VALIDATION_MODE = "javax.persistence.validation.mode"; /** * Used to pass along any discovered validator factory. */ - String JPA_VALIDATION_FACTORY = "javax.persistence.validation.factory"; + String JPA_VALIDATION_FACTORY = "jakarta.persistence.validation.factory"; /** * Used to coordinate with bean validators @@ -210,7 +210,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * This setting is used to configure Hibernate ORM's access to * the BeanManager (either directly or via {@link ExtendedBeanManager}). */ - String CDI_BEAN_MANAGER = "javax.persistence.bean.manager"; + String CDI_BEAN_MANAGER = "jakarta.persistence.bean.manager"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -218,7 +218,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /** - * The name of the {@link javax.persistence.spi.PersistenceProvider} implementor + * The name of the {@link jakarta.persistence.spi.PersistenceProvider} implementor *

    * See JPA 2 sections 9.4.3 and 8.2.1.4 */ @@ -294,7 +294,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * enabled as per the rules defined in JPA 2 section 3.1.7. *

    * See JPA 2 sections 9.4.3 and 8.2.1.7 - * @see javax.persistence.SharedCacheMode + * @see jakarta.persistence.SharedCacheMode */ String JAKARTA_JPA_SHARED_CACHE_MODE = "jakarta.persistence.sharedCache.mode"; @@ -304,7 +304,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to retrieve requested data * in the shared cache. * - * @see javax.persistence.CacheRetrieveMode + * @see jakarta.persistence.CacheRetrieveMode */ String JAKARTA_JPA_SHARED_CACHE_RETRIEVE_MODE ="jakarta.persistence.cache.retrieveMode"; @@ -314,7 +314,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Used to indicate if the provider should attempt to store data loaded from the database * in the shared cache. * - * @see javax.persistence.CacheStoreMode + * @see jakarta.persistence.CacheStoreMode */ String JAKARTA_JPA_SHARED_CACHE_STORE_MODE ="jakarta.persistence.cache.storeMode"; @@ -323,7 +323,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * in JPA 2 section 3.6.1.1 *

    * See JPA 2 sections 9.4.3 and 8.2.1.8 - * @see javax.persistence.ValidationMode + * @see jakarta.persistence.ValidationMode */ String JAKARTA_JPA_VALIDATION_MODE = "jakarta.persistence.validation.mode"; @@ -602,7 +602,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String DIALECT ="hibernate.dialect"; /** - * Names any additional {@link org.hibernate.engine.jdbc.dialect.spi.DialectResolver} implementations to + * Names any additional {@link DialectResolver} implementations to * register with the standard {@link org.hibernate.engine.jdbc.dialect.spi.DialectFactory}. */ String DIALECT_RESOLVERS = "hibernate.dialect_resolvers"; @@ -718,7 +718,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.TransactionManager} references. + * {@link jakarta.transaction.TransactionManager} references. * * @since 4.0 */ @@ -726,7 +726,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.UserTransaction} references. + * {@link jakarta.transaction.UserTransaction} references. * * @since 4.0 */ @@ -753,7 +753,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Setting used to give the name of the default {@link org.hibernate.annotations.CacheConcurrencyStrategy} - * to use when either {@link javax.persistence.Cacheable @Cacheable} or + * to use when either {@link jakarta.persistence.Cacheable @Cacheable} or * {@link org.hibernate.annotations.Cache @Cache} is used. {@link org.hibernate.annotations.Cache @Cache(strategy="..")} is used to override. * * @see MetadataBuilder#applyAccessType(org.hibernate.cache.spi.access.AccessType) @@ -772,7 +772,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String USE_NEW_ID_GENERATOR_MAPPINGS = "hibernate.id.new_generator_mappings"; /** - * @see org.hibernate.boot.MetadataBuilder#enableImplicitForcingOfDiscriminatorsInSelect(boolean) + * @see MetadataBuilder#enableImplicitForcingOfDiscriminatorsInSelect(boolean) */ String FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT = "hibernate.discriminator.force_in_select"; @@ -831,7 +831,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { *

  • a fully qualified name (String) of a Class that implements Scanner
    • * * - * @see org.hibernate.boot.MetadataBuilder#applyScanner + * @see MetadataBuilder#applyScanner */ String SCANNER = "hibernate.archive.scanner"; @@ -860,7 +860,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { *
  • "hbm" - discover hbm mapping files - hbm.xml files are discovered as mapping files
    • * * - * @see org.hibernate.boot.MetadataBuilder#applyScanOptions + * @see MetadataBuilder#applyScanOptions */ String SCANNER_DISCOVERY = "hibernate.archive.autodetection"; @@ -894,12 +894,12 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Used to specify the order in which metadata sources should be processed. Value - * is a delimited-list whose elements are defined by {@link org.hibernate.cfg.MetadataSourceType}. + * is a delimited-list whose elements are defined by {@link MetadataSourceType}. *

    * Default is {@code "hbm,class"} which indicates to process {@code hbm.xml} files followed by * annotations (combined with {@code orm.xml} mappings). * - * @see MetadataBuilder#applySourceProcessOrdering(org.hibernate.cfg.MetadataSourceType...) + * @see MetadataBuilder#applySourceProcessOrdering(MetadataSourceType...) */ String ARTIFACT_PROCESSING_ORDER = "hibernate.mapping.precedence"; @@ -1131,7 +1131,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * Global setting name for controlling whether Hibernate should try to map * named parameter names specified in a * {@link org.hibernate.procedure.ProcedureCall} or - * {@link javax.persistence.StoredProcedureQuery} to named parameters in + * {@link jakarta.persistence.StoredProcedureQuery} to named parameters in * the JDBC {@link java.sql.CallableStatement}. * * @see SessionFactoryOptions#isUseOfJdbcNamedParametersEnabled() @@ -1479,8 +1479,8 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** * Assuming {@link #GLOBALLY_QUOTED_IDENTIFIERS}, this allows such global quoting - * to skip column-definitions as defined by {@link javax.persistence.Column}, - * {@link javax.persistence.JoinColumn}, etc. + * to skip column-definitions as defined by {@link jakarta.persistence.Column}, + * {@link jakarta.persistence.JoinColumn}, etc. *

    * JPA states that column-definitions are subject to global quoting, so by default this setting * is {@code false} for JPA compliance. Set to {@code true} to avoid column-definitions @@ -2000,7 +2000,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { /** *

    - * This setting is used when you use {@link javax.persistence.ConstraintMode#PROVIDER_DEFAULT} strategy for foreign key mapping. + * This setting is used when you use {@link jakarta.persistence.ConstraintMode#PROVIDER_DEFAULT} strategy for foreign key mapping. * valid value is {@code CONSTRAINT} and {@code NO_CONSTRAINT}. *

    *

    @@ -2258,7 +2258,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String CREATE_EMPTY_COMPOSITES_ENABLED = "hibernate.create_empty_composites.enabled"; /** - * Setting that allows access to the underlying {@link org.hibernate.Transaction}, even + * Setting that allows access to the underlying {@link Transaction}, even * when using a JTA since normal JPA operations prohibit this behavior. *

    * Values are {@code true} grants access, {@code false} does not. @@ -2292,14 +2292,14 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { String COLLECTION_JOIN_SUBQUERY = "hibernate.collection_join_subquery"; /** - * Setting that allows to call {@link javax.persistence.EntityManager#refresh(Object)} + * Setting that allows to call {@link jakarta.persistence.EntityManager#refresh(Object)} * or {@link org.hibernate.Session#refresh(Object)} on a detached entity instance when the {@link org.hibernate.Session} is obtained from - * a JPA {@link javax.persistence.EntityManager}). + * a JPA {@link jakarta.persistence.EntityManager}). *

    *

    * Values are: {@code true} permits the refresh, {@code false} does not permit the detached instance refresh and an {@link IllegalArgumentException} is thrown. *

    - * The default value is {@code false} when the Session is bootstrapped via JPA {@link javax.persistence.EntityManagerFactory}, otherwise is {@code true} + * The default value is {@code false} when the Session is bootstrapped via JPA {@link jakarta.persistence.EntityManagerFactory}, otherwise is {@code true} * * @since 5.2 */ @@ -2311,7 +2311,7 @@ public interface AvailableSettings extends org.hibernate.jpa.AvailableSettings { * The possible values are: * *

    diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java index a8b7e6b993..c6f556213e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java @@ -103,7 +103,7 @@ public final class ImmutableEntityEntry extends AbstractEntityEntry { * * @return The deserialized EntityEntry * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs * @throws ClassNotFoundException If any of the classes declared in the stream * cannot be found */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java index b3a969a616..413667c650 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntryFactory.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.Status; import org.hibernate.persister.entity.EntityPersister; /** - * Factory for the safe approach implementation of {@link org.hibernate.engine.spi.EntityEntry}. + * Factory for the safe approach implementation of {@link EntityEntry}. *

    * Smarter implementations could store less state. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/JoinHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/JoinHelper.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java index 6b1d33f950..6e26a29286 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntry.java @@ -96,7 +96,7 @@ public final class MutableEntityEntry extends AbstractEntityEntry { * * @return The deserialized EntityEntry * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs * @throws ClassNotFoundException If any of the classes declared in the stream * cannot be found */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java index 1681adb7bf..407202f5e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/MutableEntityEntryFactory.java @@ -15,7 +15,7 @@ import org.hibernate.engine.spi.Status; import org.hibernate.persister.entity.EntityPersister; /** - * Factory for the safe approach implementation of {@link org.hibernate.engine.spi.EntityEntry}. + * Factory for the safe approach implementation of {@link EntityEntry}. *

    * Smarter implementations could store less state. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index 11d8f2031c..3ded24c63c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -1123,7 +1123,7 @@ public class StatefulPersistenceContext implements PersistenceContext { public void forEachCollectionEntry(BiConsumer action, boolean concurrent) { if ( collectionEntries != null ) { if ( concurrent ) { - for ( Map.Entry entry : IdentityMap.concurrentEntries( collectionEntries ) ) { + for ( Entry entry : IdentityMap.concurrentEntries( collectionEntries ) ) { action.accept( entry.getKey(), entry.getValue() ); } } @@ -1563,7 +1563,7 @@ public class StatefulPersistenceContext implements PersistenceContext { oos.writeBoolean( defaultReadOnly ); oos.writeBoolean( hasNonReadOnlyEntities ); - final Serializer> entityKeySerializer = (entry, stream) -> { + final Serializer> entityKeySerializer = (entry, stream) -> { entry.getKey().serialize( stream ); stream.writeObject( entry.getValue() ); }; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/UnsavedValueFactory.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java index 36991a9d7a..4675c41fa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java @@ -48,7 +48,7 @@ public final class BlobProxy implements Blob, BlobImplementer { * * @param stream The binary stream * @param length The length of the stream - * @see #generateProxy(java.io.InputStream, long) + * @see #generateProxy(InputStream, long) */ private BlobProxy(InputStream stream, long length) { this.binaryStream = new StreamBackedBinaryStream( stream, length ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java index 5f30ce910e..78d5c2f5c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java @@ -47,7 +47,7 @@ public class ClobProxy implements InvocationHandler { * * @param reader The character reader. * @param length The length of the reader stream. - * @see #generateProxy(java.io.Reader, long) + * @see #generateProxy(Reader, long) */ protected ClobProxy(Reader reader, long length) { this.characterStream = new CharacterStreamImpl( reader, length ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java index 38933169e5..4e4bb4e533 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java @@ -17,7 +17,7 @@ import java.sql.SQLException; import org.hibernate.JDBCException; /** - * {@link LobCreator} implementation using contextual creation against the JDBC {@link java.sql.Connection} class's LOB creation + * {@link LobCreator} implementation using contextual creation against the JDBC {@link Connection} class's LOB creation * methods. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java index ec27c80f6d..a60a934712 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java @@ -45,7 +45,7 @@ public class NClobProxy extends ClobProxy { } /** - * Generates a {@link java.sql.NClob} proxy using a character reader of given length. + * Generates a {@link NClob} proxy using a character reader of given length. * * @param reader The character reader * @param length The length of the character reader diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java index 748b2e753b..3d152dfb8d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java @@ -31,7 +31,7 @@ public class SerializableBlobProxy implements InvocationHandler, Serializable { * Builds a serializable {@link Blob} wrapper around the given {@link Blob}. * * @param blob The {@link Blob} to be wrapped. - * @see #generateProxy(java.sql.Blob) + * @see #generateProxy(Blob) */ private SerializableBlobProxy(Blob blob) { this.blob = blob; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java index a52e6cc095..c2b8cbb328 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java @@ -28,10 +28,10 @@ public class SerializableClobProxy implements InvocationHandler, Serializable { private final transient Clob clob; /** - * Builds a serializable {@link java.sql.Clob} wrapper around the given {@link java.sql.Clob}. + * Builds a serializable {@link Clob} wrapper around the given {@link Clob}. * - * @param clob The {@link java.sql.Clob} to be wrapped. - * @see #generateProxy(java.sql.Clob) + * @param clob The {@link Clob} to be wrapped. + * @see #generateProxy(Clob) */ protected SerializableClobProxy(Clob clob) { this.clob = clob; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java index e4a5a41cc8..e7a7755bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java @@ -33,11 +33,11 @@ public class SerializableNClobProxy extends SerializableClobProxy { } /** - * Builds a serializable {@link java.sql.Clob} wrapper around the given {@link java.sql.Clob}. + * Builds a serializable {@link Clob} wrapper around the given {@link Clob}. * - * @param clob The {@link java.sql.Clob} to be wrapped. + * @param clob The {@link Clob} to be wrapped. * - * @see #generateProxy(java.sql.Clob) + * @see #generateProxy(Clob) */ protected SerializableNClobProxy(Clob clob) { super( clob ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java index f3bbb9f697..1d09ec2077 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java @@ -11,7 +11,7 @@ import java.sql.PreparedStatement; * Conceptually models a batch. *

    * Unlike directly in JDBC, here we add the ability to batch together multiple statements at a time. In the underlying - * JDBC this correlates to multiple {@link java.sql.PreparedStatement} objects (one for each DML string) maintained within the + * JDBC this correlates to multiple {@link PreparedStatement} objects (one for each DML string) maintained within the * batch. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java index 36a3afb747..9f8753d542 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java @@ -21,7 +21,7 @@ import org.hibernate.service.spi.InjectService; import org.hibernate.service.spi.Stoppable; /** - * A {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} that manages connections from an underlying {@link DataSource}. + * A {@link ConnectionProvider} that manages connections from an underlying {@link DataSource}. *

    * The {@link DataSource} to use may be specified by either:

      *
    • injection via {@link #setDataSource}
      • diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java index 0362a5591e..7317d28eba 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java @@ -39,7 +39,7 @@ import static org.hibernate.internal.log.ConnectionPoolingLogger.CONNECTIONS_LOG import static org.hibernate.internal.log.ConnectionPoolingLogger.CONNECTIONS_MESSAGE_LOGGER; /** - * A connection provider that uses the {@link java.sql.DriverManager} directly to open connections and provides + * A connection provider that uses the {@link DriverManager} directly to open connections and provides * a very rudimentary connection pool. *

      * IMPL NOTE : not intended for production use! diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java index e90baeb6e9..df7f6cdf7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java @@ -27,7 +27,7 @@ import org.hibernate.service.spi.Stoppable; * to a single base JNDI context * *

    • - * {@link org.hibernate.cfg.AvailableSettings#DATASOURCE} is a string naming either the {@literal any} + * {@link AvailableSettings#DATASOURCE} is a string naming either the {@literal any} * data source or the base JNDI context. If the latter, {@link #TENANT_IDENTIFIER_TO_USE_FOR_ANY_KEY} must * also be set. *
      • diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java index 8efc9c188e..e27dbde3c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/spi/JdbcConnectionAccess.java @@ -41,8 +41,8 @@ public interface JdbcConnectionAccess extends Serializable { * * @return true/false * - * @see org.hibernate.engine.jdbc.connections.spi.ConnectionProvider#supportsAggressiveRelease() - * @see org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider#supportsAggressiveRelease() + * @see ConnectionProvider#supportsAggressiveRelease() + * @see MultiTenantConnectionProvider#supportsAggressiveRelease() */ boolean supportsAggressiveRelease(); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java index 352aed6efc..2571164186 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/spi/RefCursorSupport.java @@ -20,7 +20,7 @@ import org.hibernate.service.Service; */ public interface RefCursorSupport extends Service { /** - * Register a parameter capable of returning a {@link java.sql.ResultSet} *by position*. + * Register a parameter capable of returning a {@link ResultSet} *by position*. * * @param statement The callable statement. * @param position The bind position at which to register the output param. @@ -28,7 +28,7 @@ public interface RefCursorSupport extends Service { public void registerRefCursorParameter(CallableStatement statement, int position); /** - * Register a parameter capable of returning a {@link java.sql.ResultSet} *by name*. + * Register a parameter capable of returning a {@link ResultSet} *by name*. * * @param statement The callable statement. * @param name The parameter name (for drivers which support named parameters). @@ -36,8 +36,8 @@ public interface RefCursorSupport extends Service { public void registerRefCursorParameter(CallableStatement statement, String name); /** - * Given a callable statement previously processed by {@link #registerRefCursorParameter(java.sql.CallableStatement, int)}, - * extract the {@link java.sql.ResultSet}. + * Given a callable statement previously processed by {@link #registerRefCursorParameter(CallableStatement, int)}, + * extract the {@link ResultSet}. * * * @param statement The callable statement. @@ -48,8 +48,8 @@ public interface RefCursorSupport extends Service { public ResultSet getResultSet(CallableStatement statement, int position); /** - * Given a callable statement previously processed by {@link #registerRefCursorParameter(java.sql.CallableStatement, String)}, - * extract the {@link java.sql.ResultSet}. + * Given a callable statement previously processed by {@link #registerRefCursorParameter(CallableStatement, String)}, + * extract the {@link ResultSet}. * * @param statement The callable statement. * @param name The parameter name (for drivers which support named parameters). diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java index 349873ecd0..6ca78186ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/spi/BasicSQLExceptionConverter.java @@ -15,7 +15,7 @@ import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; /** - * A helper to centralize conversion of {@link java.sql.SQLException}s to {@link org.hibernate.JDBCException}s. + * A helper to centralize conversion of {@link SQLException}s to {@link JDBCException}s. *

      * Used while querying JDBC metadata during bootstrapping * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java index 1dcd4b2205..6b01740bb7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/DefaultSchemaNameResolver.java @@ -49,7 +49,7 @@ public class DefaultSchemaNameResolver implements SchemaNameResolver { connection.getSchema(); return new SchemaNameResolverJava17Delegate(); } - catch (java.lang.AbstractMethodError e) { + catch (AbstractMethodError e) { log.debugf( "Unable to use Java 1.7 Connection#getSchema" ); return SchemaNameResolverFallbackDelegate.INSTANCE; } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java index cfe43dbd7d..d8ee6ca639 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java @@ -56,7 +56,7 @@ public class JdbcEnvironmentImpl implements JdbcEnvironment { private final NameQualifierSupport nameQualifierSupport; /** - * Constructor form used when the JDBC {@link java.sql.DatabaseMetaData} is not available. + * Constructor form used when the JDBC {@link DatabaseMetaData} is not available. * * @param serviceRegistry The service registry * @param dialect The resolved dialect. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java index edd5d637c6..5e5445edd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/LobCreatorBuilderImpl.java @@ -26,7 +26,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper; import org.jboss.logging.Logger; /** - * Builds {@link org.hibernate.engine.jdbc.LobCreator} instances based on the capabilities of the environment. + * Builds {@link LobCreator} instances based on the capabilities of the environment. * * @author Steve Ebersole */ @@ -46,11 +46,11 @@ public class LobCreatorBuilderImpl implements LobCreatorBuilder { /** * The public factory method for obtaining the appropriate LOB creator (according to given - * JDBC {@link java.sql.Connection}). + * JDBC {@link Connection}). * * @param dialect The {@link Dialect} in use * @param configValues The map of settings - * @param jdbcConnection A JDBC {@link java.sql.Connection} which can be used to gauge the drivers level of support, + * @param jdbcConnection A JDBC {@link Connection} which can be used to gauge the drivers level of support, * specifically for creating LOB references. */ public static LobCreatorBuilderImpl makeLobCreatorBuilder(Dialect dialect, Map configValues, Connection jdbcConnection) { @@ -71,9 +71,9 @@ public class LobCreatorBuilderImpl implements LobCreatorBuilder { private static final Object[] NO_ARGS = ArrayHelper.EMPTY_OBJECT_ARRAY; /** - * Basically here we are simply checking whether we can call the {@link java.sql.Connection} methods for - * LOB creation added in JDBC 4. We not only check whether the {@link java.sql.Connection} declares these methods, - * but also whether the actual {@link java.sql.Connection} instance implements them (i.e. can be called without simply + * Basically here we are simply checking whether we can call the {@link Connection} methods for + * LOB creation added in JDBC 4. We not only check whether the {@link Connection} declares these methods, + * but also whether the actual {@link Connection} instance implements them (i.e. can be called without simply * throwing an exception). * * @param dialect The {@link Dialect} in use diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java index 3fd7f7d227..fa766226e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/QualifiedObjectNameFormatterStandardImpl.java @@ -19,7 +19,7 @@ import org.hibernate.engine.jdbc.env.spi.QualifiedObjectNameFormatter; /** * Standard implementation of QualifiedObjectNameFormatter which uses information reported - * by {@link java.sql.DatabaseMetaData} to render qualified names. + * by {@link DatabaseMetaData} to render qualified names. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java index be95c6738f..c7bc074bdd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelper.java @@ -55,8 +55,8 @@ public interface IdentifierHelper { /** * Intended only for use in handling quoting requirements for {@code column-definition} - * as defined by {@link javax.persistence.Column#columnDefinition()}, - * {@link javax.persistence.JoinColumn#columnDefinition}, etc. This method should not + * as defined by {@link jakarta.persistence.Column#columnDefinition()}, + * {@link jakarta.persistence.JoinColumn#columnDefinition}, etc. This method should not * be called in any other scenario. *

      * This method is needed to account for that fact that the JPA spec says that {@code column-definition} diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java index c9082cbc37..d6ff61ec57 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/JdbcEnvironment.java @@ -15,7 +15,7 @@ import org.hibernate.sql.ast.SqlAstTranslatorFactory; /** * Initial look at this concept we keep talking about with merging information from {@link java.sql.DatabaseMetaData} - * and {@link org.hibernate.dialect.Dialect} + * and {@link Dialect} * * @author Steve Ebersole */ @@ -47,7 +47,7 @@ public interface JdbcEnvironment extends Service { /** * Get the current database catalog. Typically will come from either - * {@link SchemaNameResolver#resolveSchemaName(java.sql.Connection, org.hibernate.dialect.Dialect)} or + * {@link SchemaNameResolver#resolveSchemaName(java.sql.Connection, Dialect)} or * {@link org.hibernate.cfg.AvailableSettings#DEFAULT_CATALOG}. * * @return The current schema diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java index 752c8ff73a..864ed7de3d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SQLStateType.java @@ -9,7 +9,7 @@ package org.hibernate.engine.jdbc.env.spi; import java.sql.DatabaseMetaData; /** - * Enum interpretation of the valid values from {@link java.sql.DatabaseMetaData#getSQLStateType()} + * Enum interpretation of the valid values from {@link DatabaseMetaData#getSQLStateType()} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java index d6e7c8dc3d..a072f85a2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/SchemaNameResolver.java @@ -12,13 +12,13 @@ import java.sql.SQLException; import org.hibernate.dialect.Dialect; /** - * Contract for resolving the schema of a {@link java.sql.Connection}. + * Contract for resolving the schema of a {@link Connection}. * * @author Steve Ebersole */ public interface SchemaNameResolver { /** - * Given a JDBC {@link java.sql.Connection}, resolve the name of the schema (if one) to which it connects. + * Given a JDBC {@link Connection}, resolve the name of the schema (if one) to which it connects. * * @param connection The JDBC connection * @param dialect The Dialect diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/DDLFormatterImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java index 86720f97f8..f69e0bdbe2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java @@ -37,10 +37,10 @@ public class LobCreatorBuilder { private boolean useContextualLobCreation; /** - * The public factory method for obtaining the appropriate (according to given JDBC {@link java.sql.Connection}. + * The public factory method for obtaining the appropriate (according to given JDBC {@link Connection}. * * @param configValues The map of settings - * @param jdbcConnection A JDBC {@link java.sql.Connection} which can be used to gauge the drivers level of support, + * @param jdbcConnection A JDBC {@link Connection} which can be used to gauge the drivers level of support, * specifically for creating LOB references. */ public LobCreatorBuilder(Map configValues, Connection jdbcConnection) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java index 90af28a7a0..07b4b2a5a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcCoordinator.java @@ -94,7 +94,7 @@ public interface JdbcCoordinator extends Serializable, TransactionCoordinatorOwn * * @return The {@link Connection} associated with the managed {@link #getLogicalConnection() logical connection} * - * @see org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor#close + * @see LogicalConnectionImplementor#close */ Connection close(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java index d44bf3d485..ff55966ebb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ResultSetReturn.java @@ -30,7 +30,7 @@ public interface ResultSetReturn { * Extract the ResultSet from the PreparedStatement. *

      * If user passes {@link CallableStatement} reference, this method calls {@link #extract(CallableStatement)} - * internally. Otherwise, generally speaking, {@link java.sql.PreparedStatement#executeQuery()} is called + * internally. Otherwise, generally speaking, {@link PreparedStatement#executeQuery()} is called * * @param statement The PreparedStatement from which to extract the ResultSet * @@ -84,7 +84,7 @@ public interface ResultSetReturn { * * @param statement The PreparedStatement to execute * - * @return The {@link java.sql.PreparedStatement#executeUpdate()} result + * @return The {@link PreparedStatement#executeUpdate()} result */ public int executeUpdate(PreparedStatement statement); @@ -94,7 +94,7 @@ public interface ResultSetReturn { * @param statement The JDBC Statement object to use * @param sql The SQL to execute * - * @return The {@link java.sql.PreparedStatement#executeUpdate(String)} result + * @return The {@link PreparedStatement#executeUpdate(String)} result */ public int executeUpdate(Statement statement, String sql); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java index 7b2a555ca3..296fe17c0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/StatementPreparer.java @@ -50,7 +50,7 @@ public interface StatementPreparer { *

    • {@link PreparedStatement#RETURN_GENERATED_KEYS}
      • *
    • {@link PreparedStatement#NO_GENERATED_KEYS}
      • *
    - * Generated keys are accessed afterwards via {@link java.sql.PreparedStatement#getGeneratedKeys} + * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} * * @param sql The INSERT SQL * @param autoGeneratedKeys The autoGeneratedKeys flag @@ -63,7 +63,7 @@ public interface StatementPreparer { /** * Prepare an INSERT statement, specifying columns which are auto-generated values to be returned. - * Generated keys are accessed afterwards via {@link java.sql.PreparedStatement#getGeneratedKeys} + * Generated keys are accessed afterwards via {@link PreparedStatement#getGeneratedKeys} * * @param sql - the SQL for the statement to be prepared * @param columnNames The name of the columns to be returned in the generated keys result set. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java index d0a4f94e89..1b0208fee2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeInfo.java @@ -17,7 +17,7 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.jboss.logging.Logger; /** - * Models type info extracted from {@link java.sql.DatabaseMetaData#getTypeInfo()} + * Models type info extracted from {@link DatabaseMetaData#getTypeInfo()} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java index 004ad43497..8f2863c2f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/TypeSearchability.java @@ -16,27 +16,27 @@ import java.sql.DatabaseMetaData; public enum TypeSearchability { /** * Type is not searchable. - * @see java.sql.DatabaseMetaData#typePredNone + * @see DatabaseMetaData#typePredNone */ NONE, /** * Type is fully searchable - * @see java.sql.DatabaseMetaData#typeSearchable + * @see DatabaseMetaData#typeSearchable */ FULL, /** * Type is valid only in {@code WHERE ... LIKE} - * @see java.sql.DatabaseMetaData#typePredChar + * @see DatabaseMetaData#typePredChar */ CHAR, /** * Type is supported only in {@code WHERE ... LIKE} - * @see java.sql.DatabaseMetaData#typePredBasic + * @see DatabaseMetaData#typePredBasic */ BASIC; /** - * Based on the code retrieved from {@link java.sql.DatabaseMetaData#getTypeInfo()} for the {@code SEARCHABLE} + * Based on the code retrieved from {@link DatabaseMetaData#getTypeInfo()} for the {@code SEARCHABLE} * column, return the appropriate enum. * * @param code The retrieved code value. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/package.html b/hibernate-core/src/main/java/org/hibernate/engine/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java index 54979effdf..2eabcaf88e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java @@ -423,13 +423,13 @@ public class ActionQueue { } /** - * Throws {@link org.hibernate.PropertyValueException} if there are any unresolved entity insert actions that depend + * Throws {@link PropertyValueException} if there are any unresolved entity insert actions that depend * on non-nullable associations with a transient entity. This method should be called on completion of an operation * (after all cascades are completed) that saves an entity. * - * @throws org.hibernate.PropertyValueException if there are any unresolved entity insert actions; - * {@link org.hibernate.PropertyValueException#getEntityName()} and - * {@link org.hibernate.PropertyValueException#getPropertyName()} will return the entity name and property value for + * @throws PropertyValueException if there are any unresolved entity insert actions; + * {@link PropertyValueException#getEntityName()} and + * {@link PropertyValueException#getPropertyName()} will return the entity name and property value for * the first unresolved entity insert action. */ public void checkNoUnresolvedActionsAfterOperation() throws PropertyValueException { @@ -517,7 +517,7 @@ public class ActionQueue { } /** - * Execute any registered {@link org.hibernate.action.spi.BeforeTransactionCompletionProcess} + * Execute any registered {@link BeforeTransactionCompletionProcess} */ public void beforeTransactionCompletion() { if ( !isTransactionCoordinatorShared ) { @@ -589,7 +589,7 @@ public class ActionQueue { } /** - * Perform {@link org.hibernate.action.spi.Executable#execute()} on each element of the list + * Perform {@link Executable#execute()} on each element of the list * * @param list The list of Executable elements to be performed * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java index 586bf1699a..9639c8d80d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingActions.java @@ -79,7 +79,7 @@ public class CascadingActions { }; /** - * @see org.hibernate.Session#lock(Object, org.hibernate.LockMode) + * @see org.hibernate.Session#lock(Object, LockMode) */ public static final CascadingAction LOCK = new BaseCascadingAction() { @Override diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java index cf3d72bd03..bd0910659b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionEntry.java @@ -404,7 +404,7 @@ public final class CollectionEntry implements Serializable { * Session/PersistenceContext for increased performance. * * @param oos The stream to which we should write the serial data. - * @throws java.io.IOException + * @throws IOException */ public void serialize(ObjectOutputStream oos) throws IOException { oos.writeObject( role ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java index 31b43335ac..e0da94d94e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java @@ -106,7 +106,7 @@ public final class CollectionKey implements Serializable { * * @param oos The stream to which we should write the serial data. * - * @throws java.io.IOException + * @throws IOException */ public void serialize(ObjectOutputStream oos) throws IOException { oos.writeObject( role ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java index f416daa71c..68aaad467d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java @@ -132,7 +132,7 @@ public interface EntityEntry { * * @param oos The stream to which we should write the serial data. * - * @throws java.io.IOException If a stream error occurs + * @throws IOException If a stream error occurs */ void serialize(ObjectOutputStream oos) throws IOException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java index 035349979e..a7da29e0d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryExtraState.java @@ -8,14 +8,14 @@ package org.hibernate.engine.spi; /** - * Navigation methods for extra state objects attached to {@link org.hibernate.engine.spi.EntityEntry}. + * Navigation methods for extra state objects attached to {@link EntityEntry}. * * @author Emmanuel Bernard */ public interface EntityEntryExtraState { /** - * Attach additional state to the core state of {@link org.hibernate.engine.spi.EntityEntry} + * Attach additional state to the core state of {@link EntityEntry} *

    * Implementations must delegate to the next state or add it as next state if last in line. */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java index a40e9a7228..e295838f49 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntryFactory.java @@ -12,14 +12,14 @@ import org.hibernate.LockMode; import org.hibernate.persister.entity.EntityPersister; /** - * Contract to build {@link org.hibernate.engine.spi.EntityEntry} + * Contract to build {@link EntityEntry} * * @author Emmanuel Bernard */ public interface EntityEntryFactory extends Serializable { /** - * Creates {@link org.hibernate.engine.spi.EntityEntry}. + * Creates {@link EntityEntry}. */ EntityEntry createEntityEntry( final Status status, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityUniqueKey.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java index a68510a85a..88e7d3b0a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ExecutableList.java @@ -99,7 +99,7 @@ public class ExecutableList im * * @param sorter The Sorter to use; may be {@code null} */ - public ExecutableList(ExecutableList.Sorter sorter) { + public ExecutableList(Sorter sorter) { this( INIT_QUEUE_LIST_SIZE, sorter ); } @@ -109,7 +109,7 @@ public class ExecutableList im * @param initialCapacity The initial capacity for instantiating the internal List * @param sorter The Sorter to use; may be {@code null} */ - public ExecutableList(int initialCapacity, ExecutableList.Sorter sorter) { + public ExecutableList(int initialCapacity, Sorter sorter) { this.sorter = sorter; this.executables = new ArrayList<>( initialCapacity ); this.querySpaces = null; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java index 23f51ee282..bdbf3b6e82 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/LoadQueryInfluencers.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.Filter; import org.hibernate.UnknownProfileException; @@ -159,7 +159,7 @@ public class LoadQueryInfluencers implements Serializable { return Collections.EMPTY_SET; } else { - return java.util.Collections.unmodifiableSet( enabledFilters.keySet() ); + return Collections.unmodifiableSet( enabledFilters.keySet() ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java index 53ad011e7a..571c38eaff 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java @@ -15,7 +15,7 @@ import org.hibernate.type.Type; * and "uncompiled" mappings (ie. Configuration) that are used by * implementors of Type. * - * @see org.hibernate.type.Type + * @see Type * @see org.hibernate.internal.SessionFactoryImpl * @see org.hibernate.cfg.Configuration * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java index 0cb0b6a9ce..ecbb8cc7d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/QueryParameters.java @@ -456,7 +456,7 @@ public final class QueryParameters { * * @see QueryParameters#isReadOnlyInitialized() * @see QueryParameters#setReadOnly(boolean) - * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly() + * @see PersistenceContext#isDefaultReadOnly() * * The read-only/modifiable setting has no impact on entities/proxies returned by the * query that existed in the session before the query was executed. @@ -480,7 +480,7 @@ public final class QueryParameters { * @see QueryParameters#isReadOnlyInitialized() * @see QueryParameters#isReadOnly(SharedSessionContractImplementor) * @see QueryParameters#setReadOnly(boolean) - * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly() + * @see PersistenceContext#isDefaultReadOnly() */ public void setReadOnly(boolean readOnly) { this.readOnly = readOnly; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java index 2e5e12b852..22f33ec5cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionBuilderImplementor.java @@ -12,7 +12,7 @@ import org.hibernate.SessionBuilder; * Defines the internal contract between the SessionBuilder and other parts of * Hibernate.. * - * @see org.hibernate.SessionBuilder + * @see SessionBuilder * * @author Gail Badner */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java index 4d30dd7317..611fbb7dc5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java @@ -12,15 +12,15 @@ import java.util.Map; import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.metamodel.Metamodel; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.metamodel.Metamodel; import org.hibernate.CacheMode; import org.hibernate.Filter; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java index ab4563e6ad..e139034a86 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java @@ -12,11 +12,11 @@ import java.util.Map; import java.util.Set; import javax.naming.NamingException; import javax.naming.Reference; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; +import jakarta.persistence.SynchronizationType; import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.EntityNameResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java index 2e093c16ee..8eb6dedece 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.EntityNameResolver; @@ -51,7 +51,7 @@ import org.hibernate.type.spi.TypeConfiguration; * Defines the internal contract between the SessionFactory and other parts of * Hibernate such as implementors of Type. * - * @see org.hibernate.SessionFactory + * @see SessionFactory * @see org.hibernate.internal.SessionFactoryImpl * * @author Gavin King @@ -319,7 +319,7 @@ public interface SessionFactoryImplementor /** * Get the names of all persistent classes that implement/extend the given interface/class * - * @deprecated Use {@link Metamodel#getImplementors(java.lang.String)} instead + * @deprecated Use {@link Metamodel#getImplementors(String)} instead */ @Deprecated default String[] getImplementors(String entityName) { @@ -329,7 +329,7 @@ public interface SessionFactoryImplementor /** * Get a class name, using query language imports * - * @deprecated Use {@link Metamodel#getImportedClassName(java.lang.String)} instead + * @deprecated Use {@link Metamodel#getImportedClassName(String)} instead */ @Deprecated default String getImportedClassName(String name) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java index 0d5c3f5e45..1d806c3c6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java @@ -8,9 +8,9 @@ package org.hibernate.engine.spi; import java.util.Map; import java.util.Set; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -23,7 +23,7 @@ import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; /** * Defines the "internal contract" for {@link Session} and other parts of Hibernate such as - * {@link org.hibernate.type.Type}, {@link org.hibernate.persister.entity.EntityPersister} + * {@link org.hibernate.type.Type}, {@link EntityPersister} * and {@link org.hibernate.persister.collection.CollectionPersister} implementations. * * A Session, through this interface and SharedSessionContractImplementor, implements:

      diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java index 3a49952ee7..f67f3109a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java @@ -9,8 +9,8 @@ package org.hibernate.engine.spi; import java.sql.Connection; import java.util.Set; import java.util.UUID; -import javax.persistence.FlushModeType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -42,7 +42,7 @@ import org.hibernate.type.spi.TypeConfiguration; * * A Session, through this interface and SharedSessionContractImplementor, implements:
        *
      • - * {@link org.hibernate.resource.jdbc.spi.JdbcSessionOwner} to drive the behavior of a "JDBC session". + * {@link JdbcSessionOwner} to drive the behavior of a "JDBC session". * Can therefor be used to construct a JdbcCoordinator, which (for now) models a "JDBC session" *
        • *
      • @@ -52,10 +52,10 @@ import org.hibernate.type.spi.TypeConfiguration; * {@link org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder#buildTransactionCoordinator} *
        • *
      • - * {@link org.hibernate.engine.jdbc.LobCreationContext} to act as the context for JDBC LOB instance creation + * {@link LobCreationContext} to act as the context for JDBC LOB instance creation *
        • *
      • - * {@link org.hibernate.type.descriptor.WrapperOptions} to fulfill the behavior needed while + * {@link WrapperOptions} to fulfill the behavior needed while * binding/extracting values to/from JDBC as part of the Type contracts *
        • *
      diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SubselectFetch.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java index 985949bf68..ad372d03a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/TypedValue.java @@ -17,7 +17,7 @@ import org.hibernate.type.Type; /** * An ordered pair of a value and its Hibernate type. * - * @see org.hibernate.type.Type + * @see Type * @author Gavin King */ public final class TypedValue implements Serializable { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java index 4d555d996e..ddddedb5af 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.internal; import java.util.LinkedHashSet; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.engine.transaction.spi.SynchronizationRegistry; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java index 2c688c25bb..483b2bd7d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.engine.transaction.internal; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.HibernateException; import org.hibernate.TransactionException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java index f4b7b21d5c..bd5768c1d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java @@ -6,10 +6,10 @@ */ package org.hibernate.engine.transaction.internal.jta; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.TransactionException; @@ -45,7 +45,7 @@ public final class JtaStatusHelper { } /** - * Extract the status code from the current {@link javax.transaction.Transaction} associated with the + * Extract the status code from the current {@link jakarta.transaction.Transaction} associated with the * given {@link TransactionManager} * * @param transactionManager The {@link TransactionManager} from which to extract the status. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java index 04afb3267e..374428b403 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java @@ -7,11 +7,11 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.util.Map; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jndi.spi.JndiService; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java index e4e487739b..35b0e04ef7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/AtomikosJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java index 5fe7cf7cb7..2b9cd0baa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java index 882b2815e6..79bcde1215 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java index aa9ba67dde..126d98eb5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.jndi.JndiException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java index 1e46283c4d..85de78a5b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java index 6456f361b7..8fa1ec33ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java index dea02a1deb..3239514a9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java index 12dc3e249a..ab3eadbf09 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for JRun4 AS diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java index ee9b808779..1345c133c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaPlatformInitiator.java @@ -19,7 +19,7 @@ import org.hibernate.service.spi.ServiceRegistryImplementor; import org.jboss.logging.Logger; /** - * Standard initiator for the standard {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} + * Standard initiator for the standard {@link JtaPlatform} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java index c84c141e90..8a4eb4b81d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Contract used to centralize {@link Synchronization} handling logic. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java index 6b0045db94..56e4155b4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java @@ -6,12 +6,12 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java index be24e4c726..515412abf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for the OC4J (Oracle) AS. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java index 1918f3b31e..eb739c7c19 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Orion diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java index 1f2329e271..0ae8e16236 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Resin diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java index 1fe80f804b..f0519e10d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SapNetWeaverJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for SAP NetWeaver diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java index 45edee243d..91a439b180 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java index 42e0f9ced3..a90883f556 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.TransactionSynchronizationRegistry; /** * Provides access to a {@link TransactionSynchronizationRegistry} for use by {@link TransactionSynchronizationRegistry}-based diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java index 194bdcb305..d08bd9600a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java index b10d79387d..77f03988da 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionManager; +import jakarta.transaction.TransactionManager; /** * Provides access to a {@link TransactionManager} for use by {@link TransactionManager}-based diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java index 0e59a7c157..dd7dd6ce66 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java @@ -6,14 +6,14 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; /** * Implementation of the {@link JtaSynchronizationStrategy} contract based on using a - * {@link javax.transaction.TransactionManager} + * {@link jakarta.transaction.TransactionManager} * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java index 9b99d03a41..f93386af48 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java @@ -9,14 +9,14 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import javax.transaction.xa.XAResource; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java index 3f46871676..3066a2f03a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java @@ -7,8 +7,8 @@ package org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java index c673317ddf..8ea76dc57c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereLibertyJtaPlatform.java @@ -6,13 +6,13 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.RollbackException; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java index 8ccf093d0b..443f2e8ed7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** * {@link org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Weblogic @@ -16,8 +16,8 @@ import javax.transaction.UserTransaction; * @author Steve Ebersole */ public class WeblogicJtaPlatform extends AbstractJtaPlatform { - public static final String TM_NAME = "javax.transaction.TransactionManager"; - public static final String UT_NAME = "javax.transaction.UserTransaction"; + public static final String TM_NAME = "jakarta.transaction.TransactionManager"; + public static final String UT_NAME = "jakarta.transaction.UserTransaction"; @Override protected TransactionManager locateTransactionManager() { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java index 64e2a80c70..2534b9f666 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WildFlyStandAloneJtaPlatform.java @@ -6,8 +6,8 @@ */ package org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java index e8ad3ccfd7..8cd66da0f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java @@ -6,11 +6,11 @@ */ package org.hibernate.engine.transaction.jta.platform.spi; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; import org.hibernate.service.Service; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java index 3edecb6858..72ad587291 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java @@ -7,7 +7,7 @@ package org.hibernate.engine.transaction.spi; import java.io.Serializable; -import javax.transaction.Synchronization; +import jakarta.transaction.Synchronization; /** * Manages a registry of {@link Synchronization Synchronizations}. @@ -34,7 +34,7 @@ public interface SynchronizationRegistry extends Serializable { * Delegate {@link Synchronization#afterCompletion} calls to {@link #registerSynchronization registered} * {@link Synchronization Synchronizations} * - * @param status The transaction status (if known) per {@link javax.transaction.Status} + * @param status The transaction status (if known) per {@link jakarta.transaction.Status} */ void notifySynchronizationsAfterTransactionCompletion(int status); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultInitializeCollectionEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java index 3f5c748049..bd016877bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLoadEventListener.java @@ -55,7 +55,7 @@ public class DefaultLoadEventListener implements LoadEventListener { */ public void onLoad( final LoadEvent event, - final LoadEventListener.LoadType loadType) throws HibernateException { + final LoadType loadType) throws HibernateException { final EntityPersister persister = getPersister( event ); @@ -91,7 +91,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void doOnLoad( final EntityPersister persister, final LoadEvent event, - final LoadEventListener.LoadType loadType) { + final LoadType loadType) { try { final EventSource session = event.getSession(); @@ -120,7 +120,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void checkIdClass( final EntityPersister persister, final LoadEvent event, - final LoadEventListener.LoadType loadType, + final LoadType loadType, final Class idClass) { // we may have the jpa requirement of allowing find-by-id where id is the "simple pk value" of a // dependent objects parent. This is part of its generally goofy derived identity "feature" @@ -156,7 +156,7 @@ public class DefaultLoadEventListener implements LoadEventListener { private void loadByDerivedIdentitySimplePkValue( LoadEvent event, - LoadEventListener.LoadType options, + LoadType options, EntityPersister dependentPersister, // EmbeddedComponentType dependentIdType, EntityPersister parentPersister) { @@ -186,7 +186,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); if ( event.getInstanceToLoad() != null ) { @@ -235,7 +235,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); final SessionFactoryImplementor factory = session.getFactory(); @@ -341,7 +341,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final PersistenceContext persistenceContext, final Object proxy) { if ( LOG.isTraceEnabled() ) { @@ -392,7 +392,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final PersistenceContext persistenceContext) { Object existing = persistenceContext.getEntity( keyToLoad ); final boolean traceEnabled = LOG.isTraceEnabled(); @@ -444,7 +444,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options, + final LoadType options, final SessionImplementor source) { SoftLock lock = null; final Object ck; @@ -494,7 +494,7 @@ public class DefaultLoadEventListener implements LoadEventListener { final LoadEvent event, final EntityPersister persister, final EntityKey keyToLoad, - final LoadEventListener.LoadType options) { + final LoadType options) { final EventSource session = event.getSession(); final boolean traceEnabled = LOG.isTraceEnabled(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultPersistEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java index 3ae42cdea7..efebf79059 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedLoggedObserver.java @@ -20,7 +20,7 @@ import org.hibernate.internal.util.collections.IdentitySet; import org.hibernate.pretty.MessageHelper; /** - * An {@link org.hibernate.event.spi.EntityCopyObserver} implementation that allows multiple representations of + * An {@link EntityCopyObserver} implementation that allows multiple representations of * the same persistent entity to be merged and provides logging of the entity copies that * are detected. * diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java index 92a26b0e4e..b507701b35 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EntityCopyAllowedObserver.java @@ -11,7 +11,7 @@ import org.hibernate.event.spi.EntityCopyObserverFactory; import org.hibernate.event.spi.EventSource; /** - * An {@link org.hibernate.event.spi.EntityCopyObserver} implementation that allows multiple representations of + * An {@link EntityCopyObserver} implementation that allows multiple representations of * the same persistent entity to be merged. * * @author Gail Badner diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java index 169c515394..1f99de3394 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; * the merge operation has cascaded to that entity. * * "Merge entity" and "mergeEntity" method parameter refer to an entity that is (or will be) - * merged via {@link org.hibernate.event.spi.EventSource#merge(Object mergeEntity)}. + * merged via {@link EventSource#merge(Object mergeEntity)}. * * "Managed entity" and "managedEntity" method parameter refer to the managed entity that is * the result of merging an entity. @@ -37,8 +37,8 @@ import org.jboss.logging.Logger; * MergeContext already contains an entry with a different entity as the key, but * with the same (managedEntity) value, this means that multiple entity representations * for the same persistent entity are being merged. If this happens, - * {@link org.hibernate.event.spi.EntityCopyObserver#entityCopyDetected( - * Object managedEntity, Object mergeEntity1, Object mergeEntity2, org.hibernate.event.spi.EventSource)} + * {@link EntityCopyObserver#entityCopyDetected( + * Object managedEntity, Object mergeEntity1, Object mergeEntity2, EventSource)} * will be called. It is up to that method to determine the property course of * action for this situation. * @@ -149,7 +149,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext. * @return an unmodifiable set view of the merge-to-managed entity cross-references contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Set entrySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.entrySet() ); @@ -180,7 +180,7 @@ public class MergeContext implements Map { * Returns an unmodifiable set view of the merge entities contained in this MergeContext * @return an unmodifiable set view of the merge entities contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Set keySet() { return Collections.unmodifiableSet( mergeToManagedEntityXref.keySet() ); @@ -319,7 +319,7 @@ public class MergeContext implements Map { * Returns an unmodifiable Set view of managed entities contained in this MergeContext. * @return an unmodifiable Set view of managed entities contained in this MergeContext * - * @see Collections#unmodifiableSet(java.util.Set) + * @see Collections#unmodifiableSet(Set) */ public Collection values() { return Collections.unmodifiableSet( managedToMergeEntityXref.keySet() ); @@ -367,7 +367,7 @@ public class MergeContext implements Map { * * @return an unmodifiable map view of the managed-to-merge entity cross-references. * - * @see Collections#unmodifiableMap(java.util.Map) + * @see Collections#unmodifiableMap(Map) */ public Map invertMap() { return Collections.unmodifiableMap( managedToMergeEntityXref ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/package.html b/hibernate-core/src/main/java/org/hibernate/event/internal/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/package.html b/hibernate-core/src/main/java/org/hibernate/event/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventSource.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/FlushEntityEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/InitializeCollectionEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/MergeEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PersistEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreDeleteEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreInsertEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreUpdateEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEvent.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/spi/SaveOrUpdateEventListener.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/package.html b/hibernate-core/src/main/java/org/hibernate/exception/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java index 94f4029c64..2835606bd3 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConversionDelegate.java @@ -19,7 +19,7 @@ import org.hibernate.JDBCException; @FunctionalInterface public interface SQLExceptionConversionDelegate { /** - * Convert the given SQLException into the Hibernate {@link org.hibernate.JDBCException} hierarchy. + * Convert the given SQLException into the Hibernate {@link JDBCException} hierarchy. * * @param sqlException The SQLException to be converted. * @param message An (optional) error message. diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java index 9388863419..4912812fc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverter.java @@ -19,7 +19,7 @@ import org.hibernate.JDBCException; * Implementations must have a constructor which takes a * {@link ViolatedConstraintNameExtractor} parameter. *

      - * Implementations may implement {@link org.hibernate.exception.spi.Configurable} if they need to perform + * Implementations may implement {@link Configurable} if they need to perform * configuration steps prior to first use. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java index e3667ebdeb..74574e218d 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java @@ -74,7 +74,7 @@ public class SQLExceptionConverterFactory { /** * Builds a minimal converter. The instance returned here just always converts to - * {@link org.hibernate.exception.GenericJDBCException}. + * {@link GenericJDBCException}. * * @return The minimal converter. */ diff --git a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java index a134df0032..f89de88f81 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java @@ -7,7 +7,7 @@ package org.hibernate.graph; import java.util.Map; -import javax.persistence.Subgraph; +import jakarta.persistence.Subgraph; import org.hibernate.metamodel.model.domain.PersistentAttribute; @@ -18,7 +18,7 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; * @author Steve Ebersole * @author Andrea Boriero */ -public interface AttributeNode extends GraphNode, javax.persistence.AttributeNode { +public interface AttributeNode extends GraphNode, jakarta.persistence.AttributeNode { PersistentAttribute getAttributeDescriptor(); Map, SubGraph> getSubGraphs(); diff --git a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java index 42112badff..0e07aab858 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/CannotBecomeEntityGraphException.java @@ -10,7 +10,7 @@ import org.hibernate.HibernateException; /** * Indicates an illegal attempt to make a {@link Graph} become - * an {@link javax.persistence.EntityGraph} via {@link Graph#makeRootGraph(String, boolean)}. + * an {@link jakarta.persistence.EntityGraph} via {@link Graph#makeRootGraph(String, boolean)}. * Generally this happens because the Graph describes an embeddable, whereas an EntityGraph * by definition is only valid for an entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java index f99a806054..87fa9a1932 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java @@ -9,12 +9,12 @@ package org.hibernate.graph; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.Subgraph; -import javax.persistence.TypedQuery; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.Subgraph; +import jakarta.persistence.TypedQuery; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java index 3432e92e32..98ca0051dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/Graph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/Graph.java @@ -14,7 +14,7 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; /** * A container for {@link AttributeNode} references. * - * Acts as a "bridge" between JPA's {@link javax.persistence.EntityGraph} and {@link javax.persistence.Subgraph} + * Acts as a "bridge" between JPA's {@link jakarta.persistence.EntityGraph} and {@link jakarta.persistence.Subgraph} * * @author Strong Liu * @author Steve Ebersole @@ -49,8 +49,8 @@ public interface Graph extends GraphNode { // AttributeNode handling /** - * Ultimately only needed for implementing {@link javax.persistence.EntityGraph#getAttributeNodes()} - * and {@link javax.persistence.Subgraph#getAttributeNodes()} + * Ultimately only needed for implementing {@link jakarta.persistence.EntityGraph#getAttributeNodes()} + * and {@link jakarta.persistence.Subgraph#getAttributeNodes()} */ List> getGraphAttributeNodes(); diff --git a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java index ea14ee470f..314eee29b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/GraphParser.java @@ -6,10 +6,10 @@ */ package org.hibernate.graph; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Subgraph; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Subgraph; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; @@ -17,11 +17,11 @@ import org.hibernate.graph.spi.GraphImplementor; import org.hibernate.graph.spi.RootGraphImplementor; /** - * Parser for string representations of JPA {@link javax.persistence.EntityGraph} - * ({@link RootGraph}) and {@link javax.persistence.Subgraph} ({@link SubGraph}), + * Parser for string representations of JPA {@link jakarta.persistence.EntityGraph} + * ({@link RootGraph}) and {@link jakarta.persistence.Subgraph} ({@link SubGraph}), * using a simple syntax defined by the `graph.g` Antlr grammar. *

      - * The {@link #parse} methods all create a root {@link javax.persistence.EntityGraph} + * The {@link #parse} methods all create a root {@link jakarta.persistence.EntityGraph} * based on the passed entity class and parse the graph string into that root graph. *

      * The {@link #parseInto} methods parse the graph string into a passed graph, which may be a sub-graph diff --git a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java index 863b389e55..e410b51da7 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/RootGraph.java @@ -7,10 +7,10 @@ package org.hibernate.graph; import java.util.List; -import javax.persistence.AttributeNode; -import javax.persistence.EntityGraph; -import javax.persistence.Subgraph; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.Subgraph; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.model.domain.PersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java index 6429139e74..104bad9015 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/SubGraph.java @@ -7,7 +7,7 @@ package org.hibernate.graph; import java.util.List; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.model.domain.PersistentAttribute; @@ -17,10 +17,10 @@ import org.hibernate.metamodel.model.domain.PersistentAttribute; * @author Steve Ebersole * @author Andrea Boriero */ -public interface SubGraph extends Graph, javax.persistence.Subgraph { +public interface SubGraph extends Graph, jakarta.persistence.Subgraph { @Override @SuppressWarnings("unchecked") - default List> getAttributeNodes() { + default List> getAttributeNodes() { return (List) getAttributeNodeList(); } diff --git a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java index 79b418f6f9..e7875512b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/internal/RootGraphImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.graph.internal; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.cfg.NotYetImplementedException; import org.hibernate.graph.SubGraph; diff --git a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java index ed0fc5ce4f..9e6f3dcb98 100644 --- a/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/graph/spi/AttributeNodeImplementor.java @@ -8,7 +8,7 @@ package org.hibernate.graph.spi; import java.util.Map; import java.util.function.BiConsumer; -import javax.persistence.Subgraph; +import jakarta.persistence.Subgraph; import org.hibernate.graph.AttributeNode; import org.hibernate.graph.SubGraph; diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java index c0555a2a1d..60c6ca180d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java +++ b/hibernate-core/src/main/java/org/hibernate/id/EntityIdentifierNature.java @@ -36,7 +36,7 @@ public enum EntityIdentifierNature { * * NOTE : May or may not have a related "lookup identifier class" as indicated by a {@code @IdClass} annotation. * - * @see javax.persistence.IdClass + * @see jakarta.persistence.IdClass */ NON_AGGREGATED_COMPOSITE, @@ -52,7 +52,7 @@ public enum EntityIdentifierNature { * *

    * - * @see javax.persistence.EmbeddedId + * @see jakarta.persistence.EmbeddedId */ AGGREGATED_COMPOSITE } diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java index af035542c7..cfa113856a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java @@ -6,7 +6,7 @@ */ package org.hibernate.id; -import javax.persistence.GeneratedValue; +import jakarta.persistence.GeneratedValue; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java index 69828e51bf..76189427b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java @@ -34,7 +34,7 @@ public final class IdentifierGeneratorHelper { /** * Marker object returned from {@link IdentifierGenerator#generate} to indicate that we should short-circuit any * continued generated id checking. Currently this is only used in the case of the - * {@link org.hibernate.id.ForeignGenerator foreign} generator as a way to signal that we should use the associated + * {@link ForeignGenerator foreign} generator as a way to signal that we should use the associated * entity's id value. */ public static final Serializable SHORT_CIRCUIT_INDICATOR = new Serializable() { diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java index 5b176290b1..74501d8cc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/PooledOptimizer.java @@ -21,7 +21,7 @@ import org.jboss.logging.Logger; * range in the database. *

    * Note that this optimizer works essentially the same as the - * {@link org.hibernate.id.enhanced.HiLoOptimizer} except that here the bucket ranges are actually + * {@link HiLoOptimizer} except that here the bucket ranges are actually * encoded into the database structures. *

    * Note if you prefer that the database value be interpreted as the bottom end of our current range, diff --git a/hibernate-core/src/main/java/org/hibernate/id/package.html b/hibernate-core/src/main/java/org/hibernate/id/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java index 32f6b2d5e3..4ec0211e39 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java @@ -13,11 +13,11 @@ import java.sql.SQLException; import java.util.List; import java.util.TimeZone; import java.util.UUID; -import javax.persistence.FlushModeType; -import javax.persistence.TransactionRequiredException; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.TransactionRequiredException; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; import org.hibernate.CacheMode; import org.hibernate.EmptyInterceptor; @@ -565,7 +565,7 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont } @Override - public T execute(final LobCreationContext.Callback callback) { + public T execute(final Callback callback) { return getJdbcCoordinator().coordinateWork( (workExecutor, connection) -> { try { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index 8f4a844444..c2592f6963 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -19,8 +19,8 @@ import java.util.ServiceConfigurationError; import java.util.Set; import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java index 085299a517..c75c66f78c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java @@ -114,7 +114,7 @@ public interface EntityManagerMessageLogger extends CoreMessageLogger { @LogMessage(level = WARN) @Message( id = 15016, - value = "Encountered a deprecated javax.persistence.spi.PersistenceProvider [%s]; [%s] will be used instead." + value = "Encountered a deprecated jakarta.persistence.spi.PersistenceProvider [%s]; [%s] will be used instead." ) void deprecatedPersistenceProvider(String deprecated, String replacement); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java index 33c499e1a6..ff0172ac5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionConverterImpl.java @@ -8,16 +8,16 @@ package org.hibernate.internal; import java.io.Serializable; import java.sql.SQLException; -import javax.persistence.EntityExistsException; -import javax.persistence.EntityNotFoundException; -import javax.persistence.LockTimeoutException; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; -import javax.persistence.PessimisticLockException; -import javax.persistence.QueryTimeoutException; -import javax.persistence.RollbackException; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.LockTimeoutException; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PessimisticLockException; +import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.RollbackException; import org.hibernate.HibernateException; import org.hibernate.JDBCException; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java index bbd4ddb951..8138e3609b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.internal; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.TransactionException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java index 2165401b68..2dcfeeb7b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java @@ -10,9 +10,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java index b4b27dc507..a75eb8396e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -23,13 +23,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import javax.naming.Reference; import javax.naming.StringRefAddr; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceContextType; -import javax.persistence.PersistenceException; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.Query; -import javax.persistence.SynchronizationType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceContextType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.Query; +import jakarta.persistence.SynchronizationType; import org.hibernate.ConnectionAcquisitionMode; import org.hibernate.ConnectionReleaseMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java index 45860bd477..0488422619 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java @@ -190,7 +190,7 @@ public class SessionFactoryRegistry { } /** - * Implementation of {@literal JNDI} {@link javax.naming.event.NamespaceChangeListener} contract to listener for context events + * Implementation of {@literal JNDI} {@link NamespaceChangeListener} contract to listener for context events * and react accordingly if necessary */ private final NamespaceChangeListener listener = new NamespaceChangeListener() { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java index 93f28e3e98..ebfddf180c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java @@ -22,16 +22,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceException; -import javax.persistence.StoredProcedureQuery; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.StoredProcedureQuery; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.CacheMode; import org.hibernate.Filter; @@ -153,8 +153,8 @@ import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_STORE_MODE; * Concrete implementation of a Session. *

    * Exposes two interfaces:

      - *
    • {@link org.hibernate.Session} to the application
      • - *
    • {@link org.hibernate.engine.spi.SessionImplementor} to other Hibernate components (SPI)
      • + *
    • {@link Session} to the application
      • + *
    • {@link SessionImplementor} to other Hibernate components (SPI)
      • *
    *

    * This class is not thread-safe. @@ -1055,7 +1055,7 @@ public class SessionImpl } try { - final LoadEventListener.LoadType type; + final LoadType type; if ( nullable ) { type = LoadEventListener.INTERNAL_LOAD_NULLABLE; } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java old mode 100755 new mode 100644 index 29542ff0d8..d57a0a6a15 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -9,7 +9,7 @@ package org.hibernate.internal; import java.io.Serializable; import java.sql.Connection; import java.util.Set; -import javax.transaction.SystemException; +import jakarta.transaction.SystemException; import org.hibernate.CacheMode; import org.hibernate.EntityMode; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java index 06e35b1c95..a68da5e809 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java @@ -230,7 +230,7 @@ public interface DeprecationLogger extends BasicLogger { @LogMessage(level = WARN) @Message( id = 90000022, - value = "Hibernate's legacy org.hibernate.Criteria API is deprecated; use the JPA javax.persistence.criteria.CriteriaQuery instead" + value = "Hibernate's legacy org.hibernate.Criteria API is deprecated; use the JPA jakarta.persistence.criteria.CriteriaQuery instead" ) void deprecatedLegacyCriteria(); diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java index e05d34fdf9..944aaa6833 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/UrlMessageBundle.java @@ -19,7 +19,7 @@ import org.jboss.logging.annotations.ValidIdRange; import static org.jboss.logging.Logger.Level.WARN; /** - * Acts as the {@link org.jboss.logging.annotations.MessageLogger} and + * Acts as the {@link MessageLogger} and * {@link org.jboss.logging.annotations.MessageBundle} for messages related to * processing URLs. * @@ -37,9 +37,9 @@ public interface UrlMessageBundle { boolean TRACE_ENABLED = URL_LOGGER.isTraceEnabled(); /** - * Logs a warning about a malformed URL, caused by a {@link java.net.URISyntaxException} + * Logs a warning about a malformed URL, caused by a {@link URISyntaxException} * - * @param jarUrl The URL that lead to the {@link java.net.URISyntaxException} + * @param jarUrl The URL that lead to the {@link URISyntaxException} * @param e The underlying URISyntaxException */ @LogMessage( level = WARN ) diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java b/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java index 329e3a17e8..4d6e30f043 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java @@ -83,8 +83,8 @@ public final class ConfigHelper { /** * Open an InputStream to the URL represented by the incoming path. First makes a call - * to {@link #locateConfig(java.lang.String)} in order to find an appropriate URL. - * {@link java.net.URL#openStream()} is then called to obtain the stream. + * to {@link #locateConfig(String)} in order to find an appropriate URL. + * {@link URL#openStream()} is then called to obtain the stream. * * @param path The path representing the config location. * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java index 32de511ab8..1c9be2d6f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java @@ -6,14 +6,14 @@ */ package org.hibernate.internal.util; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.AssertionFailure; import org.hibernate.LockMode; /** - * Helper to deal with conversions (both directions) between {@link org.hibernate.LockMode} and - * {@link javax.persistence.LockModeType}. + * Helper to deal with conversions (both directions) between {@link LockMode} and + * {@link jakarta.persistence.LockModeType}. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java index c358266274..7811e7bdd1 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java @@ -16,7 +16,7 @@ import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.util.Locale; import java.util.regex.Pattern; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; @@ -173,7 +173,7 @@ public final class ReflectHelper { * * @throws ClassNotFoundException From {@link Class#forName(String)}. * - * @deprecated Depending on context, either {@link org.hibernate.boot.registry.classloading.spi.ClassLoaderService} + * @deprecated Depending on context, either {@link ClassLoaderService} * or {@link org.hibernate.boot.spi.ClassLoaderAccess} should be preferred */ @Deprecated diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java index a3e4417b4b..60dc5419d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java @@ -272,7 +272,7 @@ public final class SerializationHelper { /** * Deserializes an object from an array of bytes. *

    - * Delegates to {@link #deserialize(java.io.InputStream, ClassLoader)} using a + * Delegates to {@link #deserialize(InputStream, ClassLoader)} using a * {@link ByteArrayInputStream} to wrap the array. * * @param objectData the serialized object, must not be null diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java index f124fef985..ee1a61d1a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ValueHolder.java @@ -8,7 +8,7 @@ package org.hibernate.internal.util; /** * Represents a "final" value that is initialized either {@link #ValueHolder(Object) up front} or once at some point - * {@link #ValueHolder(ValueHolder.DeferredInitializer) after} declaration. + * {@link #ValueHolder(DeferredInitializer) after} declaration. * * Note: If a Serializable class has a {@link ValueHolder} property, that property should be declared transient! * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java index 5d95852b5e..2bd13df5d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java @@ -112,7 +112,7 @@ public final class ArrayHelper { } public static Object[] typecast(Object[] array, Object[] to) { - return java.util.Arrays.asList( array ).toArray( to ); + return Arrays.asList( array ).toArray( to ); } //Arrays.asList doesn't do primitive arrays @@ -330,7 +330,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(Object[], Object[])} instead + * @deprecated Use {@link Arrays#equals(Object[], Object[])} instead */ @Deprecated public static boolean isEquals(Object[] o1, Object[] o2) { @@ -355,7 +355,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(char[], char[])} instead + * @deprecated Use {@link Arrays#equals(char[], char[])} instead */ @Deprecated public static boolean isEquals(char[] o1, char[] o2) { @@ -380,7 +380,7 @@ public final class ArrayHelper { /** * Compare 2 arrays only at the first level * - * @deprecated Use {@link java.util.Arrays#equals(byte[], byte[])} instead + * @deprecated Use {@link Arrays#equals(byte[], byte[])} instead */ @Deprecated public static boolean isEquals(byte[] b1, byte[] b2) { diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java index bd867246a8..ed1b9870ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java @@ -170,7 +170,7 @@ public class BoundedConcurrentHashMap extends AbstractMap final Segment[] segments; transient Set keySet; - transient Set> entrySet; + transient Set> entrySet; transient Collection values; /* ---------------- Small Utilities -------------- */ @@ -2008,7 +2008,7 @@ public class BoundedConcurrentHashMap extends AbstractMap */ @Override public void putAll(Map m) { - for ( Map.Entry e : m.entrySet() ) { + for ( Entry e : m.entrySet() ) { put( e.getKey(), e.getValue() ); } } @@ -2146,8 +2146,8 @@ public class BoundedConcurrentHashMap extends AbstractMap * reflect any modifications subsequent to construction. */ @Override - public Set> entrySet() { - Set> es = entrySet; + public Set> entrySet() { + Set> es = entrySet; return es != null ? es : ( entrySet = new EntrySet() ); } @@ -2271,7 +2271,7 @@ public class BoundedConcurrentHashMap extends AbstractMap * Custom Entry class used by EntryIterator.next(), that relays * setValue changes to the underlying map. */ - final class WriteThroughEntry extends AbstractMap.SimpleEntry { + final class WriteThroughEntry extends SimpleEntry { private static final long serialVersionUID = -7041346694785573824L; @@ -2301,7 +2301,7 @@ public class BoundedConcurrentHashMap extends AbstractMap final class EntryIterator extends HashIterator implements Iterator> { @Override - public Map.Entry next() { + public Entry next() { HashEntry e = super.nextEntry(); return new WriteThroughEntry( e.key, e.value ); } @@ -2366,9 +2366,9 @@ public class BoundedConcurrentHashMap extends AbstractMap } } - final class EntrySet extends AbstractSet> { + final class EntrySet extends AbstractSet> { @Override - public Iterator> iterator() { + public Iterator> iterator() { return new EntryIterator(); } @@ -2377,7 +2377,7 @@ public class BoundedConcurrentHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; V v = BoundedConcurrentHashMap.this.get( e.getKey() ); return v != null && v.equals( e.getValue() ); } @@ -2387,7 +2387,7 @@ public class BoundedConcurrentHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return BoundedConcurrentHashMap.this.remove( e.getKey(), e.getValue() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java index 986152ab0b..94a9cfd00a 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java @@ -235,7 +235,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap boolean identityComparisons; transient Set keySet; - transient Set> entrySet; + transient Set> entrySet; transient Collection values; /* ---------------- Small Utilities -------------- */ @@ -1353,7 +1353,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap */ @Override public void putAll(Map m) { - for ( Map.Entry e : m.entrySet() ) { + for ( Entry e : m.entrySet() ) { put( e.getKey(), e.getValue() ); } } @@ -1512,8 +1512,8 @@ public class ConcurrentReferenceHashMap extends AbstractMap * reflect any modifications subsequent to construction. */ @Override - public Set> entrySet() { - Set> es = entrySet; + public Set> entrySet() { + Set> es = entrySet; return ( es != null ) ? es : ( entrySet = new EntrySet() ); } @@ -1649,7 +1649,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap /* * This class is needed for JDK5 compatibility. */ - static class SimpleEntry implements Entry, java.io.Serializable { + static class SimpleEntry implements Entry, Serializable { private static final long serialVersionUID = -8499721149061103585L; private final K key; @@ -1688,7 +1688,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap return false; } @SuppressWarnings("unchecked") - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return eq( key, e.getKey() ) && eq( value, e.getValue() ); } @@ -1744,7 +1744,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap extends HashIterator implements Iterator> { @Override - public Map.Entry next() { + public Entry next() { HashEntry e = super.nextEntry(); return new WriteThroughEntry( e.key(), e.value() ); } @@ -1809,9 +1809,9 @@ public class ConcurrentReferenceHashMap extends AbstractMap } } - final class EntrySet extends AbstractSet> { + final class EntrySet extends AbstractSet> { @Override - public Iterator> iterator() { + public Iterator> iterator() { return new EntryIterator(); } @@ -1820,7 +1820,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; V v = ConcurrentReferenceHashMap.this.get( e.getKey() ); return v != null && v.equals( e.getValue() ); } @@ -1830,7 +1830,7 @@ public class ConcurrentReferenceHashMap extends AbstractMap if ( !( o instanceof Map.Entry ) ) { return false; } - Map.Entry e = (Map.Entry) o; + Entry e = (Entry) o; return ConcurrentReferenceHashMap.this.remove( e.getKey(), e.getValue() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java index a27d5ab912..8bec05efe0 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java @@ -24,7 +24,7 @@ public final class IdentityMap implements Map { private final LinkedHashMap,V> map; @SuppressWarnings( {"unchecked"}) - private transient Map.Entry,V>[] entryArray = null; + private transient Entry,V>[] entryArray = null; /** * Return a new instance of this class, with iteration @@ -54,7 +54,7 @@ public final class IdentityMap implements Map { * @param map The map of entries * @return Collection */ - public static Map.Entry[] concurrentEntries(Map map) { + public static Entry[] concurrentEntries(Map map) { return ( (IdentityMap) map ).entryArray(); } @@ -152,9 +152,9 @@ public final class IdentityMap implements Map { } @SuppressWarnings( {"unchecked"}) - public Map.Entry[] entryArray() { + public Entry[] entryArray() { if ( entryArray == null ) { - entryArray = new Map.Entry[ map.size() ]; + entryArray = new Entry[ map.size() ]; final Iterator, V>> itr = map.entrySet().iterator(); int i = 0; while ( itr.hasNext() ) { @@ -191,7 +191,7 @@ public final class IdentityMap implements Map { } - private static final class IdentityMapEntry implements java.util.Map.Entry { + private static final class IdentityMapEntry implements Entry { private final K key; private final V value; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/SingletonIterator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/CalendarComparator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java b/hibernate-core/src/main/java/org/hibernate/internal/util/compare/ComparableComparator.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java index 998da7c990..fffe566595 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java @@ -343,7 +343,7 @@ public final class ConfigurationHelper { * The exact behavior here is largely dependant upon what is passed in as * the delimiter. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * * @param propertyName The name of the property for which to retrieve value * @param delim The string defining tokens used as both entry and key/value delimiters. @@ -368,7 +368,7 @@ public final class ConfigurationHelper { * The exact behavior here is largely dependant upon what is passed in as * the delimiter. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * * @param propertyName The name of the property for which to retrieve value * @param delim The string defining tokens used as both entry and key/value delimiters. @@ -390,7 +390,7 @@ public final class ConfigurationHelper { /** * Get a property value as a string array. * - * @see #extractPropertyValue(String, java.util.Properties) + * @see #extractPropertyValue(String, Properties) * @see #toStringArray(String, String) * * @param propertyName The name of the property for which to retrieve value diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java index 59e9f6c28e..10a529c9ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractReturningWork.java @@ -25,7 +25,7 @@ public abstract class AbstractReturningWork implements ReturningWork, Work * @param executor The visitor that executes the work * @param connection The connection on which to perform the work. * - * @return the valued returned by {@link #execute(java.sql.Connection)}. + * @return the valued returned by {@link #execute(Connection)}. * * @throws SQLException Thrown during execution of the underlying JDBC interaction. * @throws org.hibernate.HibernateException Generally indicates a wrapped SQLException. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java index ef65cd1d12..8a835d2579 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/AbstractWork.java @@ -24,7 +24,7 @@ public abstract class AbstractWork implements Work, WorkExecutorVisitable * encapsulated by this work instance using the supplied connection. * * Because {@link Work} does not return a value when executed - * (via {@link Work#execute(java.sql.Connection)}, this method + * (via {@link Work#execute(Connection)}, this method * always returns null. * * @param connection The connection on which to perform the work. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java index 3f5db464b5..f7acef6fc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/WorkExecutor.java @@ -22,7 +22,7 @@ public class WorkExecutor { * using the supplied connection. * * Because {@link Work} does not return a value when executed - * (via {@link Work#execute(java.sql.Connection)}, this method + * (via {@link Work#execute(Connection)}, this method * always returns null. * * @param work The @link ReturningWork} instance encapsulating the discrete work @@ -41,7 +41,7 @@ public class WorkExecutor { /** * Execute the discrete work encapsulated by a {@link ReturningWork} instance * using the supplied connection, returning the result of - * {@link ReturningWork#execute(java.sql.Connection)} + * {@link ReturningWork#execute(Connection)} * * @param work The @link ReturningWork} instance encapsulating the discrete work * @param connection The connection on which to perform the work. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/package.html b/hibernate-core/src/main/java/org/hibernate/jdbc/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java index cb9acc2bad..02d10e30cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/AvailableSettings.java @@ -262,10 +262,10 @@ public interface AvailableSettings { String SESSION_INTERCEPTOR = "hibernate.ejb.interceptor.session_scoped"; /** - * Query hint (aka {@link javax.persistence.Query#setHint}) for applying + * Query hint (aka {@link jakarta.persistence.Query#setHint}) for applying * an alias specific lock mode (aka {@link org.hibernate.Query#setLockMode}). *

    - * Either {@link org.hibernate.LockMode} or {@link javax.persistence.LockModeType} + * Either {@link org.hibernate.LockMode} or {@link jakarta.persistence.LockModeType} * are accepted. Also the String names of either are accepted as well. null * is additionally accepted as meaning {@link org.hibernate.LockMode#NONE}. *

    diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java old mode 100755 new mode 100644 index bf82f7a02d..3712934b6b --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManager.java @@ -6,13 +6,13 @@ */ package org.hibernate.jpa; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.query.QueryProducer; /** - * Additional contract for Hibernate implementations of {@link javax.persistence.EntityManager} providing access to various Hibernate + * Additional contract for Hibernate implementations of {@link jakarta.persistence.EntityManager} providing access to various Hibernate * specific functionality. * * @author Gavin King @@ -22,7 +22,7 @@ import org.hibernate.query.QueryProducer; @Deprecated public interface HibernateEntityManager extends EntityManager, QueryProducer { /** - * Retrieve a reference to the Hibernate {@link org.hibernate.Session} used by this {@link javax.persistence.EntityManager}. + * Retrieve a reference to the Hibernate {@link Session} used by this {@link jakarta.persistence.EntityManager}. * * @return The session */ diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java old mode 100755 new mode 100644 index d1416ce7e2..8d9f135221 --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernateEntityManagerFactory.java @@ -8,16 +8,16 @@ package org.hibernate.jpa; import java.io.Serializable; import java.util.List; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManagerFactory; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.Metamodel; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.spi.SessionFactoryImplementor; /** - * Contract giving access to the underlying {@link org.hibernate.SessionFactory} from an {@link javax.persistence.EntityManagerFactory} + * Contract giving access to the underlying {@link org.hibernate.SessionFactory} from an {@link jakarta.persistence.EntityManagerFactory} * * @author Gavin King * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java old mode 100755 new mode 100644 index 2b6a3f8150..1920448361 --- a/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/HibernatePersistenceProvider.java @@ -9,12 +9,12 @@ package org.hibernate.jpa; import java.util.Collections; import java.util.List; import java.util.Map; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; -import javax.persistence.spi.LoadState; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.ProviderUtil; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.LoadState; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.ProviderUtil; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java index bedd7b4a8e..838956f57d 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java @@ -17,11 +17,11 @@ import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.AttributeConverter; -import javax.persistence.EntityManagerFactory; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.hibernate.SessionFactory; @@ -401,7 +401,7 @@ public class EntityManagerFactoryBuilderImpl implements EntityManagerFactoryBuil } /** - * Builds the {@link BootstrapServiceRegistry} used to eventually build the {@link org.hibernate.boot.registry.StandardServiceRegistryBuilder}; mainly + * Builds the {@link BootstrapServiceRegistry} used to eventually build the {@link StandardServiceRegistryBuilder}; mainly * used here during instantiation to define class-loading behavior. * * @param integrationSettings Any integration settings passed by the EE container or SE application diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java index 5d8f46b2de..28fed3ac96 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/Helper.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.boot.internal; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java index 1937374529..9962e79632 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/ParsedPersistenceXmlDescriptor.java @@ -11,16 +11,16 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; /** * Describes the information gleaned from a {@code } element in a {@code persistence.xml} file * whether parsed directly by Hibernate or passed to us by an EE container as a - * {@link javax.persistence.spi.PersistenceUnitInfo}. + * {@link jakarta.persistence.spi.PersistenceUnitInfo}. * * Easier to consolidate both views into a single contract and extract information through that shared contract. * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java index 8b139aaf67..c8de2fc784 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceUnitInfoDescriptor.java @@ -9,10 +9,10 @@ package org.hibernate.jpa.boot.internal; import java.net.URL; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java index f80feb10e0..9e4a839c04 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/PersistenceXmlParser.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -480,6 +480,10 @@ public class PersistenceXmlParser { } } + /** + * Validate the document using the + * @param document + */ private void validate(Document document) { // todo : add ability to disable validation... diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java index 404ecfc60a..49c3922a9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/Bootstrap.java @@ -8,8 +8,8 @@ package org.hibernate.jpa.boot.spi; import java.net.URL; import java.util.Map; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java index 5c9ad9de57..43a6a152f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/EntityManagerFactoryBuilder.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.boot.spi; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import javax.sql.DataSource; import org.hibernate.boot.model.process.spi.ManagedResources; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java index d82081dd8c..97b79f9eab 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/PersistenceUnitDescriptor.java @@ -9,15 +9,15 @@ package org.hibernate.jpa.boot.spi; import java.net.URL; import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; /** * Abstraction for dealing with either {@code } information whether that comes from - * an EE container in the form of {@link javax.persistence.spi.PersistenceUnitInfo} or in an SE environment + * an EE container in the form of {@link jakarta.persistence.spi.PersistenceUnitInfo} or in an SE environment * where Hibernate has parsed the {@code persistence.xml} file itself. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java index 4cd136809c..4269287f0c 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java @@ -16,7 +16,7 @@ import org.jboss.logging.Logger; /** * Helper for handling checks to see whether Hibernate is the requested - * {@link javax.persistence.spi.PersistenceProvider} + * {@link jakarta.persistence.spi.PersistenceProvider} * * @author Steve Ebersole */ @@ -26,7 +26,7 @@ public final class ProviderChecker { /** * Does the descriptor and/or integration request Hibernate as the - * {@link javax.persistence.spi.PersistenceProvider}? Note that in the case of no requested provider being named + * {@link jakarta.persistence.spi.PersistenceProvider}? Note that in the case of no requested provider being named * we assume we are the provider (the calls got to us somehow...) * * @param persistenceUnit The {@code } descriptor. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java index d7fac04bc1..2d6ab1bb26 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackBuilderLegacyImpl.java @@ -12,12 +12,12 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.ExcludeDefaultListeners; +import jakarta.persistence.ExcludeSuperclassListeners; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PersistenceException; import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.ReflectionManager; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java index dc1fcc3a63..ba255a3846 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackRegistryImpl.java @@ -7,7 +7,7 @@ package org.hibernate.jpa.event.internal; import java.util.HashMap; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.jpa.event.spi.Callback; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java index 0561b8edbc..5eba9ae5b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java @@ -16,7 +16,7 @@ import org.hibernate.service.ServiceRegistry; /** * The intent of this class is to use a lighter implementation * when JPA callbacks are disabled via - * {@link org.hibernate.boot.spi.SessionFactoryOptions#areJPACallbacksEnabled()} + * {@link SessionFactoryOptions#areJPACallbacksEnabled()} */ public final class CallbacksFactory { public static CallbackRegistryImplementor buildCallbackRegistry(SessionFactoryOptions options) { diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java index 99b45cdd8c..40b78a9b04 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackType.java @@ -7,13 +7,13 @@ package org.hibernate.jpa.event.spi; import java.lang.annotation.Annotation; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java index f197c9fddc..793a353084 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/jpa/ExtendedBeanManager.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.event.spi.jpa; -import javax.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.BeanManager; /** * @deprecated Use {@link org.hibernate.resource.beans.container.spi.ExtendedBeanManager} instead diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java index f7b84a3318..36f5cf84f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/ExceptionMapperLegacyJpaImpl.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal; -import javax.persistence.PersistenceException; -import javax.transaction.SystemException; +import jakarta.persistence.PersistenceException; +import jakarta.transaction.SystemException; import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java index bb71b74d4c..da943aab95 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/PersistenceUnitUtilImpl.java @@ -7,8 +7,8 @@ package org.hibernate.jpa.internal; import java.io.Serializable; -import javax.persistence.PersistenceUnitUtil; -import javax.persistence.spi.LoadState; +import jakarta.persistence.PersistenceUnitUtil; +import jakarta.persistence.spi.LoadState; import org.hibernate.Hibernate; import org.hibernate.MappingException; @@ -77,13 +77,13 @@ public class PersistenceUnitUtilImpl implements PersistenceUnitUtil, Serializabl } else { // HHH-11426 - best effort to deal with the case of detached entities - log.debug( "javax.persistence.PersistenceUnitUtil.getIdentifier may not be able to read identifier of a detached entity" ); + log.debug( "jakarta.persistence.PersistenceUnitUtil.getIdentifier may not be able to read identifier of a detached entity" ); return getIdentifierFromPersister( entity ); } } else { log.debug( - "javax.persistence.PersistenceUnitUtil.getIdentifier is only intended to work with enhanced entities " + + "jakarta.persistence.PersistenceUnitUtil.getIdentifier is only intended to work with enhanced entities " + "(although Hibernate also adapts this support to its proxies); " + "however the passed entity was not enhanced (nor a proxy).. may not be able to read identifier" ); diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java index a8d630c55c..c4d752c304 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/CacheModeHelper.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.CacheMode; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java index ea78f317db..3c6e64cd4f 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/ConfigurationHelper.java @@ -9,8 +9,8 @@ package org.hibernate.jpa.internal.util; import java.util.Locale; import java.util.Map; import java.util.Properties; -import javax.persistence.FlushModeType; -import javax.persistence.PersistenceException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.PersistenceException; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; @@ -33,8 +33,8 @@ public abstract class ConfigurationHelper { if ( value instanceof FlushMode ) { flushMode = (FlushMode) value; } - else if ( value instanceof javax.persistence.FlushModeType ) { - flushMode = ConfigurationHelper.getFlushMode( (javax.persistence.FlushModeType) value ); + else if ( value instanceof jakarta.persistence.FlushModeType ) { + flushMode = ConfigurationHelper.getFlushMode( (jakarta.persistence.FlushModeType) value ); } else if ( value instanceof String ) { flushMode = ConfigurationHelper.getFlushMode( (String) value ); diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java index f4b2141468..06f526e58a 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/FlushModeTypeHelper.java @@ -8,7 +8,7 @@ package org.hibernate.jpa.internal.util; import java.util.Locale; -import javax.persistence.FlushModeType; +import jakarta.persistence.FlushModeType; import org.hibernate.AssertionFailure; import org.hibernate.FlushMode; @@ -17,7 +17,7 @@ import org.hibernate.MappingException; import org.jboss.logging.Logger; /** - * Helper to deal with {@link FlushModeType} <-> {@link org.hibernate.FlushMode} conversions. + * Helper to deal with {@link FlushModeType} <-> {@link FlushMode} conversions. * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java index 97b6f11513..4a34b696ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockModeTypeHelper.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.LockModeType; +import jakarta.persistence.LockModeType; import org.hibernate.LockMode; import org.hibernate.internal.util.LockModeConverter; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java index 621258df6d..d6b911f617 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/LockOptionsHelper.java @@ -8,8 +8,8 @@ package org.hibernate.jpa.internal.util; import java.util.Map; import java.util.function.Supplier; -import javax.persistence.PersistenceException; -import javax.persistence.PessimisticLockScope; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PessimisticLockScope; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java index c77cad2c8b..0c26610efc 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java @@ -6,8 +6,8 @@ */ package org.hibernate.jpa.internal.util; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceUnitTransactionType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java index 9c75850c16..25d99c5e47 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUtilHelper.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import javax.persistence.spi.LoadState; +import jakarta.persistence.spi.LoadState; import org.hibernate.HibernateException; import org.hibernate.bytecode.enhance.spi.interceptor.AbstractLazyLoadInterceptor; @@ -32,11 +32,11 @@ import org.hibernate.proxy.LazyInitializer; /** * Central delegate for handling calls from:

      - *
    • {@link javax.persistence.PersistenceUtil#isLoaded(Object)}
      • - *
    • {@link javax.persistence.PersistenceUtil#isLoaded(Object, String)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoaded(Object)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoadedWithReference(Object, String)}
      • - *
    • {@link javax.persistence.spi.ProviderUtil#isLoadedWithoutReference(Object, String)}li> + *
    • {@link jakarta.persistence.PersistenceUtil#isLoaded(Object)}
      • + *
    • {@link jakarta.persistence.PersistenceUtil#isLoaded(Object, String)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoaded(Object)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoadedWithReference(Object, String)}
      • + *
    • {@link jakarta.persistence.spi.ProviderUtil#isLoadedWithoutReference(Object, String)}li> *
    * * @author Emmanuel Bernard @@ -54,7 +54,7 @@ public final class PersistenceUtilHelper { * Return is defined as follows:
      *
    1. * If the reference is a {@link HibernateProxy}, we return {@link LoadState#LOADED} if - * {@link org.hibernate.proxy.LazyInitializer#isUninitialized()} returns {@code false}; else we return + * {@link LazyInitializer#isUninitialized()} returns {@code false}; else we return * {@link LoadState#NOT_LOADED} *
      2. *
    2. @@ -64,7 +64,7 @@ public final class PersistenceUtilHelper { *
      3. *
    3. * If the reference is a {@link PersistentCollection}, we return {@link LoadState#LOADED} if - * {@link org.hibernate.collection.spi.PersistentCollection#wasInitialized()} returns {@code true}; else + * {@link PersistentCollection#wasInitialized()} returns {@code true}; else * we return {@link LoadState#NOT_LOADED} *
      4. *
    4. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java index cd803e7504..42a9cfb128 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/JpaCompliance.java @@ -17,9 +17,9 @@ import org.hibernate.Transaction; public interface JpaCompliance { /** * Controls whether Hibernate's handling of JPA's - * {@link javax.persistence.Query} (JPQL, Criteria and native-query) should + * {@link jakarta.persistence.Query} (JPQL, Criteria and native-query) should * strictly follow the JPA spec. This includes both in terms of parsing or - * translating a query as well as calls to the {@link javax.persistence.Query} + * translating a query as well as calls to the {@link jakarta.persistence.Query} * methods throwing spec defined exceptions where as Hibernate might not. * * Deviations result in an exception if enabled @@ -30,7 +30,7 @@ public interface JpaCompliance { /** * Indicates that Hibernate's {@link Transaction} should behave as - * defined by the spec for JPA's {@link javax.persistence.EntityTransaction} + * defined by the spec for JPA's {@link jakarta.persistence.EntityTransaction} * since it extends the JPA one. * * @return {@code true} indicates to behave in the spec-defined way @@ -53,7 +53,7 @@ public interface JpaCompliance { /** * JPA defines specific exceptions on specific methods when called on - * {@link javax.persistence.EntityManager} and {@link javax.persistence.EntityManagerFactory} + * {@link jakarta.persistence.EntityManager} and {@link jakarta.persistence.EntityManagerFactory} * when those objects have been closed. This setting controls * whether the spec defined behavior or Hibernate's behavior will be used. * @@ -65,7 +65,7 @@ public interface JpaCompliance { boolean isJpaClosedComplianceEnabled(); /** - * JPA spec says that an {@link javax.persistence.EntityNotFoundException} + * JPA spec says that an {@link jakarta.persistence.EntityNotFoundException} * should be thrown when accessing an entity Proxy which does not have an associated * table row in the database. * @@ -91,7 +91,7 @@ public interface JpaCompliance { boolean isJpaCacheComplianceEnabled(); /** - * Should the the scope of {@link javax.persistence.TableGenerator#name()} and {@link javax.persistence.SequenceGenerator#name()} be + * Should the the scope of {@link jakarta.persistence.TableGenerator#name()} and {@link jakarta.persistence.SequenceGenerator#name()} be * considered globally or locally defined? * * @return {@code true} indicates the generator name scope is considered global. @@ -99,7 +99,7 @@ public interface JpaCompliance { boolean isGlobalGeneratorScopeEnabled(); /** - * Should we strictly handle {@link javax.persistence.OrderBy} expressions? + * Should we strictly handle {@link jakarta.persistence.OrderBy} expressions? * * JPA says the order-items can only be attribute references whereas Hibernate supports a wide range of items. With * this enabled, Hibernate will throw a compliance error when a non-attribute-reference is used. @@ -107,8 +107,8 @@ public interface JpaCompliance { boolean isJpaOrderByMappingComplianceEnabled(); /** - * JPA says that the id passed to {@link javax.persistence.EntityManager#getReference} and - * {@link javax.persistence.EntityManager#find} should be the exact expected type, allowing + * JPA says that the id passed to {@link jakarta.persistence.EntityManager#getReference} and + * {@link jakarta.persistence.EntityManager#find} should be the exact expected type, allowing * no type coercion. * * Historically, Hibernate behaved the same way. Since 6.0 however, Hibernate has the ability to diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java index c68fe35d73..d802e8a0c7 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/NativeQueryTupleTransformer.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.persistence.Tuple; -import javax.persistence.TupleElement; +import jakarta.persistence.Tuple; +import jakarta.persistence.TupleElement; import org.hibernate.HibernateException; import org.hibernate.transform.BasicTransformerAdapter; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java index 2f341f21a4..6247314c53 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterBind.java @@ -6,7 +6,7 @@ */ package org.hibernate.jpa.spi; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; /** * Represents the value currently bound to a particular (bindable) parameter. diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java index 66f377ce14..e0c77bbade 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/spi/ParameterRegistration.java @@ -6,14 +6,14 @@ */ package org.hibernate.jpa.spi; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.Query; -import javax.persistence.TemporalType; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.Query; +import jakarta.persistence.TemporalType; /** - * Hibernate specific extension to the JPA {@link javax.persistence.Parameter} contract as known to the - * {@link javax.persistence.Query} and {@link javax.persistence.StoredProcedureQuery} implementations. Used to track + * Hibernate specific extension to the JPA {@link jakarta.persistence.Parameter} contract as known to the + * {@link jakarta.persistence.Query} and {@link jakarta.persistence.StoredProcedureQuery} implementations. Used to track * information known about the parameter. *

      * For parameter information as known to JPA criteria queries, see {@link org.hibernate.query.criteria.internal.expression.ParameterExpressionImpl} diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java index 89ca0d223b..580a7e3ef9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSqlAstCreationState.java @@ -9,8 +9,8 @@ package org.hibernate.loader.ast.internal; import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/package.html b/hibernate-core/src/main/java/org/hibernate/loader/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java index 237caa3908..7ad72ef3c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java +++ b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.io.Reader; /** - * Exposes a {@link java.io.Reader} as an {@link java.io.InputStream}. + * Exposes a {@link Reader} as an {@link java.io.InputStream}. * * @deprecated Should not be used anymore. */ diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java index 172681c513..b0a0d7c7ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java @@ -9,9 +9,9 @@ package org.hibernate.mapping; import java.util.Map; import java.util.Properties; import java.util.function.Function; -import javax.persistence.AttributeConverter; -import javax.persistence.EnumType; -import javax.persistence.TemporalType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EnumType; +import jakarta.persistence.TemporalType; import org.hibernate.MappingException; import org.hibernate.boot.model.TypeDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index 92e2b76932..2fcfdac45e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -73,8 +73,8 @@ public abstract class Collection implements Fetchable, Value, Filterable { private Class collectionPersisterClass; private String typeName; private Properties typeParameters; - private final java.util.List filters = new ArrayList(); - private final java.util.List manyToManyFilters = new ArrayList(); + private final List filters = new ArrayList(); + private final List manyToManyFilters = new ArrayList(); private final java.util.Set synchronizedTables = new HashSet<>(); private String customSQLInsert; @@ -598,7 +598,7 @@ public abstract class Collection implements Fetchable, Value, Filterable { ); } - public java.util.List getFilters() { + public List getFilters() { return filters; } @@ -620,7 +620,7 @@ public abstract class Collection implements Fetchable, Value, Filterable { ); } - public java.util.List getManyToManyFilters() { + public List getManyToManyFilters() { return manyToManyFilters; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java index c79e6bc285..ca13781847 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java @@ -200,7 +200,7 @@ public class Column implements Selectable, Serializable, Cloneable { } public int getSqlTypeCode(Mapping mapping) throws MappingException { - org.hibernate.type.Type type = getValue().getType(); + Type type = getValue().getType(); try { int sqlTypeCode = type.getSqlTypeCodes( mapping )[getTypeIndex()]; if ( getSqlTypeCode() != null && getSqlTypeCode() != sqlTypeCode ) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java index e5ac3af591..51c286a04e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java @@ -54,7 +54,7 @@ public class Component extends SimpleValue implements MetaAttributable { private boolean isKey; private String roleName; - private java.util.Map tuplizerImpls; + private Map tuplizerImpls; // cache the status of the type private volatile Type type; @@ -226,7 +226,7 @@ public class Component extends SimpleValue implements MetaAttributable { } @Override - public java.util.Map getMetaAttributes() { + public Map getMetaAttributes() { return metaAttributes; } @@ -236,7 +236,7 @@ public class Component extends SimpleValue implements MetaAttributable { } @Override - public void setMetaAttributes(java.util.Map metas) { + public void setMetaAttributes(Map metas) { this.metaAttributes = metas; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java index 959e63a49b..bf7216d98c 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java @@ -101,7 +101,7 @@ public class OneToOne extends ToOne { return getConstraintColumns(); } - public java.util.List getConstraintColumns() { + public List getConstraintColumns() { ArrayList list = new ArrayList(); Iterator iter = identifier.getColumnIterator(); while ( iter.hasNext() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java index 8a3bad44b4..e1761b45aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -71,7 +71,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl private java.util.List joins = new ArrayList<>(); private final java.util.List subclassJoins = new ArrayList<>(); private final java.util.List filters = new ArrayList<>(); - protected final java.util.Set synchronizedTables = new HashSet<>(); + protected final Set synchronizedTables = new HashSet<>(); private String loaderName; private Boolean isAbstract; private boolean hasSubselectLoadableCollections; @@ -879,7 +879,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl this.loaderName = loaderName == null ? null : loaderName.intern(); } - public abstract java.util.Set getSynchronizedTables(); + public abstract Set getSynchronizedTables(); public void addSynchronizedTable(String table) { synchronizedTables.add( table ); @@ -1014,7 +1014,7 @@ public abstract class PersistentClass implements AttributeContainer, Serializabl if ( tuplizerImpls == null ) { return null; } - return java.util.Collections.unmodifiableMap( tuplizerImpls ); + return Collections.unmodifiableMap( tuplizerImpls ); } private Boolean hasNaturalId; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index 420f4a3b2f..eeff6dda6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -334,7 +334,7 @@ public class RootClass extends PersistentClass implements TableOwner { } @Override - public java.util.Set getSynchronizedTables() { + public Set getSynchronizedTables() { return synchronizedTables; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java index 9eb65ccff1..b2efa6955d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -16,7 +16,7 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Properties; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.FetchMode; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java index 046dac71c4..10a387ee73 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java @@ -126,7 +126,7 @@ public class Table implements RelationalModel, Serializable, ContributableDataba /** * @deprecated Should use {@link QualifiedObjectNameFormatter#format} on QualifiedObjectNameFormatter - * obtained from {@link org.hibernate.engine.jdbc.env.spi.JdbcEnvironment} + * obtained from {@link JdbcEnvironment} */ @Deprecated public String getQualifiedName(Dialect dialect, String defaultCatalog, String defaultSchema) { @@ -145,7 +145,7 @@ public class Table implements RelationalModel, Serializable, ContributableDataba /** * @deprecated Should use {@link QualifiedObjectNameFormatter#format} on QualifiedObjectNameFormatter - * obtained from {@link org.hibernate.engine.jdbc.env.spi.JdbcEnvironment} + * obtained from {@link JdbcEnvironment} */ @Deprecated public static String qualify(String catalog, String schema, String table) { diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java index 00093f5b52..1563fd63c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java @@ -7,7 +7,7 @@ package org.hibernate.mapping; /** - * Additional, optional contract as part pf the {@link org.hibernate.mapping.PersistentClass} + * Additional, optional contract as part pf the {@link PersistentClass} * hierarchy used to differentiate entity bindings for entities that map to their own table * (root, union-subclass, joined-subclass) versus those that do not (discriminator-subclass). * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java index dba76f6f49..0da7000c94 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java @@ -19,7 +19,7 @@ import org.hibernate.internal.util.StringHelper; * @author Brett Meyer */ public class UniqueKey extends Constraint { - private java.util.Map columnOrderMap = new HashMap<>(); + private Map columnOrderMap = new HashMap<>(); @Override public String sqlConstraintString( diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/package.html b/hibernate-core/src/main/java/org/hibernate/mapping/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java index 0a5aa592ed..0efc1a14ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/AttributeClassification.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel; -import javax.persistence.metamodel.Attribute.PersistentAttributeType; +import jakarta.persistence.metamodel.Attribute.PersistentAttributeType; public enum AttributeClassification { BASIC( PersistentAttributeType.BASIC ), diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java index e065ba3556..c5db0222a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/CollectionClassification.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute; /** * Classifications of the plurality. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java index fb24eabde8..179a6865d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/ValueClassification.java @@ -24,7 +24,7 @@ public enum ValueClassification { */ ANY, /** - * An {@link javax.persistence.Embeddable} value + * An {@link jakarta.persistence.Embeddable} value */ EMBEDDABLE, /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java old mode 100755 new mode 100644 index 470ae85473..369286e673 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeFactory.java @@ -11,10 +11,10 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.util.Iterator; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.AssertionFailure; import org.hibernate.internal.EntityManagerMessageLogger; @@ -216,8 +216,8 @@ public class AttributeFactory { } case ENTITY: { final org.hibernate.type.Type type = typeContext.getHibernateValue().getType(); - if ( type instanceof org.hibernate.type.EntityType ) { - final org.hibernate.type.EntityType entityType = (EntityType) type; + if ( type instanceof EntityType ) { + final EntityType entityType = (EntityType) type; return context.locateEntityType( entityType.getAssociatedEntityName() ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java old mode 100755 new mode 100644 index 27096d43e1..65b837e29e --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/MetadataContext.java @@ -16,10 +16,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; -import javax.persistence.metamodel.Type; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Type; import org.hibernate.AssertionFailure; import org.hibernate.Internal; 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 3f0fa81f2f..966b05e4c3 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 @@ -23,9 +23,9 @@ import org.hibernate.sql.results.graph.FetchableContainer; /** * An embedded (embeddable-valued) model part. * - * @see javax.persistence.Embedded - * @see javax.persistence.EmbeddedId - * @see javax.persistence.Embeddable + * @see jakarta.persistence.Embedded + * @see jakarta.persistence.EmbeddedId + * @see jakarta.persistence.Embeddable * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java index d2530fef5e..7ea0d04d02 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java @@ -25,7 +25,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; * an attribute, an entity identifier, collection elements, etc * * @see DomainResultProducer - * @see javax.persistence.metamodel.Bindable + * @see jakarta.persistence.metamodel.Bindable * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java index 92475f9a33..34f048f4c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectableMappings.java @@ -33,7 +33,7 @@ public interface SelectableMappings { * * The return is the number of selectables we directly contain * - * @see SelectableConsumer#accept(int, org.hibernate.metamodel.mapping.SelectableMapping) + * @see SelectableConsumer#accept(int, SelectableMapping) */ int forEachSelectable(int offset, SelectableConsumer consumer); 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 4dd51cfaac..13516ed6c3 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 @@ -26,7 +26,7 @@ import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResultCreationState; /** - * Support for {@link javax.persistence.EmbeddedId} + * Support for {@link jakarta.persistence.EmbeddedId} * * @author Andrea Boriero */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java index 51c407676a..620a1a184b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java @@ -718,7 +718,7 @@ public class MappingModelCreationHelper { ); collectionMappingType = new CollectionMappingTypeImpl( - jtdRegistry.getDescriptor( java.util.List.class ), + jtdRegistry.getDescriptor( List.class ), StandardListSemantics.INSTANCE ); 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 ee49a41424..50c4e54839 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 @@ -27,7 +27,7 @@ import org.hibernate.type.ComponentType; /** * A "non-aggregated" composite identifier. *

      - * This is an identifier mapped using JPA's {@link javax.persistence.MapsId} feature. + * This is an identifier mapped using JPA's {@link jakarta.persistence.MapsId} feature. * * @author Steve Ebersole * @apiNote Technically a MapsId id does not have to be composite; we still handle that this class however diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java index d37f8cbd8d..1f33aadcfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java @@ -26,7 +26,7 @@ import org.antlr.v4.runtime.misc.ParseCancellationException; * with an order set or map. * * @author Steve Ebersole - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see org.hibernate.annotations.OrderBy */ public class OrderByFragmentTranslator { diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java index 82e8d478b0..558d461114 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java @@ -25,7 +25,7 @@ import org.hibernate.sql.ast.tree.select.SortSpecification; /** * Represents a column-reference used in an order-by fragment * - * @apiNote This is Hibernate-specific feature. For {@link javax.persistence.OrderBy} (JPA) + * @apiNote This is Hibernate-specific feature. For {@link jakarta.persistence.OrderBy} (JPA) * all path references are expected to be domain paths (attributes). * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java index f969630100..0c224f25b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/package-info.java @@ -8,7 +8,7 @@ /** * Support for set and map ordering * - * @see javax.persistence.OrderBy + * @see jakarta.persistence.OrderBy * @see org.hibernate.annotations.OrderBy */ package org.hibernate.metamodel.mapping.ordering; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java index 8478ae790c..e7e9b65d00 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/Converters.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.SessionFactory; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java index a6d54149b4..ef58daf6db 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/JpaAttributeConverterImpl.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert.internal; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.annotations.Immutable; import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java index de7a01f30d..4091e727b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/NamedEnumValueConverter.java @@ -23,7 +23,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; /** * BasicValueConverter handling the conversion of an enum based on - * JPA {@link javax.persistence.EnumType#STRING} strategy (storing the name) + * JPA {@link jakarta.persistence.EnumType#STRING} strategy (storing the name) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java index 4af913d08e..5e2778ca24 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/internal/OrdinalEnumValueConverter.java @@ -23,7 +23,7 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; /** * BasicValueConverter handling the conversion of an enum based on - * JPA {@link javax.persistence.EnumType#ORDINAL} strategy (storing the ordinal) + * JPA {@link jakarta.persistence.EnumType#ORDINAL} strategy (storing the ordinal) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java index 33dd460758..86f1251f2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/BasicValueConverter.java @@ -14,7 +14,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; * * Conversions might be defined by: * - * * a custom JPA {@link javax.persistence.AttributeConverter}, + * * a custom JPA {@link jakarta.persistence.AttributeConverter}, * * implicitly, based on the Java type (e.g., enums) * * etc * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java index d63c5e7ca8..b59c268fc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/JpaAttributeConverter.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.convert.spi; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import org.hibernate.resource.beans.spi.ManagedBean; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java index 2f2cd9401e..5f625e0d70 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractIdentifiableType.java @@ -11,9 +11,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.Bindable; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Bindable; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.model.domain.internal.AttributeContainer; @@ -310,9 +310,9 @@ public abstract class AbstractIdentifiableType @SuppressWarnings({"rawtypes", "unchecked"}) private class InFlightAccessImpl extends AbstractManagedType.InFlightAccessImpl { - private final AbstractManagedType.InFlightAccess managedTypeAccess; + private final InFlightAccess managedTypeAccess; - private InFlightAccessImpl(AttributeContainer.InFlightAccess managedTypeAccess) { + private InFlightAccessImpl(InFlightAccess managedTypeAccess) { this.managedTypeAccess = managedTypeAccess; } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java index 9c6ae86b86..b188977a6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java @@ -18,14 +18,14 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.CollectionAttribute; -import javax.persistence.metamodel.ListAttribute; -import javax.persistence.metamodel.ManagedType; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SetAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.graph.internal.SubGraphImpl; import org.hibernate.graph.spi.SubGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java index 4ff72bf68f..3d3abcd185 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AllowableTemporalParameterType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java index 97ccaecc7a..b7b3bbf49c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/BagPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Collection; -import javax.persistence.metamodel.CollectionAttribute; +import jakarta.persistence.metamodel.CollectionAttribute; /** * Hibernate extension to the JPA {@link CollectionAttribute} descriptor 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 index 7ae8188a2c..0f42e55077 100644 --- 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 @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Objects; -import javax.persistence.metamodel.BasicType; +import jakarta.persistence.metamodel.BasicType; import org.hibernate.HibernateException; import org.hibernate.query.sqm.SqmExpressable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java index 34719000e1..db606bb47c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddableDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EmbeddableType; import org.hibernate.metamodel.spi.ManagedTypeRepresentationStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java index 4a88adebb8..bf983832af 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EmbeddedDomainType.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; /** - * Hibernate extension to the JPA {@link javax.persistence.metamodel.EntityType} contract. + * Hibernate extension to the JPA {@link jakarta.persistence.metamodel.EntityType} contract. * * @deprecated (since 6.0) Use {@link EmbeddableDomainType} instead. Originally intended * to describe the actual usage of an embeddable (the embedded) because it was intended diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java index 7ac9bf8c37..8247b3a709 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/EntityDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java index 5d2a0c3f34..cb1313a6a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/IdentifiableDomainType.java @@ -8,8 +8,8 @@ package org.hibernate.metamodel.model.domain; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java index c60f390971..d4c236f6be 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java @@ -10,9 +10,9 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.Incubating; import org.hibernate.graph.spi.RootGraphImplementor; @@ -22,13 +22,13 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.type.spi.TypeConfiguration; /** - * Hibernate extension to the JPA {@link javax.persistence.metamodel.Metamodel} contract + * Hibernate extension to the JPA {@link jakarta.persistence.metamodel.Metamodel} contract * * @author Steve Ebersole * @see MappingMetamodel */ @Incubating -public interface JpaMetamodel extends javax.persistence.metamodel.Metamodel { +public interface JpaMetamodel extends jakarta.persistence.metamodel.Metamodel { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Context diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java index 4e5cc2c220..b05bf3a349 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ListPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.List; -import javax.persistence.metamodel.ListAttribute; +import jakarta.persistence.metamodel.ListAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java index af15f18ecb..3bbd61b7c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/ManagedDomainType.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.function.Consumer; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.graph.spi.SubGraphImplementor; import org.hibernate.metamodel.RepresentationMode; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java index 46dd4928eb..da8ce362f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MapPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Map; -import javax.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.MapAttribute; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java index 42af6a07d4..ab8244efa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/MappedSuperclassDomainType.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.MappedSuperclassType; +import jakarta.persistence.metamodel.MappedSuperclassType; /** * Extension of the JPA {@link MappedSuperclassType} contract diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java index 0dca52b856..a3c73d4991 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.metamodel.AttributeClassification; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java index 992beb82fa..0bd157516f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/PluralPersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.PluralAttribute; import org.hibernate.metamodel.CollectionClassification; import org.hibernate.query.NotIndexedCollectionException; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java index 216880e03d..e2fd78b345 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SetPersistentAttribute.java @@ -7,7 +7,7 @@ package org.hibernate.metamodel.model.domain; import java.util.Set; -import javax.persistence.metamodel.SetAttribute; +import jakarta.persistence.metamodel.SetAttribute; /** * Hibernate extension to the JPA {@link SetAttribute} descriptor diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java index c9480d2cbd..1b23e35fe7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SimpleDomainType.java @@ -11,5 +11,5 @@ package org.hibernate.metamodel.model.domain; * * @author Steve Ebersole */ -public interface SimpleDomainType extends DomainType, javax.persistence.metamodel.Type { +public interface SimpleDomainType extends DomainType, jakarta.persistence.metamodel.Type { } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java index ce8f719577..b839ce6f07 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/SingularPersistentAttribute.java @@ -6,7 +6,7 @@ */ package org.hibernate.metamodel.model.domain; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.query.sqm.SqmJoinable; import org.hibernate.query.sqm.SqmPathSource; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java index 4ba4e94651..cbc762e2bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AbstractAttribute.java @@ -13,7 +13,7 @@ import java.io.ObjectStreamException; import java.io.Serializable; import java.lang.reflect.Member; import java.lang.reflect.Method; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java index a53f324156..dafb4b6382 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AnyMappingSqmPathSource.java @@ -13,7 +13,7 @@ import org.hibernate.query.sqm.SqmPathSource; import org.hibernate.query.sqm.tree.domain.SqmAnyValuedSimplePath; import org.hibernate.query.sqm.tree.domain.SqmPath; -import static javax.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE; +import static jakarta.persistence.metamodel.Bindable.BindableType.SINGULAR_ATTRIBUTE; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java index cf7953df76..32044dda04 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/AttributeContainer.java @@ -26,7 +26,7 @@ public interface AttributeContainer { /** * Callback used when we have a singular id attribute of some form - either a simple id - * or an aggregated composite id ({@link javax.persistence.EmbeddedId}) + * or an aggregated composite id ({@link jakarta.persistence.EmbeddedId}) */ default void applyIdAttribute(SingularPersistentAttribute idAttribute) { throw new UnsupportedOperationException( 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 index 54bc47f428..e231ae4e6c 100644 --- 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 @@ -20,7 +20,7 @@ import org.hibernate.metamodel.spi.ManagedTypeRepresentationStrategy; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** - * Standard Hibernate implementation of JPA's {@link javax.persistence.metamodel.EmbeddableType} + * Standard Hibernate implementation of JPA's {@link jakarta.persistence.metamodel.EmbeddableType} * contract * * @author Emmanuel Bernard 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 index 75d09bccb2..159112e6b0 100644 --- 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 @@ -8,7 +8,7 @@ package org.hibernate.metamodel.model.domain.internal; import java.io.ObjectStreamException; import java.io.Serializable; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.graph.internal.SubGraphImpl; import org.hibernate.graph.spi.SubGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java index a66dc2b88e..345535d3d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java @@ -17,14 +17,14 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.stream.Stream; -import javax.persistence.EntityGraph; -import javax.persistence.NamedAttributeNode; -import javax.persistence.NamedEntityGraph; -import javax.persistence.NamedSubgraph; -import javax.persistence.metamodel.Attribute; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.NamedAttributeNode; +import jakarta.persistence.NamedEntityGraph; +import jakarta.persistence.NamedSubgraph; +import jakarta.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.SessionFactory; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; @@ -346,7 +346,7 @@ public class JpaMetamodelImpl implements JpaMetamodel, Serializable { } @SuppressWarnings("unchecked") - private void applyNamedEntityGraphs(java.util.Collection namedEntityGraphs) { + private void applyNamedEntityGraphs(Collection namedEntityGraphs) { for ( NamedEntityGraphDefinition definition : namedEntityGraphs ) { log.debugf( "Applying named entity graph [name=%s, entity-name=%s, jpa-entity-name=%s]", diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MapMember.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java old mode 100755 new mode 100644 index 83434d3870..d6a3aba07a --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -17,10 +17,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; -import javax.persistence.EntityGraph; -import javax.persistence.metamodel.EmbeddableType; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.metamodel.EmbeddableType; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.ManagedType; import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; @@ -75,7 +75,7 @@ import org.hibernate.type.spi.TypeConfiguration; import static org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting.determineJpaMetaModelPopulationSetting; /** - * Hibernate implementation of the JPA {@link javax.persistence.metamodel.Metamodel} contract. + * Hibernate implementation of the JPA {@link jakarta.persistence.metamodel.Metamodel} contract. * * Really more of the mapping model then the domain model, though it does have reference to the `JpaMetamodel` * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java index d8a7cd71ed..9aa58fc216 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/PluralAttributeBuilder.java @@ -130,11 +130,11 @@ public class PluralAttributeBuilder { private static SimpleDomainType determineListIndexOrMapKeyType( PluralAttributeMetadata attributeMetadata, MetadataContext metadataContext) { - if ( java.util.Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) { + if ( Map.class.isAssignableFrom( attributeMetadata.getJavaType() ) ) { return determineSimpleType( attributeMetadata.getMapKeyValueContext(), metadataContext ); } - if ( java.util.List.class.isAssignableFrom( attributeMetadata.getJavaType() ) + if ( List.class.isAssignableFrom( attributeMetadata.getJavaType() ) || attributeMetadata.getJavaType().isArray() ) { return metadataContext.getTypeConfiguration().getBasicTypeRegistry().getRegisteredType( Integer.class ); } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java index 94be9f7c21..3266114a5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/package-info.java @@ -8,6 +8,6 @@ /** * Hibernate extensions to and implementations of the JPA metamodel * - * @see javax.persistence.metamodel + * @see jakarta.persistence.metamodel */ package org.hibernate.metamodel.model.domain; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java index b8a1afd351..a20c666271 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/MetamodelImplementor.java @@ -10,7 +10,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.hibernate.EntityNameResolver; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/package.html b/hibernate-core/src/main/java/org/hibernate/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java b/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java index 33ee2a49cc..45aed22049 100644 --- a/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/param/ParameterBinder.java @@ -25,7 +25,7 @@ public interface ParameterBinder { * @param position The position from which to start binding value(s). * * @return The number of sql bind positions "eaten" by this bind operation. - * @throws java.sql.SQLException Indicates problems performing the JDBC bind operation. + * @throws SQLException Indicates problems performing the JDBC bind operation. */ int bind(PreparedStatement statement, QueryParameters qp, SharedSessionContractImplementor session, int position) throws SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java index 7975b5ed8d..d3d9e2352d 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/CollectionPersister.java @@ -66,7 +66,7 @@ import org.hibernate.type.Type; *

    * * @see QueryableCollection - * @see org.hibernate.collection.spi.PersistentCollection + * @see PersistentCollection * @author Gavin King */ public interface CollectionPersister extends CollectionDefinition { diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/package.html b/hibernate-core/src/main/java/org/hibernate/persister/collection/package.html old mode 100755 new mode 100644 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 8c3f26c92b..a0e2362d75 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 @@ -2351,7 +2351,7 @@ public abstract class AbstractEntityPersister } public Type getResolutionType() { - return new DiscriminatorType( (org.hibernate.type.BasicType) getDiscriminatorType(), AbstractEntityPersister.this ); + return new DiscriminatorType( (BasicType) getDiscriminatorType(), AbstractEntityPersister.this ); } }; } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java index baf18f6689..cb91a415f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java @@ -39,10 +39,10 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeDescriptor; * @author Steve Ebersole */ public class DiscriminatorType extends AbstractType implements org.hibernate.type.DiscriminatorType, BasicType, ValueExtractor, ValueBinder { - private final org.hibernate.type.BasicType underlyingType; + private final BasicType underlyingType; private final Loadable persister; - public DiscriminatorType(org.hibernate.type.BasicType underlyingType, Loadable persister) { + public DiscriminatorType(BasicType underlyingType, Loadable persister) { this.underlyingType = (BasicType) underlyingType; this.persister = persister; } diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java index 5d1cc2c588..3d316694bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/EntityPersister.java @@ -64,10 +64,10 @@ import org.hibernate.type.VersionType; * to be handled by the persister * *
  • - * {@link org.hibernate.cache.spi.access.EntityDataAccess} - the second level caching strategy for this entity + * {@link EntityDataAccess} - the second level caching strategy for this entity *
    • *
  • - * {@link org.hibernate.cache.spi.access.NaturalIdDataAccess} - the second level caching strategy for the natural-id + * {@link NaturalIdDataAccess} - the second level caching strategy for the natural-id * defined for this entity, if one *
    • *
  • @@ -107,7 +107,7 @@ public interface EntityPersister * Called only once per {@link org.hibernate.SessionFactory} lifecycle, * after all entity persisters have been instantiated. * - * @throws org.hibernate.MappingException Indicates an issue in the metadata. + * @throws MappingException Indicates an issue in the metadata. */ void postInstantiate() throws MappingException; @@ -300,7 +300,7 @@ public interface EntityPersister * @param propertyName The name of the property for which to retrieve * the type. * @return The type. - * @throws org.hibernate.MappingException Typically indicates an unknown + * @throws MappingException Typically indicates an unknown * property name. */ Type getPropertyType(String propertyName) throws MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/package.html b/hibernate-core/src/main/java/org/hibernate/persister/entity/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/persister/package.html b/hibernate-core/src/main/java/org/hibernate/persister/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/pretty/package.html b/hibernate-core/src/main/java/org/hibernate/pretty/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java index 3bf2141482..fbcc3fa328 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureCall.java @@ -7,8 +7,8 @@ package org.hibernate.procedure; import java.util.List; -import javax.persistence.ParameterMode; -import javax.persistence.StoredProcedureQuery; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.StoredProcedureQuery; import org.hibernate.MappingException; import org.hibernate.SynchronizeableQuery; @@ -100,7 +100,7 @@ public interface ProcedureCall ProcedureParameter registerParameter(int position, Class type, ParameterMode mode); /** - * Chained form of {@link #registerParameter(int, Class, javax.persistence.ParameterMode)} + * Chained form of {@link #registerParameter(int, Class, jakarta.persistence.ParameterMode)} * * @param position The position * @param type The Java type of the parameter @@ -139,7 +139,7 @@ public interface ProcedureCall throws NamedParametersNotSupportedException; /** - * Chained form of {@link #registerParameter(String, Class, javax.persistence.ParameterMode)} + * Chained form of {@link #registerParameter(String, Class, jakarta.persistence.ParameterMode)} * * @param parameterName The parameter name * @param type The Java type of the parameter diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java index 4ceb5f866f..5a39ebda1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/ProcedureOutputs.java @@ -10,7 +10,7 @@ import org.hibernate.query.procedure.ProcedureParameter; import org.hibernate.result.Outputs; /** - * Specialization of the {@link org.hibernate.result.Outputs} contract providing access to the stored procedure's registered + * Specialization of the {@link Outputs} contract providing access to the stored procedure's registered * output parameters. * * @author Steve Ebersole @@ -26,7 +26,7 @@ public interface ProcedureOutputs extends Outputs { * * @return The output value. * - * @see ProcedureCall#registerParameter(String, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(String, Class, jakarta.persistence.ParameterMode) */ T getOutputParameterValue(ProcedureParameter parameter); @@ -40,7 +40,7 @@ public interface ProcedureOutputs extends Outputs { * @throws ParameterStrategyException If the ProcedureCall is defined using positional parameters * @throws NoSuchParameterException If no parameter with that name exists * - * @see ProcedureCall#registerParameter(String, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(String, Class, jakarta.persistence.ParameterMode) */ Object getOutputParameterValue(String name); @@ -54,7 +54,7 @@ public interface ProcedureOutputs extends Outputs { * @throws ParameterStrategyException If the ProcedureCall is defined using named parameters * @throws NoSuchParameterException If no parameter with that position exists * - * @see ProcedureCall#registerParameter(int, Class, javax.persistence.ParameterMode) + * @see ProcedureCall#registerParameter(int, Class, jakarta.persistence.ParameterMode) */ Object getOutputParameterValue(int position); } diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java index 5338d87532..62227663c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java @@ -7,7 +7,7 @@ package org.hibernate.procedure.internal; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableOutputParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java index b72258de35..cedf3f0b10 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/NamedCallableQueryMementoImpl.java @@ -9,7 +9,7 @@ package org.hibernate.procedure.internal; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index 05c9852ac4..2b492cf264 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -15,15 +15,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.PersistenceException; -import javax.persistence.TemporalType; -import javax.persistence.TransactionRequiredException; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TransactionRequiredException; import org.hibernate.HibernateException; import org.hibernate.LockMode; @@ -65,7 +65,7 @@ import org.hibernate.result.spi.ResultContext; import org.hibernate.sql.results.NoMoreOutputsException; /** - * Standard implementation of {@link org.hibernate.procedure.ProcedureCall} + * Standard implementation of {@link ProcedureCall} * * @author Steve Ebersole */ @@ -645,7 +645,7 @@ public class ProcedureCallImpl @Override protected int doExecuteUpdate() { if ( ! getSession().isTransactionInProgress() ) { - throw new TransactionRequiredException( "javax.persistence.Query.executeUpdate requires active transaction" ); + throw new TransactionRequiredException( "jakarta.persistence.Query.executeUpdate requires active transaction" ); } // the expectation is that there is just one Output, of type UpdateCountOutput @@ -835,12 +835,12 @@ public class ProcedureCallImpl @Override public ProcedureCallImplementor setLockMode(LockModeType lockMode) { - throw new IllegalStateException( "javax.persistence.Query.setLockMode not valid on javax.persistence.StoredProcedureQuery" ); + throw new IllegalStateException( "jakarta.persistence.Query.setLockMode not valid on jakarta.persistence.StoredProcedureQuery" ); } @Override public LockModeType getLockMode() { - throw new IllegalStateException( "javax.persistence.Query.getHibernateFlushMode not valid on javax.persistence.StoredProcedureQuery" ); + throw new IllegalStateException( "jakarta.persistence.Query.getHibernateFlushMode not valid on jakarta.persistence.StoredProcedureQuery" ); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java index 60dc47011b..3b3a508b53 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java @@ -9,7 +9,7 @@ package org.hibernate.procedure.internal; import java.sql.CallableStatement; import java.sql.SQLException; import java.util.Objects; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java index 28831c017e..18557fbc49 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterMetadataImpl.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.procedure.spi.NamedCallableQueryMemento; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java index 091e4cdf53..0025a86e61 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java @@ -8,7 +8,7 @@ package org.hibernate.procedure.internal; import java.sql.CallableStatement; import java.util.function.Consumer; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java index 5882773460..7e13844013 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/spi/ProcedureCallImplementor.java @@ -9,10 +9,10 @@ package org.hibernate.procedure.spi; import java.util.Calendar; import java.util.Date; import java.util.List; -import javax.persistence.FlushModeType; -import javax.persistence.Parameter; -import javax.persistence.ParameterMode; -import javax.persistence.TemporalType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.ParameterMode; +import jakarta.persistence.TemporalType; import org.hibernate.procedure.ProcedureCall; import org.hibernate.query.spi.QueryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java index 23077d7b82..7ec1add1ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMixedImpl.java @@ -10,8 +10,8 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; -import javax.persistence.Access; -import javax.persistence.AccessType; +import jakarta.persistence.Access; +import jakarta.persistence.AccessType; import org.hibernate.PropertyNotFoundException; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.access.spi.Getter; diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java index d3f7114e7b..fdf2d2395b 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/LazyInitializer.java @@ -114,7 +114,7 @@ public interface LazyInitializer { * @throws org.hibernate.TransientObjectException if the proxy is detached (getSession() == null) * @throws org.hibernate.SessionException if the proxy is associated with a session that is closed * - * @see org.hibernate.proxy.LazyInitializer#isReadOnlySettingAvailable() + * @see LazyInitializer#isReadOnlySettingAvailable() * @see org.hibernate.Session#isReadOnly(Object entityOrProxy) */ boolean isReadOnly(); diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java index 10dcb51cf4..00a4d3b4d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/proxy/ProxyFactory.java @@ -37,7 +37,7 @@ public interface ProxyFactory { * @param setIdentifierMethod Reference to the identifier setter method; * invocation on this method should not force initialization * @param componentIdType For composite identifier types, a reference to - * the {@link org.hibernate.type.CompositeType type} of the identifier + * the {@link CompositeType type} of the identifier * property; again accessing the id should generally not cause * initialization - but need to bear in mind * mappings. diff --git a/hibernate-core/src/main/java/org/hibernate/proxy/package.html b/hibernate-core/src/main/java/org/hibernate/proxy/package.html old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java index 040c7e9531..2f09cdd7f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java +++ b/hibernate-core/src/main/java/org/hibernate/query/JpaTuple.java @@ -6,7 +6,7 @@ */ package org.hibernate.query; -import javax.persistence.Tuple; +import jakarta.persistence.Tuple; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java index a60826df62..d16d18d23a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java @@ -14,12 +14,12 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.persistence.AttributeConverter; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -70,7 +70,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { * detect the underlying type. *

    * Functions like {@code } in {@code hbm.xml} or - * {@link javax.persistence.ColumnResult} in annotations + * {@link jakarta.persistence.ColumnResult} in annotations * * @param columnAlias The column alias in the result-set to be processed * as a scalar result @@ -83,7 +83,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { * Declare a scalar query result. *

    * Functions like {@code } in {@code hbm.xml} or - * {@link javax.persistence.ColumnResult} in annotations + * {@link jakarta.persistence.ColumnResult} in annotations * * @param columnAlias The column alias in the result-set to be processed * as a scalar result @@ -214,7 +214,7 @@ public interface NativeQuery extends Query, SynchronizeableQuery { RootReturn addRoot(String tableAlias, String entityName); /** - * Add a new root return mapping, returning a {@link org.hibernate.query.NativeQuery.RootReturn} to allow further definition. + * Add a new root return mapping, returning a {@link RootReturn} to allow further definition. * * @param tableAlias The SQL table alias to map to this entity * @param entityType The java type of the entity. diff --git a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java index 6566dd8514..b11710b2d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/query/ParameterMetadata.java @@ -8,7 +8,7 @@ package org.hibernate.query; import java.util.Set; import java.util.function.Consumer; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.AllowableParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/Query.java b/hibernate-core/src/main/java/org/hibernate/query/Query.java index 79e93e4011..dd342e033d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/Query.java +++ b/hibernate-core/src/main/java/org/hibernate/query/Query.java @@ -17,11 +17,11 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Parameter; +import jakarta.persistence.TemporalType; +import jakarta.persistence.TypedQuery; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -155,7 +155,7 @@ public interface Query extends TypedQuery, CommonQueryContract { * *

    * - * You should call {@link java.util.stream.Stream#close()} after processing the stream + * You should call {@link Stream#close()} after processing the stream * so that the underlying resources are deallocated right away. * * @return The results Stream @@ -187,7 +187,7 @@ public interface Query extends TypedQuery, CommonQueryContract { /** * Add a DB query hint to the SQL. These differ from JPA's - * {@link javax.persistence.QueryHint} and {@link #getHints()}, which is + * {@link jakarta.persistence.QueryHint} and {@link #getHints()}, which is * specific to the JPA implementation and ignores DB vendor-specific hints. * Instead, these are intended solely for the vendor-specific hints, such * as Oracle's optimizers. Multiple query hints are supported; the Dialect @@ -409,7 +409,7 @@ public interface Query extends TypedQuery, CommonQueryContract { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // covariant overrides - javax.persistence.Query/TypedQuery + // covariant overrides - jakarta.persistence.Query/TypedQuery @Override Query setMaxResults(int maxResult); diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java index 4ec580a3c6..71664a2dec 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryParameter.java @@ -15,7 +15,7 @@ import org.hibernate.metamodel.model.domain.AllowableParameterType; * @author Steve Ebersole */ @Incubating -public interface QueryParameter extends javax.persistence.Parameter { +public interface QueryParameter extends jakarta.persistence.Parameter { /** * Does this parameter allow multi-valued (collection, array, etc) binding? *

    diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java index a6816b02b7..42fe9f69bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryProducer.java @@ -6,9 +6,9 @@ */ package org.hibernate.query; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; /** * Contract for things that can produce Query instances. Expected implementors include @@ -40,7 +40,7 @@ public interface QueryProducer { * * @return The Query instance for manipulation and execution * - * @see javax.persistence.EntityManager#createQuery(String) + * @see jakarta.persistence.EntityManager#createQuery(String) */ Query createQuery(String queryString); @@ -51,7 +51,7 @@ public interface QueryProducer { * @param resultClass The type of the query result * @return The Query instance for manipulation and execution * - * @see javax.persistence.EntityManager#createQuery(String,Class) + * @see jakarta.persistence.EntityManager#createQuery(String,Class) */ Query createQuery(String queryString, Class resultClass); @@ -67,7 +67,7 @@ public interface QueryProducer { * defined with the given name or if the query string is * found to be invalid * - * @see javax.persistence.EntityManager#createNamedQuery(String) + * @see jakarta.persistence.EntityManager#createNamedQuery(String) */ Query createNamedQuery(String name); @@ -85,7 +85,7 @@ public interface QueryProducer { * found to be invalid or if the query result is found to * not be assignable to the specified type * - * @see javax.persistence.EntityManager#createNamedQuery(String,Class) + * @see jakarta.persistence.EntityManager#createNamedQuery(String,Class) */ Query createNamedQuery(String name, Class resultClass); @@ -96,7 +96,7 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String) + * @see jakarta.persistence.EntityManager#createNativeQuery(String) */ NativeQuery createNativeQuery(String sqlString); @@ -109,7 +109,7 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String,Class) + * @see jakarta.persistence.EntityManager#createNativeQuery(String,Class) */ NativeQuery createNativeQuery(String sqlString, Class resultClass); @@ -122,8 +122,8 @@ public interface QueryProducer { * * @return The NativeQuery instance for manipulation and execution * - * @see javax.persistence.EntityManager#createNativeQuery(String,Class) - * @see javax.persistence.SqlResultSetMapping + * @see jakarta.persistence.EntityManager#createNativeQuery(String,Class) + * @see jakarta.persistence.SqlResultSetMapping */ NativeQuery createNativeQuery(String sqlString, String resultSetMappingName); diff --git a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java index 903989beed..95aca8f881 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java +++ b/hibernate-core/src/main/java/org/hibernate/query/QueryTypeMismatchException.java @@ -9,7 +9,7 @@ package org.hibernate.query; import org.hibernate.HibernateException; /** - * Indicates a problem with requested typed-Query result-type (e.g., JPA's {@link javax.persistence.TypedQuery}) + * Indicates a problem with requested typed-Query result-type (e.g., JPA's {@link jakarta.persistence.TypedQuery}) * * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java b/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java index 8ea31e1b88..bfc5e0869d 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/TemporalUnit.java @@ -28,7 +28,7 @@ import org.hibernate.dialect.Dialect; * second argument (date, time, or timestamp), and * according to capabilities of the database platform. * - * @see org.hibernate.dialect.Dialect#extractPattern(TemporalUnit) + * @see Dialect#extractPattern(TemporalUnit) * * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java index 3af01b773e..6f7ac162dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/query/TupleTransformer.java @@ -17,7 +17,7 @@ import org.hibernate.sql.results.internal.RowTransformerTupleTransformerAdapter; * contract, which is the thing actually used to process the results internally. * * Note that {@link JpaTupleTransformer} is a special sub-type applications may use - * to transform the row into a JPA {@link javax.persistence.Tuple}. JpaTupleTransformer is + * to transform the row into a JPA {@link jakarta.persistence.Tuple}. JpaTupleTransformer is * deprecated as it is much more appropriate (and simpler) to simply specify the Query * return type as Tuple * diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java index 1fa9426a7c..b38449c003 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/HibernateCriteriaBuilder.java @@ -15,20 +15,20 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.Tuple; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Selection; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.Tuple; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java index 772bd5be01..52cc06aee5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCoalesce.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java index 04cf0a01af..50daef4393 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCollectionJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CollectionJoin; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.CollectionJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.Collection} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java index bc095d80f3..43fe87d982 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCompoundSelection.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CompoundSelection; +import jakarta.persistence.criteria.CompoundSelection; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java index 2806634d78..ae63d3ea57 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaBase.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CommonAbstractCriteria; +import jakarta.persistence.criteria.CommonAbstractCriteria; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java index 186210023b..0cb6e1d313 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaDelete.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaDelete; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java index 20ec5168f4..ca36c5d05e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaQuery.java @@ -8,13 +8,13 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.ParameterExpression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Selection; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Selection; +import jakarta.persistence.metamodel.EntityType; import org.hibernate.query.FetchClauseType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java index 66d399d273..54d7e50b56 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaCriteriaUpdate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.CriteriaUpdate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java index 0fc5b373ac..cb608307cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaExpression.java @@ -9,7 +9,7 @@ package org.hibernate.query.criteria; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; /** * API extension to the JPA {@link Expression} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java index fefe8a53e9..13b6a130d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetch.java @@ -7,10 +7,10 @@ package org.hibernate.query.criteria; import java.util.Set; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java index e29f9bd147..438d4d864c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFetchParent.java @@ -7,11 +7,11 @@ package org.hibernate.query.criteria; import java.util.Set; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.FetchParent; -import javax.persistence.criteria.JoinType; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.FetchParent; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java index 6395d5dd38..d2e279d35b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaFrom.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.From; +import jakarta.persistence.criteria.From; /** * API extension to the JPA {@link From} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java index c9e91df792..fd208f7041 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaInPredicate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaBuilder; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java index b4ec93fed4..3e58809eb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaJoin.java @@ -6,10 +6,10 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Fetch; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Fetch; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; import org.hibernate.metamodel.model.domain.PersistentAttribute; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java index 5770e180a7..14d539a0cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaListJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.ListJoin; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.ListJoin; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.List} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java index e938fff8c8..c0afcf2eca 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaMapJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.MapJoin; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Predicate; /** * Specialization of {@link JpaJoin} for {@link java.util.Map} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java index f7bde0a763..ed7fa2af2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaOrder.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Order; +import jakarta.persistence.criteria.Order; import org.hibernate.query.NullPrecedence; import org.hibernate.query.SortOrder; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java index 2c3339b83e..d2a4dd7d60 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaParameterExpression.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.ParameterExpression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java index 3fbc91e7af..3d8d5c5abd 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPath.java @@ -8,11 +8,11 @@ package org.hibernate.query.criteria; import java.util.Collection; import java.util.Map; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Path; -import javax.persistence.metamodel.MapAttribute; -import javax.persistence.metamodel.PluralAttribute; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.metamodel.MapAttribute; +import jakarta.persistence.metamodel.PluralAttribute; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.NavigablePath; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java index e901a3228f..120fe04bd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPathSource.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.metamodel.ManagedType; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java index 9a9738168e..87d4becbad 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaPredicate.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Predicate; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java index 25aae3d96f..70f77c1fa9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryStructure.java @@ -8,15 +8,15 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; import org.hibernate.query.FetchClauseType; /** * Models a {@code SELECT} query. Used as a delegate in - * implementing {@link javax.persistence.criteria.CriteriaQuery} - * and {@link javax.persistence.criteria.Subquery}. + * implementing {@link jakarta.persistence.criteria.CriteriaQuery} + * and {@link jakarta.persistence.criteria.Subquery}. * * @apiNote Internally (HQL and SQM) Hibernate supports ordering and limiting * for both root- and sub- criteria even though JPA only defines support for diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java index cbce71b10d..d7b838946a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaQueryableCriteria.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CommonAbstractCriteria; +import jakarta.persistence.criteria.CommonAbstractCriteria; /** * Common contract for the forms of criteria that are "queryable" - can be diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java index fee437f5f6..549721ba40 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaRoot.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.Root; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.sqm.tree.SqmJoinType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java index a8d28241d2..25f46eb33e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSearchedCase.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java index cf9073b1fa..3bcfacee40 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelectCriteria.java @@ -7,10 +7,10 @@ package org.hibernate.query.criteria; import java.util.List; -import javax.persistence.criteria.AbstractQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.metamodel.EntityType; +import jakarta.persistence.criteria.AbstractQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.metamodel.EntityType; /** * Commonality between a JPA {@link JpaCriteriaQuery} and {@link JpaSubQuery}, diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java index 7eeaaf243d..fbaf95deb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSelection.java @@ -7,7 +7,7 @@ package org.hibernate.query.criteria; import java.util.List; -import javax.persistence.criteria.Selection; +import jakarta.persistence.criteria.Selection; /** * API extension to the JPA {@link Selection} contract diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java index f31b8d85ee..35f015f409 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSetJoin.java @@ -6,9 +6,9 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.SetJoin; /** * Specialization of {@link JpaJoin} for {@link java.util.Set} typed attribute joins diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java index e65802b18f..f997d2b7a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSimpleCase.java @@ -6,8 +6,8 @@ */ package org.hibernate.query.criteria; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.Expression; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java index 208203d061..b24475b594 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaSubQuery.java @@ -8,11 +8,11 @@ package org.hibernate.query.criteria; import java.util.List; import java.util.Set; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.SetJoin; -import javax.persistence.criteria.Subquery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.SetJoin; +import jakarta.persistence.criteria.Subquery; import org.hibernate.query.sqm.tree.domain.SqmSetJoin; import org.hibernate.query.sqm.tree.from.SqmCrossJoin; diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java index ae9a15db30..47d7167a3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java +++ b/hibernate-core/src/main/java/org/hibernate/query/criteria/JpaTupleElement.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.criteria; -import javax.persistence.TupleElement; +import jakarta.persistence.TupleElement; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java index 0caa18ea5b..7c813ed866 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java +++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/FullyQualifiedReflectivePathTerminal.java @@ -12,7 +12,7 @@ import java.math.BigInteger; import java.util.Collection; import java.util.List; import java.util.function.Function; -import javax.persistence.criteria.Expression; +import jakarta.persistence.criteria.Expression; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/NamedHqlQueryMementoImpl.java old mode 100755 new mode 100644 diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java index 81c7551137..1d68b3b9ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/BindingTypeHelper.java @@ -11,7 +11,7 @@ import java.time.OffsetDateTime; import java.time.OffsetTime; import java.time.ZonedDateTime; import java.util.Calendar; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java index 1be7c063cd..d96eb7fe21 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/NamedQueryHelper.java @@ -7,8 +7,8 @@ package org.hibernate.query.internal; import java.util.Map; -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java index f04537e17e..ba5d6c4214 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; -import javax.persistence.Parameter; +import jakarta.persistence.Parameter; import org.hibernate.QueryException; import org.hibernate.internal.util.StringHelper; @@ -209,7 +209,7 @@ public class ParameterMetadataImpl implements ParameterMetadataImplementor { return (QueryParameterImplementor) param; } - throw new IllegalArgumentException( "Could not resolve javax.persistence.Parameter to org.hibernate.query.QueryParameter" ); + throw new IllegalArgumentException( "Could not resolve jakarta.persistence.Parameter to org.hibernate.query.QueryParameter" ); } diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java index cafb8efe1e..cf2d75b3d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryOptionsImpl.java @@ -9,8 +9,8 @@ package org.hibernate.query.internal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; import org.hibernate.FlushMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java index 757a56c40a..c68c3cccd6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java @@ -9,7 +9,7 @@ package org.hibernate.query.internal; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import javax.persistence.TemporalType; +import jakarta.persistence.TemporalType; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java index b562e1ba97..4fe037f7e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoBasicStandard.java @@ -7,7 +7,7 @@ package org.hibernate.query.internal; import java.util.function.Consumer; -import javax.persistence.ColumnResult; +import jakarta.persistence.ColumnResult; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.query.named.ResultMementoBasic; diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java index 70898e97c6..79054a0d42 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java +++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedResultSetMappingMemento.java @@ -18,7 +18,7 @@ import org.hibernate.query.results.ResultSetMapping; * queries. * * These can be defined in a number of ways:

      - *
    • {@link javax.persistence.SqlResultSetMapping}
      • + *
    • {@link jakarta.persistence.SqlResultSetMapping}
      • *
    • JPA Class-based mapping
      • *
    • Hibernate's legacy XML-defined mapping
      • *
    diff --git a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java index be1abb84e8..5b6c7040bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/procedure/ProcedureParameter.java @@ -6,7 +6,7 @@ */ package org.hibernate.query.procedure; -import javax.persistence.ParameterMode; +import jakarta.persistence.ParameterMode; import org.hibernate.Incubating; import org.hibernate.query.QueryParameter; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java index 3817d4eae1..6b72ddae55 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/Builders.java @@ -7,9 +7,9 @@ package org.hibernate.query.results; import java.util.Locale; -import javax.persistence.AttributeConverter; -import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.SingularAttribute; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.metamodel.EntityType; +import jakarta.persistence.metamodel.SingularAttribute; import org.hibernate.LockMode; import org.hibernate.NotYetImplementedFor6Exception; diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java index 4f3241c394..5b6ca9bbcf 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMapping.java @@ -16,12 +16,12 @@ import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer; /** * Acts as the {@link JdbcValuesMappingProducer} for {@link org.hibernate.query.NativeQuery} - * or {@link org.hibernate.procedure.ProcedureCall} / {@link javax.persistence.StoredProcedureQuery} + * or {@link org.hibernate.procedure.ProcedureCall} / {@link jakarta.persistence.StoredProcedureQuery} * instances. * * Can be defined