Skip to content

Split the two swaggers into different path. #11437

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

Merged
sima-zhu merged 5 commits into from
May 27, 2020
Merged

Split the two swaggers into different path. #11437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aec24c0
Service swagger goes to indexes folder
sima-zhu May 26, 2020
b4047f9
Move the customized models to right path
sima-zhu May 26, 2020
694a579
checkstyle changes
sima-zhu May 26, 2020
b56bf71
Fixed linting
sima-zhu May 26, 2020
7df7c3c
Remove extra changes.
sima-zhu May 26, 2020
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
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion 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 @@ -359,10 +359,14 @@
<!-- Hand-written classes should be specified here to be checked -->
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\]models[/\\]"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]indexes[/\\]implementation[/\\]models[/\\]"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\]converters[/\\]"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\](DataSourcesImpl|DocumentsImpl|IndexersImpl|IndexesImpl|SkillsetsImpl|SynonymMapsImpl|SearchIndexRestClientBuilder|SearchIndexRestClientImpl|SearchServiceRestClientBuilder|SearchServiceRestClientImpl)"/>
files=".*[/\\]search[/\\]documents[/\\]implementation[/\\](DocumentsImpl|SearchIndexRestClientBuilder|SearchIndexRestClientImpl)"/>
<suppress checks="."
files=".*[/\\]search[/\\]documents[/\\]indexes[/\\]implementation[/\\](DataSourcesImpl|IndexersImpl|IndexesImpl|SkillsetsImpl|SynonymMapsImpl|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"/>
Expand Down
20 changes: 0 additions & 20 deletions eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,26 +711,6 @@
<Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
</Match>


<!-- Azure search has generated code mixed with hand-written in these packages -->
<Match>
<And>
<Package name="~com\.azure\.search\.documents\.models"/>
<Not>
<Or>
<!-- Hand-written classes should be specified here to be checked -->
<Class name="com.azure.search.documents.models.CoordinateSystem"/>
<Class name="com.azure.search.documents.models.GeoPoint"/>
<Class name="com.azure.search.documents.models.IndexBatch"/>
<Class name="com.azure.search.documents.models.ValueFacetResult"/>
<Class name="com.azure.search.documents.models.RangeFacetResult"/>
<Class name="com.azure.search.documents.models.IndexBatchException"/>
<Class name="com.azure.search.documents.models.ScoringParameter"/>
</Or>
</Not>
</And>
</Match>

<!-- Initial implementation of JacksonDeserializer is using an inline class-->
<Match>
<Class name="com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer"/>
Expand Down
6 changes: 3 additions & 3 deletions sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/FieldBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import com.azure.search.documents.indexes.SearchableFieldProperty;
import com.azure.search.documents.indexes.SimpleFieldProperty;
import com.azure.search.documents.models.GeoPoint;
import com.azure.search.documents.models.LexicalAnalyzerName;
import com.azure.search.documents.models.SearchField;
import com.azure.search.documents.models.SearchFieldDataType;
import com.azure.search.documents.indexes.models.LexicalAnalyzerName;
import com.azure.search.documents.indexes.models.SearchField;
import com.azure.search.documents.indexes.models.SearchFieldDataType;

import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -31,7 +31,7 @@
import com.azure.search.documents.models.IndexAction;
import com.azure.search.documents.models.IndexActionType;
import com.azure.search.documents.models.IndexBatchException;
import com.azure.search.documents.models.IndexDocumentsBatch;
import com.azure.search.documents.indexes.models.IndexDocumentsBatch;
import com.azure.search.documents.models.IndexDocumentsResult;
import com.azure.search.documents.models.RequestOptions;
import com.azure.search.documents.models.ScoringParameter;
Expand Down
2 changes: 1 addition & 1 deletion ...ch/azure-search-documents/src/main/java/com/azure/search/documents/SearchIndexClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.azure.core.util.Context;
import com.azure.search.documents.models.AutocompleteOptions;
import com.azure.search.documents.models.IndexBatchException;
import com.azure.search.documents.models.IndexDocumentsBatch;
import com.azure.search.documents.indexes.models.IndexDocumentsBatch;
import com.azure.search.documents.models.IndexDocumentsResult;
import com.azure.search.documents.models.RequestOptions;
import com.azure.search.documents.models.SearchOptions;
Expand Down
14 changes: 7 additions & 7 deletions ...e-search-documents/src/main/java/com/azure/search/documents/SearchIndexerDataSources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
package com.azure.search.documents;

import com.azure.core.util.CoreUtils;
import com.azure.search.documents.models.DataChangeDetectionPolicy;
import com.azure.search.documents.models.DataDeletionDetectionPolicy;
import com.azure.search.documents.models.DataSourceCredentials;
import com.azure.search.documents.models.HighWaterMarkChangeDetectionPolicy;
import com.azure.search.documents.models.SearchIndexerDataContainer;
import com.azure.search.documents.models.SearchIndexerDataSource;
import com.azure.search.documents.models.SearchIndexerDataSourceType;
import com.azure.search.documents.indexes.models.DataChangeDetectionPolicy;
import com.azure.search.documents.indexes.models.DataDeletionDetectionPolicy;
import com.azure.search.documents.indexes.models.DataSourceCredentials;
import com.azure.search.documents.indexes.models.HighWaterMarkChangeDetectionPolicy;
import com.azure.search.documents.indexes.models.SearchIndexerDataContainer;
import com.azure.search.documents.indexes.models.SearchIndexerDataSource;
import com.azure.search.documents.indexes.models.SearchIndexerDataSourceType;

/**
* Utility class that aids in the creation of {@link SearchIndexerDataSource SearchIndexerDataSources}.
Expand Down
Loading