HSEARCH-3042 Add searchAnalyzer option to the programmatic API

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/types/dsl/impl/ElasticsearchStringIndexFieldTypeOptionsStep.java

@@ -41,6 +41,8 @@ class ElasticsearchStringIndexFieldTypeOptionsStep
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
 	private String analyzerName;
+	// TODO HSEARCH-3042 use this value
+	private String searchAnalyzerName;
 	private String normalizerName;
 	private Projectable projectable = Projectable.DEFAULT;
 	private Searchable searchable = Searchable.DEFAULT;
@@ -60,6 +62,12 @@ public ElasticsearchStringIndexFieldTypeOptionsStep analyzer(String analyzerName
 		return this;
 	}
 
+	@Override
+	public ElasticsearchStringIndexFieldTypeOptionsStep searchAnalyzer(String searchAnalyzerName) {
+		this.searchAnalyzerName = searchAnalyzerName;
+		return this;
+	}
+
 	@Override
 	public ElasticsearchStringIndexFieldTypeOptionsStep normalizer(String normalizerName) {
 		this.normalizerName = normalizerName;

backend/lucene/src/main/java/org/hibernate/search/backend/lucene/types/dsl/impl/LuceneStringIndexFieldTypeOptionsStep.java

@@ -36,6 +36,8 @@ class LuceneStringIndexFieldTypeOptionsStep
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
 	private String analyzerName;
+	// TODO HSEARCH-3042 use this value
+	private String searchAnalyzerName;
 	private Analyzer analyzer;
 	private String normalizerName;
 	private Analyzer normalizer;
@@ -59,6 +61,12 @@ public LuceneStringIndexFieldTypeOptionsStep analyzer(String analyzerName) {
 		return this;
 	}
 
+	@Override
+	public LuceneStringIndexFieldTypeOptionsStep searchAnalyzer(String searchAnalyzerName) {
+		this.searchAnalyzerName = searchAnalyzerName;
+		return this;
+	}
+
 	@Override
 	public LuceneStringIndexFieldTypeOptionsStep normalizer(String normalizerName) {
 		this.normalizerName = normalizerName;

engine/src/main/java/org/hibernate/search/engine/backend/types/dsl/StringIndexFieldTypeOptionsStep.java

@@ -28,6 +28,18 @@ public interface StringIndexFieldTypeOptionsStep<S extends StringIndexFieldTypeO
 	 */
 	S analyzer(String analyzerName);
 
+	/**
+	 * Overrides {@link #analyzer} to use for query parameters at search time.
+	 * <p>
+	 * A search analyzer can only be set if an analyzer was set through {@link #analyzer(String)}.
+	 *
+	 * @param searchAnalyzerName The name of an analyzer to apply to values when querying the index only.
+	 * It overrides the {@link #analyzer(String)} when querying the index.
+	 * See the reference documentation for more information about analyzers and how to define them.
+	 * @return {@code this}, for method chaining.
+	 */
+	S searchAnalyzer(String searchAnalyzerName);
+
 	/**
 	 * Define the type as normalized.
 	 * <p>

mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/definition/annotation/impl/AnnotationProcessorProvider.java

@@ -347,6 +347,10 @@ PropertyMappingFieldOptionsStep<?> initFieldMappingContext(PropertyMappingStep m
 			PropertyMappingFullTextFieldOptionsStep fieldContext = mappingContext.fullTextField( fieldName )
 					.analyzer( annotation.analyzer() );
 
+			if ( !annotation.searchAnalyzer().isEmpty() ) {
+				fieldContext.searchAnalyzer( annotation.searchAnalyzer() );
+			}
+
 			Norms norms = annotation.norms();
 			if ( !Norms.DEFAULT.equals( norms ) ) {
 				fieldContext.norms( norms );

mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/definition/programmatic/PropertyMappingFullTextFieldOptionsStep.java

@@ -24,6 +24,13 @@ public interface PropertyMappingFullTextFieldOptionsStep
 	 */
 	PropertyMappingFullTextFieldOptionsStep analyzer(String analyzerName);
 
+	/**
+	 * @param searchAnalyzerName A reference to the analyzer to use for query parameters at search time.
+	 * @return {@code this}, for method chaining.
+	 * @see FullTextField#searchAnalyzer()
+	 */
+	PropertyMappingFullTextFieldOptionsStep searchAnalyzer(String searchAnalyzerName);
+
 	/**
 	 * @param norms Whether index time scoring information should be stored or not.
 	 * @return {@code this}, for method chaining.

mapper/pojo/src/main/java/org/hibernate/search/mapper/pojo/mapping/definition/programmatic/impl/PropertyMappingFullTextFieldOptionsStepImpl.java

@@ -42,6 +42,12 @@ public PropertyMappingFullTextFieldOptionsStep analyzer(String normalizerName) {
 		return thisAsS();
 	}
 
+	@Override
+	public PropertyMappingFullTextFieldOptionsStep searchAnalyzer(String searchAnalyzerName) {
+		fieldModelContributor.add( (c, b) -> c.searchAnalyzer( searchAnalyzerName ) );
+		return thisAsS();
+	}
+
 	@Override
 	public PropertyMappingFullTextFieldOptionsStep norms(Norms norms) {
 		fieldModelContributor.add( (c, b) -> c.norms( norms ) );

util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/document/model/StubIndexSchemaNode.java

@@ -138,6 +138,11 @@ public Builder analyzerName(String analyzerName) {
 			return this;
 		}
 
+		public Builder searchAnalyzerName(String searchAnalyzerName) {
+			attribute( "searchAnalyzerName", searchAnalyzerName );
+			return this;
+		}
+
 		public Builder normalizerName(String normalizerName) {
 			attribute( "normalizerName", normalizerName );
 			return this;

util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/types/dsl/impl/StubStringIndexFieldTypeOptionsStep.java

@@ -29,6 +29,12 @@ public StubStringIndexFieldTypeOptionsStep analyzer(String analyzerName) {
 		return this;
 	}
 
+	@Override
+	public StubStringIndexFieldTypeOptionsStep searchAnalyzer(String searchAnalyzerName) {
+		modifiers.add( b -> b.searchAnalyzerName( searchAnalyzerName ) );
+		return this;
+	}
+
 	@Override
 	public StubStringIndexFieldTypeOptionsStep normalizer(String normalizerName) {
 		modifiers.add( b -> b.normalizerName( normalizerName ) );