Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-23 04:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source
This commit is contained in:
Peter-Josef Meisch 2023-12-17 18:19:51 +01:00
parent 96b38652ab
commit 434de11f3d
No known key found for this signature in database
GPG Key ID: DE108246970C7708
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/elasticsearch/core/query/highlight/HighlightCommonParameters.java
View File

@ -141,8 +141,7 @@ public abstract class HighlightCommonParameters {
private int noMatchSize = -1; private int noMatchSize = -1;
private int numberOfFragments = -1; private int numberOfFragments = -1;
/** /**
* Only the search query part of the {@link Query} takes effect, * Only the search query part of the {@link Query} takes effect, others are just ignored.
* others are just ignored.
*/ */
@Nullable private Query highlightQuery = null; @Nullable private Query highlightQuery = null;
private String order = ""; private String order = "";

19
src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java
View File

@ -15,6 +15,14 @@
*/ */
package org.springframework.data.elasticsearch.repository.query; package org.springframework.data.elasticsearch.repository.query;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Stream;
import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.elasticsearch.annotations.Highlight; import org.springframework.data.elasticsearch.annotations.Highlight;
@ -47,14 +55,6 @@ import org.springframework.lang.Nullable;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.stream.Stream;
/** /**
* ElasticsearchQueryMethod * ElasticsearchQueryMethod
* *
@ -370,7 +370,8 @@ public class ElasticsearchQueryMethod extends QueryMethod {
ElasticsearchConverter elasticsearchConverter) { ElasticsearchConverter elasticsearchConverter) {
if (hasAnnotatedHighlight()) { if (hasAnnotatedHighlight()) {
query.setHighlightQuery(getAnnotatedHighlightQuery(new HighlightConverter(parameterAccessor, elasticsearchConverter))); query.setHighlightQuery(
getAnnotatedHighlightQuery(new HighlightConverter(parameterAccessor, elasticsearchConverter)));
} }
var sourceFilter = getSourceFilter(parameterAccessor, elasticsearchConverter); var sourceFilter = getSourceFilter(parameterAccessor, elasticsearchConverter);

8
src/main/java/org/springframework/data/elasticsearch/repository/query/HighlightConverter.java
View File

@ -15,6 +15,9 @@
*/ */
package org.springframework.data.elasticsearch.repository.query; package org.springframework.data.elasticsearch.repository.query;
import java.util.Arrays;
import java.util.List;
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
import org.springframework.data.elasticsearch.core.query.Query; import org.springframework.data.elasticsearch.core.query.Query;
import org.springframework.data.elasticsearch.core.query.StringQuery; import org.springframework.data.elasticsearch.core.query.StringQuery;
@ -24,9 +27,6 @@ import org.springframework.data.elasticsearch.core.query.highlight.HighlightPara
import org.springframework.data.elasticsearch.repository.support.StringQueryUtil; import org.springframework.data.elasticsearch.repository.support.StringQueryUtil;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.util.Arrays;
import java.util.List;
/** /**
* Convert {@link org.springframework.data.elasticsearch.annotations.Highlight} to {@link Highlight}. * Convert {@link org.springframework.data.elasticsearch.annotations.Highlight} to {@link Highlight}.
* *
@ -38,7 +38,7 @@ public class HighlightConverter {
private final ElasticsearchConverter elasticsearchConverter; private final ElasticsearchConverter elasticsearchConverter;
HighlightConverter(ElasticsearchParametersParameterAccessor parameterAccessor, HighlightConverter(ElasticsearchParametersParameterAccessor parameterAccessor,
ElasticsearchConverter elasticsearchConverter) { ElasticsearchConverter elasticsearchConverter) {
this.parameterAccessor = parameterAccessor; this.parameterAccessor = parameterAccessor;
this.elasticsearchConverter = elasticsearchConverter; this.elasticsearchConverter = elasticsearchConverter;
} }

10
src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryIntegrationTests.java
View File

@ -1952,10 +1952,9 @@ public abstract class CustomMethodRepositoryIntegrationTests {
] ]
} }
} }
""" """)
)
@Highlight( @Highlight(
fields = {@HighlightField(name = "type")}, fields = { @HighlightField(name = "type") },
parameters = @HighlightParameters( parameters = @HighlightParameters(
highlightQuery = @Query(""" highlightQuery = @Query("""
{ {
@ -1969,10 +1968,7 @@ public abstract class CustomMethodRepositoryIntegrationTests {
] ]
} }
} }
""" """)))
)
)
)
SearchHits<SampleEntity> queryByStringWithSeparateHighlight(String type, String highlight); SearchHits<SampleEntity> queryByStringWithSeparateHighlight(String type, String highlight);
List<SearchHit<SampleEntity>> queryByMessage(String message); List<SearchHit<SampleEntity>> queryByMessage(String message);