Skip to content

Split giant PR on convert layer #11376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sima-zhu wants to merge 1 commit into from
Closed

Split giant PR on convert layer #11376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,14 @@
<!-- Suppress checks for AutoRest generated Search code -->
<!-- Hand-written classes should be specified here to be checked -->
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\]((?!(GeoPointDeserializer|Iso8601DateDeserializer|SerializationUtil)).*)"/>
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\]models[/\\]"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]models[/\\]((?!(CoordinateSystem|GeoPoint|IndexBatch|ValueFacetResult|RangeFacetResult)).*)"/>
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\]converters[/\\]"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\](DataSourcesImpl|DocumentsImpl|IndexersImpl|IndexesImpl|SkillsetsImpl|SynonymMapsImpl|SearchIndexRestClientBuilder|SearchIndexRestClientImpl|SearchServiceRestClientBuilder|SearchServiceRestClientImpl)"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]models[/\\]((?!(CoordinateSystem|GeoPoint|IndexBatch|ValueFacetResult|RangeFacetResult|ComplexField|SearchableField|SimpleField|SearchFieldBase|IndexBatchException|ScoringParameter)).*)"/>
<suppress checks="GoodLoggingCheck" files="com.azure.search.documents.implementation.util.PrivateFieldAccessHelper.java"/>

<!-- Suppress external dependency check for jacksonwrapper overriding deserialize method -->
<suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck"
Expand Down
47 changes: 34 additions & 13 deletions ...ure-search-documents/src/main/java/com/azure/search/documents/SearchIndexAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,18 @@
import com.azure.core.util.serializer.JacksonAdapter;
import com.azure.core.util.serializer.SerializerAdapter;
import com.azure.search.documents.implementation.SearchIndexRestClientImpl;
import com.azure.search.documents.implementation.converters.AutocompleteModeConverter;
import com.azure.search.documents.implementation.converters.IndexBatchBaseConverter;
import com.azure.search.documents.implementation.converters.IndexDocumentsResultConverter;
import com.azure.search.documents.implementation.converters.QueryTypeConverter;
import com.azure.search.documents.implementation.converters.RequestOptionsConverter;
import com.azure.search.documents.implementation.converters.SearchModeConverter;
import com.azure.search.documents.implementation.models.AutocompleteRequest;
import com.azure.search.documents.implementation.models.SearchContinuationToken;
import com.azure.search.documents.implementation.models.SearchRequest;
import com.azure.search.documents.implementation.models.SuggestRequest;
import com.azure.search.documents.implementation.util.DocumentResponseConversions;
import com.azure.search.documents.implementation.util.MappingUtils;
import com.azure.search.documents.implementation.util.SuggestOptionsHandler;
import com.azure.search.documents.implementation.SearchIndexRestClientBuilder;
import com.azure.search.documents.implementation.SerializationUtil;
Expand All @@ -27,6 +34,7 @@
import com.azure.search.documents.models.IndexDocumentsBatch;
import com.azure.search.documents.models.IndexDocumentsResult;
import com.azure.search.documents.models.RequestOptions;
import com.azure.search.documents.models.ScoringParameter;
import com.azure.search.documents.models.SearchOptions;
import com.azure.search.documents.models.SearchResult;
import com.azure.search.documents.models.SuggestOptions;
Expand All @@ -42,6 +50,7 @@

import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;

import static com.azure.core.util.FluxUtil.monoError;
import static com.azure.core.util.FluxUtil.withContext;
Expand Down Expand Up @@ -351,6 +360,7 @@ Mono<Response<Long>> getDocumentCountWithResponse(Context context) {
try {
return restClient.documents()
.countWithRestResponseAsync(context)
.onErrorMap(MappingUtils::exceptionMapper)
.map(Function.identity());
} catch (RuntimeException ex) {
return monoError(logger, ex);
Expand Down Expand Up @@ -410,7 +420,9 @@ private Mono<SearchPagedResponse> search(SearchRequest request, RequestOptions r
SearchRequest requestToUse = (continuationToken == null) ? request
: SearchContinuationToken.deserializeToken(serviceVersion.getVersion(), continuationToken);

return restClient.documents().searchPostWithRestResponseAsync(requestToUse, requestOptions, context)
return restClient.documents().searchPostWithRestResponseAsync(requestToUse,
RequestOptionsConverter.map(requestOptions), context)
.onErrorMap(MappingUtils::exceptionMapper)
.map(searchDocumentResponse -> new SearchPagedResponse(searchDocumentResponse, serviceVersion));
}
/**
Expand Down Expand Up @@ -450,12 +462,12 @@ Mono<Response<SearchDocument>> getDocumentWithResponse(String key, List<String>
RequestOptions requestOptions, Context context) {
try {
return restClient.documents()
.getWithRestResponseAsync(key, selectedFields, requestOptions, context)
.getWithRestResponseAsync(key, selectedFields, RequestOptionsConverter.map(requestOptions), context)
.onErrorMap(DocumentResponseConversions::exceptionMapper)
.map(res -> {
SearchDocument doc = new SearchDocument(res.getValue());
return new SimpleResponse<>(res, doc);
})
.onErrorMap(DocumentResponseConversions::exceptionMapper)
.map(Function.identity());
} catch (RuntimeException ex) {
return monoError(logger, ex);
Expand Down Expand Up @@ -507,7 +519,9 @@ SuggestPagedFlux suggest(String searchText, String suggesterName, SuggestOptions

private Mono<SuggestPagedResponse> suggest(RequestOptions requestOptions, SuggestRequest suggestRequest,
Context context) {
return restClient.documents().suggestPostWithRestResponseAsync(suggestRequest, requestOptions, context)
return restClient.documents().suggestPostWithRestResponseAsync(suggestRequest,
RequestOptionsConverter.map(requestOptions), context)
.onErrorMap(MappingUtils::exceptionMapper)
.map(SuggestPagedResponse::new);
}

Expand Down Expand Up @@ -548,10 +562,12 @@ public Mono<Response<IndexDocumentsResult>> indexDocumentsWithResponse(IndexDocu
Mono<Response<IndexDocumentsResult>> indexDocumentsWithResponse(IndexDocumentsBatch<?> batch, Context context) {
try {
return restClient.documents()
.indexWithRestResponseAsync(batch, context)
.indexWithRestResponseAsync(IndexBatchBaseConverter.map(batch), context)
.onErrorMap(MappingUtils::exceptionMapper)
.flatMap(response -> (response.getStatusCode() == MULTI_STATUS_CODE)
? Mono.error(new IndexBatchException(response.getValue()))
: Mono.just(response));
? Mono.error(new IndexBatchException(IndexDocumentsResultConverter.map(response.getValue())))
: Mono.just(response)
.map(MappingUtils::mappingIndexDocumentResultResponse));
} catch (RuntimeException ex) {
return monoError(logger, ex);
}
Expand Down Expand Up @@ -594,8 +610,10 @@ AutocompletePagedFlux autocomplete(String searchText, String suggesterName, Auto

private Mono<AutocompletePagedResponse> autocomplete(RequestOptions requestOptions, AutocompleteRequest request,
Context context) {
return restClient.documents().autocompletePostWithRestResponseAsync(request, requestOptions, context)
.map(AutocompletePagedResponse::new);
return restClient.documents().autocompletePostWithRestResponseAsync(request,
RequestOptionsConverter.map(requestOptions), context)
.onErrorMap(MappingUtils::exceptionMapper)
.map(MappingUtils::mappingAutocompleteResponse);
}

/**
Expand All @@ -609,15 +627,18 @@ private static SearchRequest createSearchRequest(String searchText, SearchOption
SearchRequest searchRequest = new SearchRequest().setSearchText(searchText);

if (searchOptions != null) {
searchRequest.setSearchMode(searchOptions.getSearchMode())
List<String> scoringParameters = searchOptions.getScoringParameters() == null ? null
: searchOptions.getScoringParameters().stream().map(ScoringParameter::toString)
.collect(Collectors.toList());
searchRequest.setSearchMode(SearchModeConverter.map(searchOptions.getSearchMode()))
.setFacets(searchOptions.getFacets())
.setFilter(searchOptions.getFilter())
.setHighlightPostTag(searchOptions.getHighlightPostTag())
.setHighlightPreTag(searchOptions.getHighlightPreTag())
.setIncludeTotalResultCount(searchOptions.isIncludeTotalResultCount())
.setMinimumCoverage(searchOptions.getMinimumCoverage())
.setQueryType(searchOptions.getQueryType())
.setScoringParameters(searchOptions.getScoringParameters())
.setQueryType(QueryTypeConverter.map(searchOptions.getQueryType()))
.setScoringParameters(scoringParameters)
.setScoringProfile(searchOptions.getScoringProfile())
.setSkip(searchOptions.getSkip())
.setTop(searchOptions.getTop());
Expand Down Expand Up @@ -704,7 +725,7 @@ private static AutocompleteRequest createAutoCompleteRequest(String searchText,
.setHighlightPreTag(autocompleteOptions.getHighlightPreTag())
.setMinimumCoverage(autocompleteOptions.getMinimumCoverage())
.setTop(autocompleteOptions.getTop())
.setAutocompleteMode(autocompleteOptions.getAutocompleteMode());
.setAutocompleteMode(AutocompleteModeConverter.map(autocompleteOptions.getAutocompleteMode()));

List<String> searchFields = autocompleteOptions.getSearchFields();
if (searchFields != null) {
Expand Down
Loading