HHH-15216 Revert moving classes out of the internal package

hibernate · Sep 5, 2022 · 89f04d2 · 89f04d2
1 parent 4d4aaf3
commit 89f04d2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 18 deletions.
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
@@ -31,7 +31,7 @@
 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/...bernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java b/...bernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java
@@ -29,7 +29,7 @@
 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/...ion/JPAXMLOverriddenAnnotationReader.java → ...nal/JPAXMLOverriddenAnnotationReader.java b/...ion/JPAXMLOverriddenAnnotationReader.java → ...nal/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.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.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 @@
  */
 // 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/...ion/JPAXMLOverriddenMetadataProvider.java → ...nal/JPAXMLOverriddenMetadataProvider.java b/...ion/JPAXMLOverriddenMetadataProvider.java → ...nal/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.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 @@
  *
  * @author Emmanuel Bernard
  */
-@Internal
 @SuppressWarnings("unchecked")
 public class JPAXMLOverriddenMetadataProvider implements MetadataProvider {
 

diff --git a/...va/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java b/...va/org/hibernate/cfg/annotations/reflection/internal/PropertyMappingElementCollector.java
@@ -34,7 +34,6 @@
 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/...fg/annotations/reflection/XMLContext.java → ...tions/reflection/internal/XMLContext.java b/...fg/annotations/reflection/XMLContext.java → ...tions/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.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.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 @@
  * @author Emmanuel Bernard
  * @author Brett Meyer
  */
-@Internal
 public class XMLContext implements Serializable {
 	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( XMLContext.class );
 

diff --git a/...a/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java b/...a/org/hibernate/orm/test/annotations/reflection/JPAXMLOverriddenAnnotationReaderTest.java
@@ -12,8 +12,8 @@
 
 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/...nate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/XMLContextTest.java b/...nate-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/...rnate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/...rnate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
@@ -11,8 +11,8 @@
 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;