Revert breaking namespace changes (#425)

Reverts #200, #202, #203, #205, #206, #207, #208, #209 Signed-off-by: Thomas Farr <tsfarr@amazon.com>
opensearch-project · Nov 8, 2023 · d347903 · d347903
1 parent 91117e4
commit d347903
Show file tree

Hide file tree

Showing 597 changed files with 386 additions and 619 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,6 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### ⚠️ Breaking Changes ⚠️
-- Moved `OpenSearch.Client` request classes into their respective namespaces to match those in `OpenSearch.Net` ([#200](https://github.com/opensearch-project/opensearch-net/pull/200), [#202](https://github.com/opensearch-project/opensearch-net/pull/202), [#203](https://github.com/opensearch-project/opensearch-net/pull/203), [#205](https://github.com/opensearch-project/opensearch-net/pull/205), [#206](https://github.com/opensearch-project/opensearch-net/pull/206), [#207](https://github.com/opensearch-project/opensearch-net/pull/207), [#208](https://github.com/opensearch-project/opensearch-net/pull/208), [#209](https://github.com/opensearch-project/opensearch-net/pull/209))
 - Removed support for the `net461` target ([#256](https://github.com/opensearch-project/opensearch-net/pull/256))
 - Fixed naming of `ClusterManagerTimeout` and `MasterTimeout` properties from `*TimeSpanout` in the low-level client ([#332](https://github.com/opensearch-project/opensearch-net/pull/332))
 
@@ -111,4 +110,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 [Unreleased]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...main
 [1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0
-[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
+[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
diff --git a/src/ApiGenerator/Views/HighLevel/Descriptors/Descriptors.cshtml b/src/ApiGenerator/Views/HighLevel/Descriptors/Descriptors.cshtml
@@ -27,7 +27,7 @@ using OpenSearch.Net.Utf8Json;
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client@(ns)
+namespace OpenSearch.Client
 {
 @foreach (var endpoint in endpoints)
 {

diff --git a/src/ApiGenerator/Views/HighLevel/Requests/Requests.cshtml b/src/ApiGenerator/Views/HighLevel/Requests/Requests.cshtml
@@ -27,7 +27,7 @@ using OpenSearch.Net.Utf8Json;
 // ReSharper disable UnusedTypeParameter
 // ReSharper disable PartialMethodWithSinglePart
 // ReSharper disable RedundantNameQualifier
-namespace OpenSearch.Client@(ns)
+namespace OpenSearch.Client
 {
 @foreach (var endpoint in endpoints)
 {

diff --git a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatAliasesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs b/src/OpenSearch.Client/Cat/CatAliases/CatAliasesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.aliases.json")]
 	public partial interface ICatAliasesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRecord.cs
@@ -29,7 +29,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatAllocationRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs b/src/OpenSearch.Client/Cat/CatAllocation/CatAllocationRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.allocation.json")]
 	public partial interface ICatAllocationRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/2.0/opensearch/rest-api/cat/cat-cluster_manager/">here</see>

diff --git a/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs b/src/OpenSearch.Client/Cat/CatClusterManager/CatClusterManagerRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.cluster_manager.json")]
 	///<remarks>Introduced in OpenSearch 2.0 instead of <see cref="ICatMasterRequest"/></remarks>

diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatCountRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs b/src/OpenSearch.Client/Cat/CatCount/CatCountRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.count.json")]
 	public partial interface ICatCountRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	[JsonFormatter(typeof(CatFielddataRecordFormatter))]

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRecordJsonConverter.cs
@@ -31,7 +31,7 @@
 using OpenSearch.Net.Utf8Json.Internal;
 
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	internal class CatFielddataRecordFormatter : IJsonFormatter<CatFielddataRecord>
 	{

diff --git a/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs b/src/OpenSearch.Client/Cat/CatFielddata/CatFielddataRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.fielddata.json")]
 	public partial interface ICatFielddataRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatHealthRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs b/src/OpenSearch.Client/Cat/CatHealth/CatHealthRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.health.json")]
 	public partial interface ICatHealthRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatHelpRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs b/src/OpenSearch.Client/Cat/CatHelp/CatHelpRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.help.json")]
 	public partial interface ICatHelpRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs b/src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
@@ -33,7 +33,7 @@
 using OpenSearch.Net;
 using OpenSearch.Net.Extensions;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	internal class CatHelpResponseBuilder : CustomResponseBuilderBase
 	{

diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatIndicesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs b/src/OpenSearch.Client/Cat/CatIndices/CatIndicesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.indices.json")]
 	public partial interface ICatIndicesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	/// <summary>
 	/// See docs <see href="https://opensearch.org/docs/1.2/opensearch/rest-api/cat/cat-master/">here</see>

diff --git a/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs b/src/OpenSearch.Client/Cat/CatMaster/CatMasterRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.master.json")]
 	/// <remarks>Deprecated as of OpenSearch 2.0, use <see cref="ICatClusterManagerRequest"/> instead</remarks>

diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatNodeAttributesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs b/src/OpenSearch.Client/Cat/CatNodeAttributes/CatNodeAttributesRequest.cs
@@ -28,7 +28,7 @@
 
 #pragma warning disable 612, 618
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.nodeattrs.json")]
 	public partial interface ICatNodeAttributesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatNodesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs b/src/OpenSearch.Client/Cat/CatNodes/CatNodesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.nodes.json")]
 	public partial interface ICatNodesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatPendingTasksRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs b/src/OpenSearch.Client/Cat/CatPendingTasks/CatPendingTasksRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.pending_tasks.json")]
 	public partial interface ICatPendingTasksRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatPluginsRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs b/src/OpenSearch.Client/Cat/CatPlugins/CatPluginsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.plugins.json")]
 	public partial interface ICatPluginsRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatRecoveryRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs b/src/OpenSearch.Client/Cat/CatRecovery/CatRecoveryRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.recovery.json")]
 	public partial interface ICatRecoveryRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatRepositoriesRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs b/src/OpenSearch.Client/Cat/CatRepositories/CatRepositoriesRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.repositories.json")]
 	public partial interface ICatRepositoriesRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatResponse.cs b/src/OpenSearch.Client/Cat/CatResponse.cs
@@ -30,7 +30,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatResponse<TCatRecord> : ResponseBase

diff --git a/src/OpenSearch.Client/Cat/CatResponseBuilder.cs b/src/OpenSearch.Client/Cat/CatResponseBuilder.cs
@@ -32,7 +32,7 @@
 using System.Threading.Tasks;
 using OpenSearch.Net;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	internal class CatResponseBuilder<TCatRecord> : CustomResponseBuilderBase where TCatRecord : ICatRecord
 	{

diff --git a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatSegmentsRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs b/src/OpenSearch.Client/Cat/CatSegments/CatSegmentsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.segments.json")]
 	public partial interface ICatSegmentsRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs b/src/OpenSearch.Client/Cat/CatShards/CatShardsRecord.cs
@@ -28,7 +28,7 @@
 
 using System.Runtime.Serialization;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatShardsRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs b/src/OpenSearch.Client/Cat/CatShards/CatShardsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.shards.json")]
 	public partial interface ICatShardsRequest { }

diff --git a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRecord.cs
@@ -29,7 +29,7 @@
 using System.Runtime.Serialization;
 using OpenSearch.Net.Utf8Json;
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[DataContract]
 	public class CatSnapshotsRecord : ICatRecord

diff --git a/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs b/src/OpenSearch.Client/Cat/CatSnapshots/CatSnapshotsRequest.cs
@@ -26,7 +26,7 @@
 *  under the License.
 */
 
-namespace OpenSearch.Client.Specification.CatApi
+namespace OpenSearch.Client
 {
 	[MapsApi("cat.snapshots.json")]
 	public partial interface ICatSnapshotsRequest { }