diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java index 8175f12c3f..8c9e05739a 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java @@ -31,7 +31,7 @@ import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.ClassLoaderAccess; import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenMetadataProvider; +import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenMetadataProvider; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.jpa.internal.MutableJpaComplianceImpl; import org.hibernate.jpa.spi.MutableJpaCompliance; 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 8344c19760..58f3388487 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 @@ -29,7 +29,7 @@ import org.hibernate.boot.spi.MetadataBuildingOptions; import org.hibernate.cfg.AnnotationBinder; import org.hibernate.cfg.InheritanceState; import org.hibernate.cfg.annotations.reflection.AttributeConverterDefinitionCollector; -import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenMetadataProvider; +import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenMetadataProvider; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.CollectionHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenAnnotationReader.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java similarity index 99% rename from hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenAnnotationReader.java rename to hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java index a52130aaf3..74456c0a56 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenAnnotationReader.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenAnnotationReader.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.annotations.reflection; +package org.hibernate.cfg.annotations.reflection.internal; import java.beans.Introspector; import java.lang.annotation.Annotation; @@ -23,7 +23,6 @@ import java.util.Set; import java.util.function.Function; import org.hibernate.AnnotationException; -import org.hibernate.Internal; import org.hibernate.annotations.Any; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; @@ -99,7 +98,7 @@ import org.hibernate.boot.jaxb.mapping.ManagedType; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.ClassLoaderAccess; -import org.hibernate.cfg.annotations.reflection.internal.PropertyMappingElementCollector; +import org.hibernate.cfg.annotations.reflection.PersistentAttributeFilter; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; @@ -210,7 +209,6 @@ import static org.hibernate.cfg.annotations.reflection.internal.PropertyMappingE */ // FIXME HHH-14529 Change this class to use JaxbEntityMappings instead of Document. // I'm delaying this change in order to keep the commits simpler and easier to review. -@Internal @SuppressWarnings("unchecked") public class JPAXMLOverriddenAnnotationReader implements AnnotationReader { private static final CoreMessageLogger LOG = CoreLogging.messageLogger( JPAXMLOverriddenAnnotationReader.class ); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenMetadataProvider.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenMetadataProvider.java rename to hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java index c95bf4a9c3..831dfa07a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAXMLOverriddenMetadataProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/JPAXMLOverriddenMetadataProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.annotations.reflection; +package org.hibernate.cfg.annotations.reflection.internal; import java.lang.reflect.AnnotatedElement; import java.util.ArrayList; @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hibernate.Internal; import org.hibernate.annotations.common.reflection.AnnotationReader; import org.hibernate.annotations.common.reflection.MetadataProvider; import org.hibernate.annotations.common.reflection.java.JavaMetadataProvider; @@ -37,7 +36,6 @@ import jakarta.persistence.TableGenerator; * * @author Emmanuel Bernard */ -@Internal @SuppressWarnings("unchecked") public class JPAXMLOverriddenMetadataProvider implements MetadataProvider { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java index 787e1400dd..3dc3f7a613 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java @@ -34,7 +34,6 @@ import org.hibernate.boot.jaxb.mapping.JaxbVersion; import org.hibernate.boot.jaxb.mapping.LifecycleCallback; import org.hibernate.boot.jaxb.mapping.LifecycleCallbackContainer; import org.hibernate.boot.jaxb.mapping.PersistentAttribute; -import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java rename to hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java index 685fa2efc3..a806b7ce79 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/internal/XMLContext.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html. */ -package org.hibernate.cfg.annotations.reflection; +package org.hibernate.cfg.annotations.reflection.internal; import java.io.Serializable; import java.util.ArrayList; @@ -13,7 +13,6 @@ import java.util.List; import java.util.Map; import org.hibernate.AnnotationException; -import org.hibernate.Internal; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.jaxb.mapping.JaxbConverter; import org.hibernate.boot.jaxb.mapping.JaxbEntity; @@ -29,6 +28,7 @@ import org.hibernate.boot.model.convert.spi.ConverterDescriptor; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.BootstrapContext; import org.hibernate.boot.spi.ClassLoaderAccess; +import org.hibernate.cfg.annotations.reflection.AttributeConverterDefinitionCollector; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; @@ -42,7 +42,6 @@ import jakarta.persistence.AttributeConverter; * @author Emmanuel Bernard * @author Brett Meyer */ -@Internal public class XMLContext implements Serializable { private static final CoreMessageLogger LOG = CoreLogging.messageLogger( XMLContext.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java index 6c94f4f2b1..03cf3cf997 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java @@ -12,8 +12,8 @@ import java.lang.reflect.Method; import org.hibernate.annotations.Columns; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader; -import org.hibernate.cfg.annotations.reflection.XMLContext; +import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenAnnotationReader; +import org.hibernate.cfg.annotations.reflection.internal.XMLContext; import org.hibernate.orm.test.internal.util.xml.XMLMappingHelper; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java index 7149100116..1694016863 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java @@ -7,7 +7,7 @@ package org.hibernate.orm.test.annotations.reflection; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.cfg.annotations.reflection.XMLContext; +import org.hibernate.cfg.annotations.reflection.internal.XMLContext; import org.hibernate.orm.test.internal.util.xml.XMLMappingHelper; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java index 1f8d55c2cb..fee1820d4f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java @@ -11,8 +11,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.cfg.annotations.reflection.JPAXMLOverriddenAnnotationReader; -import org.hibernate.cfg.annotations.reflection.XMLContext; +import org.hibernate.cfg.annotations.reflection.internal.JPAXMLOverriddenAnnotationReader; +import org.hibernate.cfg.annotations.reflection.internal.XMLContext; import org.hibernate.orm.test.internal.util.xml.XMLMappingHelper; import org.hibernate.testing.boot.BootstrapContextImpl;