Cleanup

Author: lobrien

quickstart/AzureSearchClient.js

@@ -5,7 +5,7 @@ class AzureSearchClient {
 
     async indexExistsAsync() { 
         console.log("\n Checking if index exists...");
-        const endpoint = this.searchServiceHelper.getIndexExistsUrl();
+        const endpoint = this.searchServiceHelper.getIndexUrl();
         const response = await this.searchServiceHelper.request(endpoint, "GET", null);
         // Success has a few likely status codes: 200 or 204 (No Content), but accept all in 200 range...
         const exists = response.status >= 200 && response.status < 300;
@@ -14,21 +14,21 @@ class AzureSearchClient {
 
     async deleteIndexAsync() {
         console.log("\n Deleting existing index...");
-        const endpoint = this.searchServiceHelper.getIndexExistsUrl();
+        const endpoint = this.searchServiceHelper.getIndexUrl();
         const response = await this.searchServiceHelper.request(endpoint, "DELETE");
         this.searchServiceHelper.throwOnHttpError(response);
         return this;
     }
 
     async createIndexAsync(definition) {
         console.log("\n Creating index...");
-        const endpoint = this.searchServiceHelper.getCreateIndexUrl();
+        const endpoint = this.searchServiceHelper.getIndexUrl();
         const response = await this.searchServiceHelper.request(endpoint, "PUT", definition);
         this.searchServiceHelper.throwOnHttpError(response);
         return this;
     }
 
-    async loadDataAsync(hotelsData) {
+    async postDataAsync(hotelsData) {
         console.log("\n Adding hotel data...");
         const endpoint = this.searchServiceHelper.getPostDataUrl();
         const response = await this.searchServiceHelper.request(endpoint,"POST", hotelsData);

quickstart/SearchServiceHelper.js

@@ -8,19 +8,22 @@ class SearchServiceHelper {
         this.apiVersion = '2019-05-06';
     }
 
-    _indexUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}?api-version=${this.apiVersion}`; }
+    getIndexUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}?api-version=${this.apiVersion}`; }
 
-    getIndexExistsUrl() { return this._indexUrl(); }
-    getCreateIndexUrl() { return this._indexUrl(); }
-
     getPostDataUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}/docs/index?api-version=${this.apiVersion}`;  }
 
     getSearchUrl(searchTerm) { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}/docs?api-version=${this.apiVersion}&search=${searchTerm}&searchMode=all`; }
 
 
     request(url, method, bodyJson = null) {
+        // Uncomment the following for request details:
+        /*
         console.log(`\n${method} ${url}`);
-       
+        if (bodyJson !== null) {
+            console.log(`\ncontent: ${JSON.stringify(bodyJson, null, 4)}`);
+        }
+        */
+
         const headers = {
             'content-type' : 'application/json',
             'api-key' : this.apiKey

quickstart/index.js

@@ -57,7 +57,7 @@ const run = async () => {
         const indexDefinition = require('./hotels_quickstart_index.json');
         await client.createIndexAsync(indexDefinition);
         await sleep(2000);
-        await client.loadDataAsync(hotelData);
+        await client.postDataAsync(hotelData);
         await sleep(5000);
         await doQueries(client);
     } catch (x) {