HSEARCH-4096 Always retrieve built-in annotation processors through r…

…eflection And in particular, ignore the bean manager (if any). Signed-off-by: Yoann Rodière <yoann@hibernate.org>
hibernate · Nov 18, 2020 · 6781d71 · 6781d71
1 parent 8c0f7bc
commit 6781d71
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 26 deletions.
diff --git a/.../org/hibernate/search/mapper/pojo/bridge/builtin/annotation/AlternativeDiscriminator.java b/.../org/hibernate/search/mapper/pojo/bridge/builtin/annotation/AlternativeDiscriminator.java
@@ -11,6 +11,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.processor.impl.AlternativeDiscriminatorProcessor;
 import org.hibernate.search.mapper.pojo.bridge.builtin.programmatic.AlternativeBinder;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -25,7 +26,7 @@
 @Incubating
 @Target( { ElementType.FIELD, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = AlternativeDiscriminatorProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = AlternativeDiscriminatorProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface AlternativeDiscriminator {
 
 	/**

diff --git a/...main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/GeoPointBinding.java b/...main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/GeoPointBinding.java
@@ -15,6 +15,7 @@
 
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.processor.impl.GeoPointBindingProcessor;
 import org.hibernate.search.engine.spatial.GeoPoint;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -64,8 +65,8 @@
 @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.TYPE })
 @Documented
 @Repeatable(GeoPointBinding.List.class)
-@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = GeoPointBindingProcessor.class))
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = GeoPointBindingProcessor.class))
+@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = GeoPointBindingProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = GeoPointBindingProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface GeoPointBinding {
 
 	/**

diff --git a/...se/src/main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/Latitude.java b/...se/src/main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/Latitude.java
@@ -12,6 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.processor.impl.LatitudeProcessor;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
@@ -25,7 +26,7 @@
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { ElementType.METHOD, ElementType.FIELD } )
 @Documented
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LatitudeProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LatitudeProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Latitude {
 
 	/**

diff --git a/...e/src/main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/Longitude.java b/...e/src/main/java/org/hibernate/search/mapper/pojo/bridge/builtin/annotation/Longitude.java
@@ -12,6 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.builtin.annotation.processor.impl.LongitudeProcessor;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
@@ -25,7 +26,7 @@
 @Retention( RetentionPolicy.RUNTIME )
 @Target( { ElementType.METHOD, ElementType.FIELD } )
 @Documented
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LongitudeProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LongitudeProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Longitude {
 
 	/**

diff --git a/...rg/hibernate/search/mapper/pojo/mapping/definition/annotation/AssociationInverseSide.java b/...rg/hibernate/search/mapper/pojo/mapping/definition/annotation/AssociationInverseSide.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
@@ -36,7 +37,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(AssociationInverseSide.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = AssociationInverseSideProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = AssociationInverseSideProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface AssociationInverseSide {
 
 	/**

diff --git a/.../main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/DocumentId.java b/.../main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/DocumentId.java
@@ -12,6 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.IdentifierBridgeRef;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -26,7 +27,7 @@
 @Documented
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = DocumentIdProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = DocumentIdProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface DocumentId {
 
 	/**

diff --git a/...in/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/FullTextField.java b/...in/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/FullTextField.java
@@ -18,6 +18,7 @@
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.types.Searchable;
 import org.hibernate.search.engine.backend.types.TermVector;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
@@ -46,7 +47,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(FullTextField.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = FullTextFieldProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = FullTextFieldProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface FullTextField {
 
 	/**

diff --git a/...ain/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/GenericField.java b/...ain/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/GenericField.java
@@ -17,6 +17,7 @@
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.types.Searchable;
 import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
@@ -40,7 +41,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(GenericField.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = GenericFieldProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = GenericFieldProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface GenericField {
 
 	/**

diff --git a/...src/main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/Indexed.java b/...src/main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/Indexed.java
@@ -12,6 +12,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.RoutingBinderRef;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.TypeMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.TypeMappingAnnotationProcessorRef;
@@ -23,7 +24,7 @@
 @Documented
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
-@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = IndexedProcessor.class))
+@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = IndexedProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Indexed {
 
 	/**

diff --git a/.../java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/IndexedEmbedded.java b/.../java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/IndexedEmbedded.java
@@ -14,6 +14,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.engine.backend.types.ObjectStructure;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
@@ -98,7 +99,7 @@
 @Repeatable(IndexedEmbedded.List.class)
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexedEmbeddedProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexedEmbeddedProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface IndexedEmbedded {
 
 	/**

diff --git a/...va/org/hibernate/search/mapper/pojo/mapping/definition/annotation/IndexingDependency.java b/...va/org/hibernate/search/mapper/pojo/mapping/definition/annotation/IndexingDependency.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -52,7 +53,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(IndexingDependency.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexingDependencyProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexingDependencyProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface IndexingDependency {
 
 	/**

diff --git a/...ain/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/KeywordField.java b/...ain/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/KeywordField.java
@@ -18,6 +18,7 @@
 import org.hibernate.search.engine.backend.types.Norms;
 import org.hibernate.search.engine.backend.types.Sortable;
 import org.hibernate.search.engine.backend.types.Projectable;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
@@ -46,7 +47,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(KeywordField.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = KeywordFieldProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = KeywordFieldProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface KeywordField {
 
 	/**

diff --git a/...in/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/MarkerBinding.java b/...in/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/MarkerBinding.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.MarkerBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.MarkerBinder;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -26,7 +27,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(MarkerBinding.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = MarkerBindingProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = MarkerBindingProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface MarkerBinding {
 
 	/**

diff --git a/...java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/NonStandardField.java b/...java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/NonStandardField.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
@@ -31,7 +32,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(NonStandardField.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = NonStandardFieldProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = NonStandardFieldProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface NonStandardField {
 
 	/**

diff --git a/.../java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/PropertyBinding.java b/.../java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/PropertyBinding.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.PropertyBridge;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.PropertyBinder;
@@ -35,7 +36,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(PropertyBinding.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = PropertyBindingProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = PropertyBindingProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface PropertyBinding {
 
 	/**

diff --git a/...ava/org/hibernate/search/mapper/pojo/mapping/definition/annotation/ScaledNumberField.java b/...ava/org/hibernate/search/mapper/pojo/mapping/definition/annotation/ScaledNumberField.java
@@ -17,6 +17,7 @@
 import org.hibernate.search.engine.backend.types.Searchable;
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.ValueBridgeRef;
 import org.hibernate.search.mapper.pojo.extractor.mapping.annotation.ContainerExtraction;
@@ -38,7 +39,7 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(ScaledNumberField.List.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = ScaledNumberFieldProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = ScaledNumberFieldProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface ScaledNumberField {
 
 	/**

diff --git a/...main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/TypeBinding.java b/...main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/TypeBinding.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.bridge.TypeBridge;
 import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.TypeBinderRef;
 import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.TypeBinder;
@@ -35,7 +36,7 @@
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(TypeBinding.List.class)
-@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = TypeBindingProcessor.class))
+@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = TypeBindingProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface TypeBinding {
 
 	/**

diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/DocumentId.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/DocumentId.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.annotations.impl.DocumentIdAnnotationProcessor;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
 
@@ -29,6 +30,6 @@
 @Target({ ElementType.METHOD, ElementType.FIELD })
 @Documented
 @Deprecated
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = DocumentIdAnnotationProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = DocumentIdAnnotationProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface DocumentId {
 }
diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Field.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Field.java
@@ -19,6 +19,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.annotations.impl.FieldAnnotationProcessor;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField;
@@ -42,7 +43,7 @@
 @Documented
 @Deprecated
 @Repeatable(Fields.class)
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = FieldAnnotationProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = FieldAnnotationProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Field {
 
 	/**

diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Indexed.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Indexed.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.annotations.impl.IndexedAnnotationProcessor;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.TypeMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.TypeMappingAnnotationProcessorRef;
 
@@ -24,7 +25,7 @@
 @Target( ElementType.TYPE )
 @Documented
 @Deprecated
-@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = IndexedAnnotationProcessor.class))
+@TypeMapping(processor = @TypeMappingAnnotationProcessorRef(type = IndexedAnnotationProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Indexed {
 	/**
 	 * @return The filename of the index. Default to empty string

diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/IndexedEmbedded.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.annotations.impl.IndexedEmbeddedAnnotationProcessor;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
 
@@ -27,7 +28,7 @@
 @Target({ ElementType.FIELD, ElementType.METHOD })
 @Documented
 @Deprecated
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexedEmbeddedAnnotationProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = IndexedEmbeddedAnnotationProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface IndexedEmbedded {
 
 	/**

diff --git a/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Latitude.java b/v5migrationhelper/engine/src/main/java/org/hibernate/search/annotations/Latitude.java
@@ -13,6 +13,7 @@
 import java.lang.annotation.Target;
 
 import org.hibernate.search.annotations.impl.LatitudeAnnotationProcessor;
+import org.hibernate.search.engine.environment.bean.BeanRetrieval;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMapping;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.processing.PropertyMappingAnnotationProcessorRef;
 
@@ -29,7 +30,7 @@
 @Target( { ElementType.FIELD, ElementType.METHOD } )
 @Documented
 @Deprecated
-@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LatitudeAnnotationProcessor.class))
+@PropertyMapping(processor = @PropertyMappingAnnotationProcessorRef(type = LatitudeAnnotationProcessor.class, retrieval = BeanRetrieval.CONSTRUCTOR))
 public @interface Latitude {
 	/**
 	 * @return the name of the spatial field (defined in @Spatial.name)