HHH-19036 Process all filters before going through classes

Author: marko-bekhta

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java

@@ -371,6 +371,12 @@ private static void bindNamedStoredProcedureQuery(
 		}
 	}
 
+	public static void preBindClass(
+			XClass annotatedClass,
+			MetadataBuildingContext context) throws MappingException {
+		bindFilterDefs( annotatedClass, context );
+	}
+
 	/**
 	 * Bind an annotated class. A subclass must be bound <em>after</em> its superclass.
 	 *
@@ -388,7 +394,6 @@ public static void bindClass(
 
 		bindQueries( annotatedClass, context );
 		handleImport( annotatedClass, context );
-		bindFilterDefs( annotatedClass, context );
 		bindTypeDescriptorRegistrations( annotatedClass, context );
 		bindEmbeddableInstantiatorRegistrations( annotatedClass, context );
 		bindUserTypeRegistrations( annotatedClass, context );

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java

@@ -7,10 +7,12 @@
 package org.hibernate.boot.model.source.internal.annotations;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Converter;
@@ -37,6 +39,8 @@
 import org.jboss.jandex.IndexView;
 import org.jboss.logging.Logger;
 
+import static org.hibernate.boot.model.internal.AnnotationBinder.preBindClass;
+
 /**
  * @author Steve Ebersole
  */
@@ -248,6 +252,13 @@ public void processEntityHierarchies(Set<String> processedEntityNames) {
 				orderedClasses,
 				rootMetadataBuildingContext
 		);
+		// we want to go through all classes and collect the filter definitions first,
+		//  so that when we bind the classes we have the complete list of filters to search from:
+		for ( XClass clazz : orderedClasses ) {
+			if ( !processedEntityNames.contains( clazz.getName() ) ) {
+				preBindClass( clazz, rootMetadataBuildingContext );
+			}
+		}
 
 		for ( XClass clazz : orderedClasses ) {
 			if ( processedEntityNames.contains( clazz.getName() ) ) {

hibernate-core/src/test/java/org/hibernate/orm/test/filter/FilterDefinitionOrderTest.java

@@ -0,0 +1,89 @@
+/*
+ * 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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.orm.test.filter;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import org.hibernate.annotations.Filter;
+import org.hibernate.annotations.FilterDef;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.junit.jupiter.api.Test;
+
+@DomainModel(
+        annotatedClasses = {
+                FilterDefinitionOrderTest.AMyEntity.class,
+                FilterDefinitionOrderTest.XEntity.class
+        }
+)
+@JiraKey("HHH-19036")
+public class FilterDefinitionOrderTest extends AbstractStatefulStatelessFilterTest {
+
+    @Test
+    public void smokeTest() {
+        // nothing really to test here,
+        // if the test starts, then everything is great!
+    }
+
+    @Entity
+    @Filter(name = "x_filter")
+    public static class AMyEntity {
+        @Id
+        @GeneratedValue(strategy = GenerationType.SEQUENCE)
+        @Column(nullable = false)
+        private Long id;
+
+        public String field;
+
+        public Long getId() {
+            return id;
+        }
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+    }
+
+    @Entity
+    @FilterDef(name = "x_filter", defaultCondition = "field = 'Hello'")
+    public static class XEntity {
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.SEQUENCE)
+        @Column(nullable = false)
+        private Long id;
+
+        public String field;
+
+        public Long getId() {
+            return id;
+        }
+
+        public void setId(Long id) {
+            this.id = id;
+        }
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+    }
+}