General refactoring

sebersole · Oct 21, 2023 · 3de7cbc · 3de7cbc
1 parent 1c16c8f
commit 3de7cbc
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 29 deletions.
diff --git a/...e-models-orm/src/main/java/org/hibernate/models/orm/internal/GlobalRegistrationsImpl.java b/...e-models-orm/src/main/java/org/hibernate/models/orm/internal/GlobalRegistrationsImpl.java
@@ -35,14 +35,20 @@
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.models.internal.StringHelper;
+import org.hibernate.models.orm.spi.CollectionTypeRegistration;
+import org.hibernate.models.orm.spi.CompositeUserTypeRegistration;
 import org.hibernate.models.orm.spi.ConversionRegistration;
+import org.hibernate.models.orm.spi.EmbeddableInstantiatorRegistration;
 import org.hibernate.models.orm.spi.EntityListenerRegistration;
+import org.hibernate.models.orm.spi.FilterDefRegistration;
+import org.hibernate.models.orm.spi.GenericGeneratorRegistration;
 import org.hibernate.models.orm.spi.GlobalRegistrations;
 import org.hibernate.models.orm.spi.JavaTypeRegistration;
 import org.hibernate.models.orm.spi.JdbcTypeRegistration;
+import org.hibernate.models.orm.spi.SequenceGeneratorRegistration;
+import org.hibernate.models.orm.spi.TableGeneratorRegistration;
 import org.hibernate.models.orm.spi.UserTypeRegistration;
 import org.hibernate.models.source.internal.dynamic.DynamicAnnotationUsage;
-import org.hibernate.models.source.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.source.spi.AnnotationTarget;
 import org.hibernate.models.source.spi.AnnotationUsage;
 import org.hibernate.models.source.spi.ClassDetails;
@@ -68,7 +74,6 @@
  */
 public class GlobalRegistrationsImpl implements GlobalRegistrations {
 	private final ClassDetailsRegistry classDetailsRegistry;
-	private final AnnotationDescriptorRegistry annotationDescriptorRegistry;
 
 	private List<EntityListenerRegistration> entityListenerRegistrations;
 	private List<ConversionRegistration> converterRegistrations;
@@ -78,19 +83,18 @@ public class GlobalRegistrationsImpl implements GlobalRegistrations {
 	private List<CompositeUserTypeRegistration> compositeUserTypeRegistrations;
 	private List<CollectionTypeRegistration> collectionTypeRegistrations;
 	private List<EmbeddableInstantiatorRegistration> embeddableInstantiatorRegistrations;
-	private Map<String,FilterDefRegistration> filterDefRegistrations;
+	private Map<String, FilterDefRegistration> filterDefRegistrations;
 
 	private Map<String,SequenceGeneratorRegistration> sequenceGeneratorRegistrations;
 	private Map<String,TableGeneratorRegistration> tableGeneratorRegistrations;
 	private Map<String,GenericGeneratorRegistration> genericGeneratorRegistrations;
 
 	public GlobalRegistrationsImpl(SourceModelBuildingContext sourceModelBuildingContext) {
-		this( sourceModelBuildingContext.getClassDetailsRegistry(), sourceModelBuildingContext.getAnnotationDescriptorRegistry() );
+		this( sourceModelBuildingContext.getClassDetailsRegistry() );
 	}
 
-	public GlobalRegistrationsImpl(ClassDetailsRegistry classDetailsRegistry, AnnotationDescriptorRegistry annotationDescriptorRegistry) {
+	public GlobalRegistrationsImpl(ClassDetailsRegistry classDetailsRegistry) {
 		this.classDetailsRegistry = classDetailsRegistry;
-		this.annotationDescriptorRegistry = annotationDescriptorRegistry;
 	}
 
 	@Override

diff --git a/.../internal/CollectionTypeRegistration.java → ...s/orm/spi/CollectionTypeRegistration.java b/.../internal/CollectionTypeRegistration.java → ...s/orm/spi/CollectionTypeRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import java.util.Map;
 

diff --git a/...ternal/CompositeUserTypeRegistration.java → ...rm/spi/CompositeUserTypeRegistration.java b/...ternal/CompositeUserTypeRegistration.java → ...rm/spi/CompositeUserTypeRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import org.hibernate.models.source.spi.ClassDetails;
 

diff --git a/...l/EmbeddableInstantiatorRegistration.java → ...i/EmbeddableInstantiatorRegistration.java b/...l/EmbeddableInstantiatorRegistration.java → ...i/EmbeddableInstantiatorRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import org.hibernate.models.source.spi.ClassDetails;
 

diff --git a/...ate-models-orm/src/main/java/org/hibernate/models/orm/spi/EntityListenerRegistration.java b/...ate-models-orm/src/main/java/org/hibernate/models/orm/spi/EntityListenerRegistration.java
@@ -14,6 +14,11 @@
 import org.hibernate.models.source.spi.MethodDetails;
 
 /**
+ * Represents an entity listener defined in XML
+ * ({@code entity-mappings/persistence-unit-metadata/persistence-unit-defaults/entity-listeners}).
+ *
+ * @see jakarta.persistence.EntityListeners
+
  * @author Steve Ebersole
  */
 public class EntityListenerRegistration {

diff --git a/...s/orm/internal/FilterDefRegistration.java → ...models/orm/spi/FilterDefRegistration.java b/...s/orm/internal/FilterDefRegistration.java → ...models/orm/spi/FilterDefRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import java.util.Map;
 

diff --git a/...nternal/GenericGeneratorRegistration.java → ...orm/spi/GenericGeneratorRegistration.java b/...nternal/GenericGeneratorRegistration.java → ...orm/spi/GenericGeneratorRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.models.source.spi.AnnotationUsage;

diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/spi/GlobalRegistrations.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/spi/GlobalRegistrations.java
@@ -9,13 +9,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.models.orm.internal.CollectionTypeRegistration;
-import org.hibernate.models.orm.internal.CompositeUserTypeRegistration;
-import org.hibernate.models.orm.internal.EmbeddableInstantiatorRegistration;
-import org.hibernate.models.orm.internal.FilterDefRegistration;
-import org.hibernate.models.orm.internal.GenericGeneratorRegistration;
-import org.hibernate.models.orm.internal.SequenceGeneratorRegistration;
-import org.hibernate.models.orm.internal.TableGeneratorRegistration;
 
 /**
  * @author Steve Ebersole

diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/spi/ProcessResult.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/spi/ProcessResult.java
@@ -6,15 +6,9 @@
  */
 package org.hibernate.models.orm.spi;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.hibernate.models.orm.internal.CollectionTypeRegistration;
-import org.hibernate.models.orm.internal.CompositeUserTypeRegistration;
-import org.hibernate.models.orm.internal.EmbeddableInstantiatorRegistration;
-import org.hibernate.models.orm.internal.FilterDefRegistration;
-import org.hibernate.models.orm.internal.NamedQueryRegistration;
 import org.hibernate.models.source.spi.ClassDetails;
 
 /**

diff --git a/...ternal/SequenceGeneratorRegistration.java → ...rm/spi/SequenceGeneratorRegistration.java b/...ternal/SequenceGeneratorRegistration.java → ...rm/spi/SequenceGeneratorRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import org.hibernate.models.source.spi.AnnotationUsage;
 

diff --git a/.../internal/TableGeneratorRegistration.java → ...s/orm/spi/TableGeneratorRegistration.java b/.../internal/TableGeneratorRegistration.java → ...s/orm/spi/TableGeneratorRegistration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.orm.internal;
+package org.hibernate.models.orm.spi;
 
 import org.hibernate.models.source.spi.AnnotationUsage;
 

diff --git a/...rnate-models-orm/src/test/java/org/hibernate/models/orm/process/SimpleProcessorTests.java b/...rnate-models-orm/src/test/java/org/hibernate/models/orm/process/SimpleProcessorTests.java
@@ -9,7 +9,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.hibernate.models.orm.internal.FilterDefRegistration;
+import org.hibernate.models.orm.spi.FilterDefRegistration;
 import org.hibernate.models.orm.internal.ManagedResourcesImpl;
 import org.hibernate.models.orm.spi.EntityHierarchy;
 import org.hibernate.models.orm.spi.EntityTypeMetadata;

diff --git a/hibernate-models-orm/src/test/java/org/hibernate/models/orm/xml/XmlProcessingSmokeTests.java b/hibernate-models-orm/src/test/java/org/hibernate/models/orm/xml/XmlProcessingSmokeTests.java
@@ -10,7 +10,7 @@
 import java.util.Map;
 
 import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings;
-import org.hibernate.models.orm.internal.FilterDefRegistration;
+import org.hibernate.models.orm.spi.FilterDefRegistration;
 import org.hibernate.models.orm.internal.GlobalRegistrationsImpl;
 import org.hibernate.models.orm.internal.ProcessResultCollector;
 import org.hibernate.models.orm.xml.internal.XmlDocumentImpl;

diff --git a/todos.adoc b/todos.adoc
@@ -4,4 +4,5 @@
 * Model `AnnotationAttributeValue`?  Dropped that here from earlier iterations - its only real benefit was to help model the idea of implicit (unspecified) values.  But since the quorum is to simply follow JLS, "this is the way".  It simplifies the code quite a bit and imo only makes sense if we want to be able to model that implicitness aspect
 * Support `<extends/>`?  This comes from hbm.xml world, but not seeing its usefulness.
 * Support for dynamic embeddables in XSD
-* Allow mapped-superclass in dynamic models? XSD change
+* Allow mapped-superclass in dynamic models? XSD change
+* Update the mapping.xsd to account for new @GenericGenerator definition