Structure houskeeping (Azure#309)

* moved files to root to implementation folder

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -229,9 +229,9 @@
 
   <!-- Suppress checks for AutoRest generated Search code -->
   <!-- Hand-written classes should be specified here to be checked -->
-    <suppress checks="." files=".*[/\\]search[/\\]implementation[/\\]((?!(GeoPointDeserializer|ISO8601DateDeserializer|SerializationUtil)).*)"/>  
-  <suppress checks="." files=".*[/\\]search[/\\]models[/\\]((?!(CoordinateSystem|GeoPoint|IndexBatch)).*)"/>  
-  
+    <suppress checks="." files=".*[/\\]search[/\\]implementation[/\\]((?!(GeoPointDeserializer|ISO8601DateDeserializer|SerializationUtil)).*)"/>
+  <suppress checks="." files=".*[/\\]search[/\\]models[/\\]((?!(CoordinateSystem|GeoPoint|IndexBatch|ValueFacetResult|RangeFacetResult)).*)"/>
+
   <!-- Suppress external dependency check for jacksonwrapper overriding deserialize method -->
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck" files="com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer.java"/>
-</suppressions>
+</suppressions>

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -632,15 +632,17 @@
   <Match>
     <And>
       <Package name="~com\.azure\.search\.(implementation|models)(.*)"/>
-      <Not>        
+      <Not>
         <Or>
-          <!-- Hand-written classes should be specified here to be checked -->
+          <!-- Hand-written classes should be specified here to be checked  -->
           <Class name="com.azure.search.implementation.GeoPointDeserializer"/>
           <Class name="com.azure.search.implementation.ISO8601DateDeserializer"/>
           <Class name="com.azure.search.implementation.SerializationUtil"/>
           <Class name="com.azure.search.models.CoordinateSystem"/>
           <Class name="com.azure.search.models.GeoPoint"/>
           <Class name="com.azure.search.models.IndexBatch"/>
+          <Class name="com.azure.search.models.ValueFacetResult"/>
+          <Class name="com.azure.search.models.RangeFacetResult"/>
         </Or>
       </Not>
     </And>

sdk/search/azure-search/src/main/java/com/azure/search/common/DataSources.java → sdk/search/azure-search/src/main/java/com/azure/search/DataSources.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search.common;
+package com.azure.search;
 
 import com.azure.search.models.DataChangeDetectionPolicy;
 import com.azure.search.models.DataContainer;

sdk/search/azure-search/src/main/java/com/azure/search/common/SearchApiKeyPipelinePolicy.java → sdk/search/azure-search/src/main/java/com/azure/search/SearchApiKeyPipelinePolicy.java

@@ -1,13 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search.common;
+package com.azure.search;
 
 import com.azure.core.http.HttpPipelineCallContext;
 import com.azure.core.http.HttpPipelineNextPolicy;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.search.ApiKeyCredentials;
 import reactor.core.publisher.Mono;
 
 import java.util.Objects;

sdk/search/azure-search/src/main/java/com/azure/search/SearchIndexAsyncClient.java

@@ -17,9 +17,6 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.search.SearchServiceUrlParser.SearchServiceUrlParts;
-import com.azure.search.common.SearchPagedResponse;
-import com.azure.search.common.SuggestPagedResponse;
-import com.azure.search.common.SuggestOptionsHandler;
 import com.azure.search.implementation.SearchIndexRestClientBuilder;
 import com.azure.search.implementation.SearchIndexRestClientImpl;
 import com.azure.search.implementation.SerializationUtil;

sdk/search/azure-search/src/main/java/com/azure/search/SearchIndexClient.java

@@ -10,8 +10,6 @@
 import com.azure.core.http.rest.PagedIterableBase;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
-import com.azure.search.common.SearchPagedResponse;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.AutocompleteItem;
 import com.azure.search.models.AutocompleteOptions;
 import com.azure.search.models.DocumentIndexResult;

sdk/search/azure-search/src/main/java/com/azure/search/SearchIndexClientBuilder.java

@@ -9,7 +9,6 @@
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.search.common.SearchApiKeyPipelinePolicy;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

sdk/search/azure-search/src/main/java/com/azure/search/common/SearchPagedResponse.java → sdk/search/azure-search/src/main/java/com/azure/search/SearchPagedResponse.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search.common;
+package com.azure.search;
 
 import com.azure.core.http.HttpHeaders;
 import com.azure.core.http.rest.SimpleResponse;

sdk/search/azure-search/src/main/java/com/azure/search/SearchServiceClientBuilder.java

@@ -8,7 +8,6 @@
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.search.common.SearchApiKeyPipelinePolicy;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

sdk/search/azure-search/src/main/java/com/azure/search/common/SuggestOptionsHandler.java → sdk/search/azure-search/src/main/java/com/azure/search/SuggestOptionsHandler.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search.common;
+package com.azure.search;
 
 import com.azure.search.models.SuggestOptions;
 

sdk/search/azure-search/src/main/java/com/azure/search/common/SuggestPagedResponse.java → sdk/search/azure-search/src/main/java/com/azure/search/SuggestPagedResponse.java

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search.common;
+package com.azure.search;
 
 import com.azure.core.http.HttpHeaders;
 import com.azure.core.http.rest.SimpleResponse;

sdk/search/azure-search/src/main/java/com/azure/search/RangeFacetResult.java → sdk/search/azure-search/src/main/java/com/azure/search/models/RangeFacetResult.java

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search;
-
-import com.azure.search.models.FacetResult;
+package com.azure.search.models;
 
 public class RangeFacetResult {
     private final Long count;

sdk/search/azure-search/src/main/java/com/azure/search/ValueFacetResult.java → sdk/search/azure-search/src/main/java/com/azure/search/models/ValueFacetResult.java

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.search;
-
-import com.azure.search.models.FacetResult;
+package com.azure.search.models;
 
 public class ValueFacetResult {
     private final Long count;

sdk/search/azure-search/src/main/java/module-info.java

@@ -11,6 +11,5 @@
     opens com.azure.search.implementation to com.fasterxml.jackson.databind;
 
     exports com.azure.search;
-    exports com.azure.search.common;
     exports com.azure.search.models;
 }

sdk/search/azure-search/src/samples/java/com/azure/search/HttpResponseExceptionExample.java

@@ -7,7 +7,6 @@
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.rest.PagedFluxBase;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;
 

sdk/search/azure-search/src/samples/java/com/azure/search/RunningSearchSolutionExample.java

@@ -8,8 +8,6 @@
 import com.azure.core.http.rest.PagedResponse;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.Context;
-import com.azure.search.common.SearchPagedResponse;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.AutocompleteItem;
 import com.azure.search.models.AutocompleteMode;
 import com.azure.search.models.AutocompleteOptions;
@@ -20,7 +18,6 @@
 import com.azure.search.models.SearchResult;
 import com.azure.search.models.SuggestOptions;
 import com.azure.search.models.SuggestResult;
-import com.microsoft.azure.management.network.model.HasBackendNics;
 
 import java.util.Iterator;
 

sdk/search/azure-search/src/samples/java/com/azure/search/SearchAsyncWithFullyTypedDocumentsExample.java

@@ -8,7 +8,6 @@
 import com.azure.core.implementation.serializer.jsonwrapper.api.JsonApi;
 import com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.SearchResult;
 import models.Hotel;
 

sdk/search/azure-search/src/samples/java/com/azure/search/SearchOptionsAsyncExample.java

@@ -5,7 +5,6 @@
 
 import com.azure.core.http.rest.PagedFluxBase;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.FacetResult;
 import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SearchOptions;

sdk/search/azure-search/src/samples/java/com/azure/search/SearchOptionsExample.java

@@ -5,7 +5,6 @@
 
 import com.azure.core.http.rest.PagedIterableBase;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;

sdk/search/azure-search/src/samples/java/com/azure/search/SearchSuggestionExample.java

@@ -5,7 +5,6 @@
 
 import com.azure.core.http.rest.PagedIterableBase;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.SuggestOptions;
 import com.azure.search.models.SuggestResult;
 

sdk/search/azure-search/src/test/java/com/azure/search/CustomAnalyzerAsyncTests.java

@@ -4,7 +4,6 @@
 
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.PagedFluxBase;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.AccessCondition;
 import com.azure.search.models.AnalyzeRequest;
 import com.azure.search.models.Analyzer;

sdk/search/azure-search/src/test/java/com/azure/search/DataSourceTestBase.java

@@ -3,7 +3,6 @@
 
 package com.azure.search;
 
-import com.azure.search.common.DataSources;
 import com.azure.search.models.DataChangeDetectionPolicy;
 import com.azure.search.models.DataDeletionDetectionPolicy;
 import com.azure.search.models.DataSource;

sdk/search/azure-search/src/test/java/com/azure/search/SearchAsyncTests.java

@@ -8,13 +8,14 @@
 import com.azure.core.implementation.serializer.jsonwrapper.api.Config;
 import com.azure.core.implementation.serializer.jsonwrapper.api.JsonApi;
 import com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.CoordinateSystem;
 import com.azure.search.models.FacetResult;
-import com.azure.search.models.SearchOptions;
 import com.azure.search.models.QueryType;
+import com.azure.search.models.RangeFacetResult;
 import com.azure.search.models.RequestOptions;
+import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;
+import com.azure.search.models.ValueFacetResult;
 import com.azure.search.test.environment.models.Bucket;
 import com.azure.search.test.environment.models.Hotel;
 import com.azure.search.test.environment.models.NonNullableModel;

sdk/search/azure-search/src/test/java/com/azure/search/SearchIndexAsyncClientImplTest.java

@@ -5,7 +5,6 @@
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.exception.ResourceNotFoundException;
 import com.azure.core.http.rest.PagedFluxBase;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.GeoPoint;
 import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;

sdk/search/azure-search/src/test/java/com/azure/search/SearchServiceTestBase.java

@@ -12,7 +12,6 @@
 import com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer;
 import com.azure.core.test.TestBase;
 import com.azure.core.util.Configuration;
-import com.azure.search.common.DataSources;
 import com.azure.search.models.AnalyzerName;
 import com.azure.search.models.CorsOptions;
 import com.azure.search.models.DataChangeDetectionPolicy;

sdk/search/azure-search/src/test/java/com/azure/search/SearchSyncTests.java

@@ -9,13 +9,14 @@
 import com.azure.core.implementation.serializer.jsonwrapper.api.Config;
 import com.azure.core.implementation.serializer.jsonwrapper.api.JsonApi;
 import com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer;
-import com.azure.search.common.SearchPagedResponse;
 import com.azure.search.models.CoordinateSystem;
 import com.azure.search.models.FacetResult;
 import com.azure.search.models.QueryType;
+import com.azure.search.models.RangeFacetResult;
 import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;
+import com.azure.search.models.ValueFacetResult;
 import com.azure.search.test.environment.models.Bucket;
 import com.azure.search.test.environment.models.Hotel;
 import com.azure.search.test.environment.models.NonNullableModel;

sdk/search/azure-search/src/test/java/com/azure/search/SearchTestBase.java

@@ -7,10 +7,12 @@
 import com.azure.search.models.FacetResult;
 import com.azure.search.models.Index;
 import com.azure.search.models.QueryType;
+import com.azure.search.models.RangeFacetResult;
 import com.azure.search.models.RequestOptions;
 import com.azure.search.models.SearchOptions;
 import com.azure.search.models.SearchResult;
 import com.azure.search.models.SynonymMap;
+import com.azure.search.models.ValueFacetResult;
 import org.junit.Assert;
 import org.junit.Test;
 

sdk/search/azure-search/src/test/java/com/azure/search/SuggestAsyncTests.java

@@ -3,7 +3,6 @@
 package com.azure.search;
 
 import com.azure.core.http.rest.PagedFluxBase;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.SuggestOptions;
 import com.azure.search.models.SuggestResult;
 import com.azure.search.test.environment.models.Author;

sdk/search/azure-search/src/test/java/com/azure/search/SuggestOptionsHandlerTests.java

@@ -3,7 +3,6 @@
 
 package com.azure.search;
 
-import com.azure.search.common.SuggestOptionsHandler;
 import com.azure.search.models.SuggestOptions;
 import org.junit.Assert;
 import org.junit.Test;

sdk/search/azure-search/src/test/java/com/azure/search/SuggestSyncTests.java

@@ -5,7 +5,6 @@
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.rest.PagedIterableBase;
 import com.azure.core.http.rest.PagedResponse;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.SuggestOptions;
 import com.azure.search.models.SuggestResult;
 import com.azure.search.test.environment.models.Author;

sdk/search/azure-search/src/test/java/com/azure/search/SuggestTestBase.java

@@ -7,7 +7,6 @@
 import com.azure.core.implementation.serializer.jsonwrapper.JsonWrapper;
 import com.azure.core.implementation.serializer.jsonwrapper.api.JsonApi;
 import com.azure.core.implementation.serializer.jsonwrapper.jacksonwrapper.JacksonDeserializer;
-import com.azure.search.common.SuggestPagedResponse;
 import com.azure.search.models.SuggestResult;
 import com.azure.search.test.environment.models.Hotel;
 import org.junit.Assert;

sdk/search/azure-search/src/test/java/com/azure/search/models/GeoPointTests.java

@@ -4,7 +4,7 @@
 package com.azure.search.models;
 
 import com.azure.core.http.rest.PagedIterableBase;
-import com.azure.search.common.SearchPagedResponse;
+import com.azure.search.SearchPagedResponse;
 
 import com.azure.search.SearchIndexClient;
 import com.azure.search.implementation.SerializationUtil;