Skip to content

Commit e9e9e78

Browse files
idickerson7idickerson7
committed
fixed build issues
1 parent b3adfab commit e9e9e78

10 files changed

Lines changed: 48 additions & 31 deletions

File tree

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchIndexAsyncClientJavaDocSnippets.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import com.azure.search.documents.indexes.SearchIndexAsyncClient;
77
import com.azure.search.documents.indexes.SearchIndexClientBuilder;
88
import com.azure.search.documents.indexes.models.LexicalAnalyzerName;
9-
import com.azure.search.documents.indexes.models.SearchIndex;
9+
import com.azure.search.documents.indexes.models.ListSynonymMapsResult;
10+
import com.azure.search.documents.indexes.models.SearchField;
1011
import com.azure.search.documents.indexes.models.SearchFieldDataType;
1112
import com.azure.search.documents.indexes.models.SearchIndex;
1213
import com.azure.search.documents.indexes.models.SynonymMap;
@@ -148,8 +149,8 @@ public static void createSynonymMap() {
148149
public static void listSynonymMaps() {
149150
searchIndexAsyncClient = createSearchIndexAsyncClient();
150151
// BEGIN: com.azure.search.documents.indexes.SearchIndexAsyncClient-classLevelJavaDoc.listSynonymMaps
151-
searchIndexAsyncClient.listSynonymMaps().subscribe(synonymMap ->
152-
System.out.println("The synonymMap name is " + synonymMap.getName()));
152+
searchIndexAsyncClient.listSynonymMaps().map(ListSynonymMapsResult::getSynonymMaps).subscribe(synonymMaps ->
153+
synonymMaps.forEach(synonymMap -> System.out.println("The synonymMap name is " + synonymMap.getName())));
153154
// END: com.azure.search.documents.indexes.SearchIndexAsyncClient-classLevelJavaDoc.listSynonymMaps
154155
}
155156

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchIndexClientJavaDocSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public static void createSynonymMap() {
148148
public static void listSynonymMaps() {
149149
searchIndexClient = createSearchIndexClient();
150150
// BEGIN: com.azure.search.documents.indexes.SearchIndexClient-classLevelJavaDoc.listSynonymMaps
151-
searchIndexClient.listSynonymMaps()
151+
searchIndexClient.listSynonymMaps().getSynonymMaps()
152152
.forEach(synonymMap -> System.out.println(synonymMap.getName()));
153153
// END: com.azure.search.documents.indexes.SearchIndexClient-classLevelJavaDoc.listSynonymMaps
154154
}

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchIndexerAsyncClientJavaDocSnippets.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import com.azure.search.documents.indexes.SearchIndexerAsyncClient;
77
import com.azure.search.documents.indexes.SearchIndexerClientBuilder;
88
import com.azure.search.documents.indexes.models.InputFieldMappingEntry;
9-
import com.azure.search.documents.indexes.models.SearchIndexer;
9+
import com.azure.search.documents.indexes.models.ListIndexersResult;
10+
import com.azure.search.documents.indexes.models.OcrSkill;
1011
import com.azure.search.documents.indexes.models.OutputFieldMappingEntry;
1112
import com.azure.search.documents.indexes.models.SearchIndexer;
1213
import com.azure.search.documents.indexes.models.SearchIndexerSkill;
@@ -56,8 +57,8 @@ public static void createIndexer() {
5657
public static void listIndexers() {
5758
searchIndexerAsyncClient = createSearchIndexerAsyncClient();
5859
// BEGIN: com.azure.search.documents.SearchIndexerAsyncClient-classLevelJavaDoc.listIndexers
59-
searchIndexerAsyncClient.listIndexers().subscribe(indexer ->
60-
System.out.printf("Retrieved indexer name: %s%n", indexer.getName()));
60+
searchIndexerAsyncClient.listIndexers().map(ListIndexersResult::getIndexers).subscribe(indexers ->
61+
indexers.forEach(indexer -> System.out.printf("Retrieved indexer name: %s%n", indexer.getName())));
6162
// END: com.azure.search.documents.SearchIndexerAsyncClient-classLevelJavaDoc.listIndexers
6263
}
6364

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/codesnippets/SearchIndexerClientJavaDocSnippets.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void createIndexer() {
5252
public static void listIndexers() {
5353
searchIndexerClient = createSearchIndexerClient();
5454
// BEGIN: com.azure.search.documents.SearchIndexerClient-classLevelJavaDoc.listIndexers
55-
searchIndexerClient.listIndexers()
55+
searchIndexerClient.listIndexers().getIndexers()
5656
.forEach(indexer -> System.out.printf("Retrieved indexer name: %s%n", indexer.getName()));
5757
// END: com.azure.search.documents.SearchIndexerClient-classLevelJavaDoc.listIndexers
5858
}

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/DataSourceExample.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.azure.search.documents.indexes.models.DataChangeDetectionPolicy;
99
import com.azure.search.documents.indexes.models.DataSourceCredentials;
1010
import com.azure.search.documents.indexes.models.HighWaterMarkChangeDetectionPolicy;
11+
import com.azure.search.documents.indexes.models.ListDataSourcesResult;
1112
import com.azure.search.documents.indexes.models.SearchIndexerDataContainer;
1213
import com.azure.search.documents.indexes.models.SearchIndexerDataSourceConnection;
1314
import com.azure.search.documents.indexes.models.SearchIndexerDataSourceType;
@@ -53,7 +54,8 @@ public static void main(String[] args) {
5354
/*
5455
* Get all existing data sources; list should include the ones we just created.
5556
* */
56-
for (SearchIndexerDataSourceConnection dataSource : client.listDataSourceConnections()) {
57+
ListDataSourcesResult result = client.listDataSourceConnections();
58+
for (SearchIndexerDataSourceConnection dataSource : result.getDataSources()) {
5759
if (names.contains(dataSource.getName())) {
5860
System.out.printf("Found data source %s of type %s%n", dataSource.getName(),
5961
dataSource.getType().toString());

‎sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/indexes/ListIndexersExample.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import com.azure.core.credential.AzureKeyCredential;
77
import com.azure.core.util.Configuration;
8+
import com.azure.search.documents.indexes.models.SearchIndexer;
89

910
public class ListIndexersExample {
1011

@@ -30,8 +31,13 @@ public static void main(String[] args) {
3031
}
3132

3233
private static void listIndexers(SearchIndexerAsyncClient indexerAsyncClient) {
33-
System.out.println("Found the following indexers:");
34-
indexerAsyncClient.listIndexers().subscribe(indexer ->
35-
System.out.printf("Indexer name: %s, ETag: %s%n", indexer.getName(), indexer.getETag()));
34+
indexerAsyncClient.listIndexersWithResponse(null).subscribe(response -> {
35+
System.out.printf("Response code: %s%n", response.getStatusCode());
36+
37+
System.out.println("Found the following indexers:");
38+
for (SearchIndexer indexer : response.getValue().getIndexers()) {
39+
System.out.printf("Indexer name: %s, ETag: %s%n", indexer.getName(), indexer.getETag());
40+
}
41+
});
3642
}
3743
}

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/DataSourceTests.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public void canCreateAndListDataSourcesSync() {
9494
dataSourcesToDelete.add(dataSource2.getName());
9595

9696
Map<String, SearchIndexerDataSourceConnection> actualDataSources = client.listDataSourceConnections()
97+
.getDataSources()
9798
.stream()
9899
.collect(Collectors.toMap(SearchIndexerDataSourceConnection::getName, ds -> ds));
99100

@@ -113,8 +114,10 @@ public void canCreateAndListDataSourcesAsync() {
113114
= Flux.fromIterable(Arrays.asList(dataSource1, dataSource2))
114115
.flatMap(asyncClient::createOrUpdateDataSourceConnection)
115116
.doOnNext(ds -> dataSourcesToDelete.add(ds.getName()))
116-
.then(asyncClient.listDataSourceConnections()
117-
.collectMap(SearchIndexerDataSourceConnection::getName, ds -> ds));
117+
.then(asyncClient.listDataSourceConnections())
118+
.map(result -> result.getDataSources()
119+
.stream()
120+
.collect(Collectors.toMap(SearchIndexerDataSourceConnection::getName, ds -> ds)));
118121

119122
StepVerifier.create(listMono)
120123
.assertNext(actualDataSources -> compareMaps(expectedDataSources, actualDataSources,

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/IndexersManagementTests.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,10 @@ public void canCreateAndListIndexersSync() {
221221
expectedIndexers.put(indexer1.getName(), indexer1);
222222
expectedIndexers.put(indexer2.getName(), indexer2);
223223

224-
Map<String, SearchIndexer> actualIndexers
225-
= searchIndexerClient.listIndexers().stream().collect(Collectors.toMap(SearchIndexer::getName, si -> si));
224+
Map<String, SearchIndexer> actualIndexers = searchIndexerClient.listIndexers()
225+
.getIndexers()
226+
.stream()
227+
.collect(Collectors.toMap(SearchIndexer::getName, si -> si));
226228

227229
compareMaps(expectedIndexers, actualIndexers,
228230
(expected, actual) -> assertObjectEquals(expected, actual, true, "etag"));
@@ -248,8 +250,8 @@ public void canCreateAndListIndexersAsync() {
248250
expectedIndexers.put(indexer1.getName(), indexer1);
249251
expectedIndexers.put(indexer2.getName(), indexer2);
250252

251-
Mono<Map<String, SearchIndexer>> listMono
252-
= searchIndexerAsyncClient.listIndexers().collectMap(SearchIndexer::getName, si -> si);
253+
Mono<Map<String, SearchIndexer>> listMono = searchIndexerAsyncClient.listIndexers()
254+
.map(result -> result.getIndexers().stream().collect(Collectors.toMap(SearchIndexer::getName, si -> si)));
253255

254256
StepVerifier.create(listMono)
255257
.assertNext(actualIndexers -> compareMaps(expectedIndexers, actualIndexers,

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/indexes/SynonymMapManagementTests.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void canUpdateSynonymMapSync() {
210210
SynonymMap updatedActual = client.createOrUpdateSynonymMap(updatedExpected);
211211
assertSynonymMapsEqual(updatedExpected, updatedActual);
212212

213-
assertEquals(1, client.listSynonymMaps().stream().count());
213+
assertEquals(1, client.listSynonymMaps().getSynonymMaps().size());
214214
}
215215

216216
@Test
@@ -228,7 +228,7 @@ public void canUpdateSynonymMapAsync() {
228228
.assertNext(synonyms -> assertSynonymMapsEqual(synonyms.getT1(), synonyms.getT2()))
229229
.verifyComplete();
230230

231-
StepVerifier.create(asyncClient.listSynonymMaps().count()).expectNext(1L).verifyComplete();
231+
StepVerifier.create(asyncClient.listSynonymMaps()).expectNextCount(1).verifyComplete();
232232
}
233233

234234
@Test
@@ -242,7 +242,7 @@ public void canUpdateSynonymMapWithResponseSync() {
242242
SynonymMap updatedActual = client.createOrUpdateSynonymMapWithResponse(updatedExpected, null).getValue();
243243
assertSynonymMapsEqual(updatedExpected, updatedActual);
244244

245-
assertEquals(1, client.listSynonymMaps().stream().count());
245+
assertEquals(1, client.listSynonymMaps().getSynonymMaps().size());
246246
}
247247

248248
@Test
@@ -260,7 +260,7 @@ public void canUpdateSynonymMapWithResponseAsync() {
260260
.assertNext(synonyms -> assertSynonymMapsEqual(synonyms.getT1(), synonyms.getT2()))
261261
.verifyComplete();
262262

263-
StepVerifier.create(asyncClient.listSynonymMaps().count()).expectNext(1L).verifyComplete();
263+
StepVerifier.create(asyncClient.listSynonymMaps()).expectNextCount(1).verifyComplete();
264264
}
265265

266266
@Test
@@ -470,12 +470,15 @@ public void canCreateAndListSynonymMapsSyncAndAsync() {
470470
expectedSynonyms.put(synonymMap1.getName(), synonymMap1);
471471
expectedSynonyms.put(synonymMap2.getName(), synonymMap2);
472472

473-
Map<String, SynonymMap> actualSynonyms
474-
= client.listSynonymMaps().stream().collect(Collectors.toMap(SynonymMap::getName, sm -> sm));
473+
Map<String, SynonymMap> actualSynonyms = client.listSynonymMaps()
474+
.getSynonymMaps()
475+
.stream()
476+
.collect(Collectors.toMap(SynonymMap::getName, sm -> sm));
475477

476478
compareMaps(expectedSynonyms, actualSynonyms, (expected, actual) -> assertObjectEquals(expected, actual, true));
477479

478-
StepVerifier.create(asyncClient.listSynonymMaps().collectMap(SynonymMap::getName, sm -> sm))
480+
StepVerifier.create(asyncClient.listSynonymMaps()
481+
.map(result -> result.getSynonymMaps().stream().collect(Collectors.toMap(SynonymMap::getName, sm -> sm))))
479482
.assertNext(actualSynonyms2 -> compareMaps(expectedSynonyms, actualSynonyms2,
480483
(expected, actual) -> assertObjectEquals(expected, actual, true)))
481484
.verifyComplete();

‎sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/models/SearchRequestUrlRewriterPolicyTests.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public HttpResponse sendSync(HttpRequest request, Context context) {
155155
indexUrl + "/search.analyze"),
156156
Arguments.of(toCallable(() -> indexClient.createSynonymMapWithResponse(synonymMap, null)), synonymMapsUrl),
157157
Arguments.of(toCallable(() -> indexClient.getSynonymMapWithResponse("synonym", null)), synonymUrl),
158-
Arguments.of(toCallable(() -> indexClient.listSynonymMaps().iterator().hasNext()), synonymMapsUrl),
158+
Arguments.of(toCallable(indexClient::listSynonymMaps), synonymMapsUrl),
159159
Arguments.of(toCallable(() -> indexClient.listSynonymMapNames().iterator().hasNext()), synonymMapsUrl),
160160
Arguments.of(toCallable(() -> indexClient.createOrUpdateSynonymMapWithResponse(synonymMap, null)),
161161
synonymUrl),
@@ -198,18 +198,17 @@ public HttpResponse sendSync(HttpRequest request, Context context) {
198198
dataSourceUrl),
199199
Arguments.of(toCallable(() -> indexerClient.createDataSourceConnectionWithResponse(dataSource, null)),
200200
dataSourcesUrl),
201-
Arguments.of(toCallable(() -> indexerClient.getDataSourceConnectionWithResponse("datasource", null)),
202-
dataSourceUrl),
203-
Arguments.of(toCallable(() -> indexerClient.listDataSourceConnections().iterator().hasNext()),
204-
dataSourcesUrl),
201+
Arguments.of(
202+
toCallable(() -> indexerClient.getDataSourceConnectionWithResponse("datasource", null)), dataSourceUrl),
203+
Arguments.of(toCallable(indexerClient::listDataSourceConnections), dataSourcesUrl),
205204
Arguments.of(toCallable(() -> indexerClient.listDataSourceConnectionNames().iterator().hasNext()),
206205
dataSourcesUrl),
207206
Arguments.of(
208207
toCallable(() -> indexerClient.deleteDataSourceConnectionWithResponse(dataSource.getName(), null)),
209208
dataSourceUrl),
210209
Arguments.of(toCallable(() -> indexerClient.createIndexerWithResponse(indexer, null)), indexersUrl),
211210
Arguments.of(toCallable(() -> indexerClient.createOrUpdateIndexerWithResponse(indexer, null)), indexerUrl),
212-
Arguments.of(toCallable(() -> indexerClient.listIndexers().iterator().hasNext()), indexersUrl),
211+
Arguments.of(toCallable(indexerClient::listIndexers), indexersUrl),
213212
Arguments.of(toCallable(() -> indexerClient.listIndexerNames().iterator().hasNext()), indexersUrl),
214213
Arguments.of(toCallable(() -> indexerClient.getIndexerWithResponse("indexer", null)), indexerUrl),
215214
Arguments.of(toCallable(() -> indexerClient.deleteIndexerWithResponse(indexer.getName(), null)),

0 commit comments

Comments
 (0)