A bunch of refactoring (Azure#110)

* Refactoring code * Remove duplicate methods
navalev · Sep 27, 2019 · 6bd3cad · 6bd3cad
1 parent 890ff6d
commit 6bd3cad
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 77 deletions.
diff --git a/...rch/azure-search-data/src/main/java/com/azure/search/data/common/SearchPagedResponse.java b/...rch/azure-search-data/src/main/java/com/azure/search/data/common/SearchPagedResponse.java
@@ -16,37 +16,8 @@
 
 public class SearchPagedResponse extends PagedResponseBase<String, SearchResult> {
 
-    /**
-     * Get facets
-     *
-     * @return {@link Map}{@code <}{@link String}{@code ,}{@link List}{@code <}{@link FacetResult}{@code >}{@code >}
-     */
-    public Map<String, List<FacetResult>> getFacets() {
-        return facets;
-    }
-
     private final Map<String, List<FacetResult>> facets;
-
-    /**
-     * Get count
-     *
-     * @return Long
-     */
-    public Long getCount() {
-        return count;
-    }
-
     private final Long count;
-
-    /**
-     * Get coverage
-     *
-     * @return Double
-     */
-    public Double coverage() {
-        return coverage;
-    }
-
     private final Double coverage;
 
     /**
@@ -67,25 +38,34 @@ public SearchPagedResponse(SimpleResponse<DocumentSearchResult> documentSearchRe
         this.coverage = documentSearchResponse.value().coverage();
     }
 
-    private static String deserializeHeaders(HttpHeaders headers) {
-        return headers.toMap().entrySet().stream().map((entry) ->
-            entry.getKey() + "," + entry.getValue()
-        ).collect(Collectors.joining(","));
+    /**
+     * Get coverage
+     *
+     * @return Double
+     */
+    public Double coverage() {
+        return coverage;
     }
 
     /**
-     * return facets
+     * Get facets
      * @return {@link Map}{@code <}{@link String}{@code ,}{@link List}{@code <}{@link FacetResult}{@code >}{@code >}
      */
     public Map<String, List<FacetResult>> facets() {
         return facets;
     }
 
     /**
-     * Return documents counts
+     * Get documents count
      * @return long
      */
     public Long count() {
         return count;
     }
+
+    private static String deserializeHeaders(HttpHeaders headers) {
+        return headers.toMap().entrySet().stream().map((entry) ->
+            entry.getKey() + "," + entry.getValue()
+        ).collect(Collectors.joining(","));
+    }
 }
diff --git a/...azure-search-data/src/main/java/com/azure/search/data/customization/RangeFacetResult.java b/...azure-search-data/src/main/java/com/azure/search/data/customization/RangeFacetResult.java
@@ -21,7 +21,7 @@ public RangeFacetResult(FacetResult facetResult) {
     }
 
     /**
-     * Get cont
+     * Get count
      * @return count
      */
     public long count() {

diff --git a/...ch-data/src/main/java/com/azure/search/data/customization/SearchIndexAsyncClientImpl.java b/...ch-data/src/main/java/com/azure/search/data/customization/SearchIndexAsyncClientImpl.java
@@ -94,22 +94,22 @@ public class SearchIndexAsyncClientImpl extends SearchIndexBaseClient implements
             HttpClient httpClient,
             List<HttpPipelinePolicy> policies) {
         if (StringUtils.isBlank(searchServiceName)) {
-            throw new IllegalArgumentException("Invalid searchServiceName");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid searchServiceName"));
         }
         if (StringUtils.isBlank(searchDnsSuffix)) {
-            throw new IllegalArgumentException("Invalid searchDnsSuffix");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid searchDnsSuffix"));
         }
         if (StringUtils.isBlank(indexName)) {
-            throw new IllegalArgumentException("Invalid indexName");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid indexName"));
         }
         if (StringUtils.isBlank(apiVersion)) {
-            throw new IllegalArgumentException("Invalid apiVersion");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid apiVersion"));
         }
         if (httpClient == null) {
-            throw new IllegalArgumentException("Invalid httpClient");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid httpClient"));
         }
         if (policies == null) {
-            throw new IllegalArgumentException("Invalid policies");
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid policies"));
         }
 
         this.searchServiceName = searchServiceName;
@@ -322,9 +322,7 @@ public PagedFlux<AutocompleteItem> autocomplete(
             autocompleteParameters);
         Mono<PagedResponse<AutocompleteItem>> first = restClient.documents()
                 .autocompletePostWithRestResponseAsync(autocompleteRequest)
-                .map(res -> {
-                    return new AutoCompletePagedResponse(res);
-                });
+                .map(res -> new AutoCompletePagedResponse(res));
         return new PagedFlux<>(() -> first, nextLink -> Mono.empty());
     }
 

diff --git a/.../azure-search-data/src/test/java/com/azure/search/data/customization/SuggestTestBase.java b/.../azure-search-data/src/test/java/com/azure/search/data/customization/SuggestTestBase.java
@@ -75,14 +75,6 @@ protected void verifyCanSuggestStaticallyTypedDocuments(PagedResponse<SuggestRes
             expectedHotelsList.stream().map(h -> h.description()).collect(Collectors.toList()));
     }
 
-    protected void verifyCanSuggestWithDateTimeInStaticModel(PagedResponse<SuggestResult> suggestResultPagedResponse) {
-        List<SuggestResult> books = suggestResultPagedResponse.value();
-        List<Document> docs = suggestResultPagedResponse.value().stream().map(h -> h.additionalProperties()).collect(Collectors.toList());
-
-        Assert.assertEquals(1, docs.size());
-        Assert.assertEquals("War and Peace", books.get(0).text());
-    }
-
     protected void verifyFuzzyIsOffByDefault(PagedResponse<SuggestResult> suggestResultPagedResponse) {
 
         Assert.assertNotNull(suggestResultPagedResponse);
@@ -155,5 +147,6 @@ protected void verifyTopDocumentSuggest(PagedResponse<SuggestResult> suggestResu
     @Test
     public abstract void testCanFilter();
 
+    @Test
     public abstract void testOrderByProgressivelyBreaksTies();
 }
diff --git a/...re-search-data/src/test/java/com/azure/search/test/environment/setup/SearchIndexDocs.java b/...re-search-data/src/test/java/com/azure/search/test/environment/setup/SearchIndexDocs.java
@@ -81,28 +81,4 @@ private void addDocsData() throws IOException {
 
 
     }
-
-    public void addSingleDocData(Map document) throws IOException {
-
-        if (searchIndexAsyncClient == null) {
-            searchIndexAsyncClient = new SearchIndexClientBuilder()
-                .serviceName(searchServiceName)
-                .searchDnsSuffix(dnsSuffix)
-                .indexName(indexName)
-                .apiVersion(apiVersion)
-                .credential(apiAdminKey)
-                .buildAsyncClient();
-        }
-
-        System.out.println("Indexing 1 doc");
-        System.out.println("Indexing Results:");
-        searchIndexAsyncClient.uploadDocument(document)
-            .doOnSuccess(documentIndexResult ->
-                documentIndexResult
-                    .results().forEach(
-                        result ->
-                        System.out.println("key:" + result.key() + (result.succeeded() ? " Succeeded" : " Error: " + result.errorMessage()))))
-            .doOnError(e -> System.out.println(e.getMessage()))
-            .block();
-    }
 }