HSEARCH-3042 Support search analyzer in ES backend

hibernate · Sep 26, 2019 · 1054b8d · 1054b8d
1 parent ace7ef0
commit 1054b8d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/.../hibernate/search/backend/elasticsearch/document/model/esnative/impl/PropertyMapping.java b/.../hibernate/search/backend/elasticsearch/document/model/esnative/impl/PropertyMapping.java
@@ -61,6 +61,14 @@ public class PropertyMapping extends AbstractTypeMapping {
 
 	private String analyzer;
 
+	/*
+	 * Text datatype
+	 * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-analyzer.html
+	 */
+
+	@SerializedName("search_analyzer")
+	private String searchAnalyzer;
+
 	/*
 	 * Keyword datatype
 	 * https://www.elastic.co/guide/en/elasticsearch/reference/current/keyword.html
@@ -144,6 +152,14 @@ public void setAnalyzer(String analyzer) {
 		this.analyzer = analyzer;
 	}
 
+	public String getSearchAnalyzer() {
+		return searchAnalyzer;
+	}
+
+	public void setSearchAnalyzer(String searchAnalyzer) {
+		this.searchAnalyzer = searchAnalyzer;
+	}
+
 	public String getNormalizer() {
 		return normalizer;
 	}

diff --git a/...backend/elasticsearch/document/model/esnative/impl/PropertyMappingJsonAdapterFactory.java b/...backend/elasticsearch/document/model/esnative/impl/PropertyMappingJsonAdapterFactory.java
@@ -20,6 +20,7 @@ protected <T> void addFields(Builder<T> builder) {
 		builder.add( "store", Boolean.class );
 		builder.add( "nullValue", JsonPrimitive.class );
 		builder.add( "analyzer", String.class );
+		builder.add( "searchAnalyzer", String.class );
 		builder.add( "normalizer", String.class );
 		builder.add( "format", new ElasticsearchFormatJsonAdapter() );
 		builder.add( "scalingFactor", Double.class );

diff --git a/...rnate/search/backend/elasticsearch/index/admin/impl/ElasticsearchSchemaValidatorImpl.java b/...rnate/search/backend/elasticsearch/index/admin/impl/ElasticsearchSchemaValidatorImpl.java
@@ -585,6 +585,7 @@ private void validateIndexOptions(ValidationErrorCollector errorCollector, Prope
 
 	private void validateAnalyzerOptions(ValidationErrorCollector errorCollector, PropertyMapping expectedMapping, PropertyMapping actualMapping) {
 		validateEqualWithDefault( errorCollector, "analyzer", expectedMapping.getAnalyzer(), actualMapping.getAnalyzer(), "default" );
+		validateEqualWithoutDefault( errorCollector, "search_analyzer", expectedMapping.getSearchAnalyzer(), actualMapping.getSearchAnalyzer() );
 		validateEqualWithoutDefault( errorCollector, "normalizer", expectedMapping.getNormalizer(), actualMapping.getNormalizer() );
 	}
 

diff --git a/...ch/backend/elasticsearch/types/dsl/impl/ElasticsearchStringIndexFieldTypeOptionsStep.java b/...ch/backend/elasticsearch/types/dsl/impl/ElasticsearchStringIndexFieldTypeOptionsStep.java
@@ -41,7 +41,6 @@ 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;
@@ -130,6 +129,7 @@ public IndexFieldType<String> toIndexFieldType() {
 		if ( analyzerName != null ) {
 			mapping.setType( DataTypes.TEXT );
 			mapping.setAnalyzer( analyzerName );
+			mapping.setSearchAnalyzer( searchAnalyzerName );
 			mapping.setTermVector( resolveTermVector() );
 
 			if ( normalizerName != null ) {

diff --git a/...end/elasticsearch/types/predicate/impl/ElasticsearchTextFieldPredicateBuilderFactory.java b/...end/elasticsearch/types/predicate/impl/ElasticsearchTextFieldPredicateBuilderFactory.java
@@ -31,7 +31,8 @@ public ElasticsearchTextFieldPredicateBuilderFactory( boolean searchable,
 			ElasticsearchFieldCodec<String> codec, PropertyMapping mapping) {
 		super( searchable, converter, rawConverter, codec );
 		this.type = mapping.getType();
-		this.analyzer = mapping.getAnalyzer();
+		this.analyzer = ( mapping.getSearchAnalyzer() != null ) ?
+				mapping.getSearchAnalyzer() : mapping.getAnalyzer();
 		this.normalizer = mapping.getNormalizer();
 	}