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

Consider Pageable in stream repository method.

Browse Source 
Original Pull Request #2721
Closes #2720
This commit is contained in:
Peter-Josef Meisch 2023-10-06 21:38:30 +02:00 committed by GitHub
parent d905c813c7
commit ccb7d2387f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
View File

@ -337,12 +337,10 @@ class RequestConverter {
Assert.notNull(indexCoordinates, "indexCoordinates must not be null"); Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
Assert.notNull(mapping, "mapping must not be null"); Assert.notNull(mapping, "mapping must not be null");
PutMappingRequest request = new PutMappingRequest.Builder() // return new PutMappingRequest.Builder()
.withJson(new StringReader(mapping.toJson())) // .withJson(new StringReader(mapping.toJson()))
.index(Arrays.asList(indexCoordinates.getIndexNames())) // .index(Arrays.asList(indexCoordinates.getIndexNames()))
.build(); .build();
return request;
} }
public GetMappingRequest indicesGetMappingRequest(IndexCoordinates indexCoordinates) { public GetMappingRequest indicesGetMappingRequest(IndexCoordinates indexCoordinates) {
@ -422,10 +420,7 @@ class RequestConverter {
if (parametersAliases != null) { if (parametersAliases != null) {
for (String aliasName : parametersAliases) { for (String aliasName : parametersAliases) {
builder.aliases(aliasName, aliasBuilder -> { builder.aliases(aliasName, aliasBuilder -> buildAlias(parameters, aliasBuilder));
return buildAlias(parameters, aliasBuilder);
});
} }
} }
}); });
@ -860,11 +855,10 @@ class RequestConverter {
StringBuilder sb = new StringBuilder(remote.getScheme()); StringBuilder sb = new StringBuilder(remote.getScheme());
sb.append("://"); sb.append("://");
sb.append(remote.getHost()); sb.append(remote.getHost());
sb.append(":"); sb.append(':');
sb.append(remote.getPort()); sb.append(remote.getPort());
if (remote.getPathPrefix() != null) { if (remote.getPathPrefix() != null) {
sb.append("");
sb.append(remote.getPathPrefix()); sb.append(remote.getPathPrefix());
} }
@ -884,7 +878,7 @@ class RequestConverter {
} }
SourceFilter sourceFilter = source.getSourceFilter(); SourceFilter sourceFilter = source.getSourceFilter();
if (sourceFilter != null) { if (sourceFilter != null && sourceFilter.getIncludes() != null) {
s.sourceFields(Arrays.asList(sourceFilter.getIncludes())); s.sourceFields(Arrays.asList(sourceFilter.getIncludes()));
} }
return s; return s;
@ -1038,8 +1032,8 @@ class RequestConverter {
int val; int val;
try { try {
val = Integer.parseInt(waitForActiveShards); val = Integer.parseInt(waitForActiveShards);
} catch (NumberFormatException var3) { } catch (NumberFormatException e) {
throw new IllegalArgumentException("cannot parse ActiveShardCount[" + waitForActiveShards + "]", var3); throw new IllegalArgumentException("cannot parse ActiveShardCount[" + waitForActiveShards + ']', e);
} }
uqb.waitForActiveShards(wfa -> wfa.count(val)); uqb.waitForActiveShards(wfa -> wfa.count(val));
} }
@ -1124,7 +1118,6 @@ class RequestConverter {
IndexCoordinates indexCoordinates, boolean forCount, boolean forBatchedSearch, IndexCoordinates indexCoordinates, boolean forCount, boolean forBatchedSearch,
@Nullable Long scrollTimeInMillis) { @Nullable Long scrollTimeInMillis) {
String[] indexNames = indexCoordinates.getIndexNames();
Assert.notNull(query, "query must not be null"); Assert.notNull(query, "query must not be null");
Assert.notNull(indexCoordinates, "indexCoordinates must not be null"); Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
@ -1267,7 +1260,7 @@ class RequestConverter {
if (!isEmpty(query.getIndicesBoost())) { if (!isEmpty(query.getIndicesBoost())) {
bb.indicesBoost(query.getIndicesBoost().stream() bb.indicesBoost(query.getIndicesBoost().stream()
.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost()))) .map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
@ -1434,13 +1427,15 @@ class RequestConverter {
} else if (forBatchedSearch) { } else if (forBatchedSearch) {
// request_cache is not allowed on scroll requests. // request_cache is not allowed on scroll requests.
builder.requestCache(null); builder.requestCache(null);
// limit the number of documents in a batch // limit the number of documents in a batch if not already set in a pageable
if (query.getPageable().isUnpaged()) {
builder.size(query.getReactiveBatchSize()); builder.size(query.getReactiveBatchSize());
} }
}
if (!isEmpty(query.getIndicesBoost())) { if (!isEmpty(query.getIndicesBoost())) {
builder.indicesBoost(query.getIndicesBoost().stream() builder.indicesBoost(query.getIndicesBoost().stream()
.map(indexBoost -> Map.of(indexBoost.getIndexName(), Double.valueOf(indexBoost.getBoost()))) .map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
@ -1468,14 +1463,13 @@ class RequestConverter {
} }
}); });
builder.expandWildcards(indicesOptions.getExpandWildcards().stream().map(wildcardStates -> { builder.expandWildcards(indicesOptions.getExpandWildcards().stream()
return switch (wildcardStates) { .map(wildcardStates -> switch (wildcardStates) {
case OPEN -> ExpandWildcard.Open; case OPEN -> ExpandWildcard.Open;
case CLOSED -> ExpandWildcard.Closed; case CLOSED -> ExpandWildcard.Closed;
case HIDDEN -> ExpandWildcard.Hidden; case HIDDEN -> ExpandWildcard.Hidden;
case ALL -> ExpandWildcard.All; case ALL -> ExpandWildcard.All;
case NONE -> ExpandWildcard.None; case NONE -> ExpandWildcard.None;
};
}).collect(Collectors.toList())); }).collect(Collectors.toList()));
} }
@ -1585,8 +1579,8 @@ class RequestConverter {
@Nullable @Nullable
private NestedSortValue getNestedSort(@Nullable Order.Nested nested, private NestedSortValue getNestedSort(@Nullable Order.Nested nested,
ElasticsearchPersistentEntity<?> persistentEntity) { @Nullable ElasticsearchPersistentEntity<?> persistentEntity) {
return (nested == null) ? null return (nested == null || persistentEntity == null) ? null
: NestedSortValue.of(b -> b // : NestedSortValue.of(b -> b //
.path(elasticsearchConverter.updateFieldNames(nested.getPath(), persistentEntity)) // .path(elasticsearchConverter.updateFieldNames(nested.getPath(), persistentEntity)) //
.maxChildren(nested.getMaxChildren()) // .maxChildren(nested.getMaxChildren()) //
@ -1682,7 +1676,8 @@ class RequestConverter {
if (query instanceof CriteriaQuery) { if (query instanceof CriteriaQuery) {
CriteriaFilterProcessor.createQuery(((CriteriaQuery) query).getCriteria()).ifPresent(builder::postFilter); CriteriaFilterProcessor.createQuery(((CriteriaQuery) query).getCriteria()).ifPresent(builder::postFilter);
} else if (query instanceof StringQuery) { } else //noinspection StatementWithEmptyBody
if (query instanceof StringQuery) {
// no filter for StringQuery // no filter for StringQuery
} else if (query instanceof NativeQuery) { } else if (query instanceof NativeQuery) {
builder.postFilter(((NativeQuery) query).getFilter()); builder.postFilter(((NativeQuery) query).getFilter());
@ -1697,7 +1692,7 @@ class RequestConverter {
Assert.notNull(query, "query must not be null"); Assert.notNull(query, "query must not be null");
Assert.notNull(index, "index must not be null"); Assert.notNull(index, "index must not be null");
co.elastic.clients.elasticsearch._types.query_dsl.MoreLikeThisQuery moreLikeThisQuery = co.elastic.clients.elasticsearch._types.query_dsl.MoreLikeThisQuery return co.elastic.clients.elasticsearch._types.query_dsl.MoreLikeThisQuery
.of(q -> { .of(q -> {
q.like(Like.of(l -> l.document(ld -> ld.index(index.getIndexName()).id(query.getId())))) q.like(Like.of(l -> l.document(ld -> ld.index(index.getIndexName()).id(query.getId()))))
.fields(query.getFields()); .fields(query.getFields());
@ -1736,8 +1731,6 @@ class RequestConverter {
return q; return q;
}); });
return moreLikeThisQuery;
} }
public OpenPointInTimeRequest searchOpenPointInTimeRequest(IndexCoordinates index, Duration keepAlive, public OpenPointInTimeRequest searchOpenPointInTimeRequest(IndexCoordinates index, Duration keepAlive,
@ -1783,7 +1776,7 @@ class RequestConverter {
} }
var expandWildcards = query.getExpandWildcards(); var expandWildcards = query.getExpandWildcards();
if (!expandWildcards.isEmpty()) { if (expandWildcards != null && !expandWildcards.isEmpty()) {
builder.expandWildcards(expandWildcards(expandWildcards)); builder.expandWildcards(expandWildcards(expandWildcards));
} }

2
src/main/java/org/springframework/data/elasticsearch/core/query/Query.java
View File

@ -469,7 +469,7 @@ public interface Query {
/** /**
* @since 5.1 * @since 5.1
*/ */
EnumSet<IndicesOptions.WildcardStates> getExpandWildcards(); @Nullable EnumSet<IndicesOptions.WildcardStates> getExpandWildcards();
/** /**
* @return a possible empty list of docvalue_field values to be set on the query. * @return a possible empty list of docvalue_field values to be set on the query.