From aec5c634cf1195e0f2651285423b8fb68c4363d3 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 20 Jun 2022 08:48:52 +0100 Subject: [PATCH] Remove helpers namespace --- benchmarks/Profiling/Program.cs | 1 - .../Client/ElasticsearchClient-BulkAll.cs | 2 +- .../Helpers/BlockingSubscribeExtensions.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObserver.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/BulkAllResponse.cs | 2 +- .../Helpers/CoordinatedRequestDefaults.cs | 2 +- .../Helpers/CoordinatedRequestObserverBase.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/HelperIdentifiers.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/IHelperCallable.cs | 2 +- src/Elastic.Clients.Elasticsearch/Helpers/PartitionHelper.cs | 2 +- .../Helpers/ProducerConsumerBackPressure.cs | 2 +- .../Helpers/RequestMetaDataExtensions.cs | 2 +- .../Helpers/RequestMetaDataFactory.cs | 2 +- .../Helpers/RequestParametersExtensions.cs | 2 +- .../ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs | 1 - .../ManagedElasticsearch/NodeSeeders/TimeSeriesSeeder.cs | 1 - .../ClientConcepts/HighLevel/Indexing/IndexingDocuments.doc.cs | 1 - .../Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs | 1 - .../Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs | 1 - tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs | 1 - tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs | 1 - 24 files changed, 16 insertions(+), 24 deletions(-) diff --git a/benchmarks/Profiling/Program.cs b/benchmarks/Profiling/Program.cs index 1bed7eea0d2..3fbb4693f29 100644 --- a/benchmarks/Profiling/Program.cs +++ b/benchmarks/Profiling/Program.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Text; using Elastic.Clients.Elasticsearch; -using Elastic.Clients.Elasticsearch.Helpers; using Elastic.Transport; using JetBrains.Profiler.Api; diff --git a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs index 30d3d10131e..d55a6ed1fa5 100644 --- a/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs +++ b/src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-BulkAll.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Threading; -using Elastic.Clients.Elasticsearch.Helpers; +using Elastic.Clients.Elasticsearch; namespace Elastic.Clients.Elasticsearch; diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BlockingSubscribeExtensions.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BlockingSubscribeExtensions.cs index 6375dfc1259..b7d0b8838b4 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BlockingSubscribeExtensions.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BlockingSubscribeExtensions.cs @@ -6,7 +6,7 @@ using System; using System.Threading; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public static class BlockingSubscribeExtensions { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs index de21a87e799..7a77ef9ae38 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObservable.cs @@ -13,7 +13,7 @@ using Elastic.Transport.Extensions; using Elastic.Transport.Products.Elasticsearch; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public sealed class BulkAllObservable : IDisposable, IObservable { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObserver.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObserver.cs index 3bb12c8c280..d0e0b327264 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObserver.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllObserver.cs @@ -5,7 +5,7 @@ using System; using System.Threading; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public sealed class BulkAllObserver : CoordinatedRequestObserverBase { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs index a2ef41f94e8..327fc2bf463 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllRequest.cs @@ -7,7 +7,7 @@ using System.Text.Json; using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public sealed class BulkAllRequest : IBulkAllRequest, IHelperCallable { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllResponse.cs b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllResponse.cs index d8a417145e0..d0333fa3a40 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllResponse.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/BulkAllResponse.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public sealed class BulkAllResponse { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestDefaults.cs b/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestDefaults.cs index 3304d654cc0..930ffdddf13 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestDefaults.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestDefaults.cs @@ -4,7 +4,7 @@ using System; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal static class CoordinatedRequestDefaults { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestObserverBase.cs b/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestObserverBase.cs index 9dd6a6941a9..5f66f7f0367 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestObserverBase.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/CoordinatedRequestObserverBase.cs @@ -5,7 +5,7 @@ using System; using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public abstract class CoordinatedRequestObserverBase : IObserver { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/HelperIdentifiers.cs b/src/Elastic.Clients.Elasticsearch/Helpers/HelperIdentifiers.cs index 26aff2693eb..156bcd50c9f 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/HelperIdentifiers.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/HelperIdentifiers.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal static class HelperIdentifiers { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs b/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs index 4ea16e1580a..bca56b329b3 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/IBulkAllRequest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; -namespace Elastic.Clients.Elasticsearch.Helpers +namespace Elastic.Clients.Elasticsearch { public interface IBulkAllRequest { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/IHelperCallable.cs b/src/Elastic.Clients.Elasticsearch/Helpers/IHelperCallable.cs index c571f1ee6b3..18f320b85c0 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/IHelperCallable.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/IHelperCallable.cs @@ -4,7 +4,7 @@ using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; /// /// May be applied to helper requests where they may be called by an upstream helper. diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/PartitionHelper.cs b/src/Elastic.Clients.Elasticsearch/Helpers/PartitionHelper.cs index 1909e783e22..ea89d130820 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/PartitionHelper.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/PartitionHelper.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal class PartitionHelper : IEnumerable> { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/ProducerConsumerBackPressure.cs b/src/Elastic.Clients.Elasticsearch/Helpers/ProducerConsumerBackPressure.cs index f5c354f3140..d7e8db23c82 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/ProducerConsumerBackPressure.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/ProducerConsumerBackPressure.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; public sealed class ProducerConsumerBackPressure { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataExtensions.cs b/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataExtensions.cs index d5eb4a7eeab..591981f17a8 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataExtensions.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataExtensions.cs @@ -5,7 +5,7 @@ using System; using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal static class RequestMetaDataExtensions { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataFactory.cs b/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataFactory.cs index 7abd25d12cb..87a76eb77f6 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataFactory.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/RequestMetaDataFactory.cs @@ -4,7 +4,7 @@ using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal static class RequestMetaDataFactory { diff --git a/src/Elastic.Clients.Elasticsearch/Helpers/RequestParametersExtensions.cs b/src/Elastic.Clients.Elasticsearch/Helpers/RequestParametersExtensions.cs index 7327f888d91..d3ea358e036 100644 --- a/src/Elastic.Clients.Elasticsearch/Helpers/RequestParametersExtensions.cs +++ b/src/Elastic.Clients.Elasticsearch/Helpers/RequestParametersExtensions.cs @@ -6,7 +6,7 @@ using System; using Elastic.Transport; -namespace Elastic.Clients.Elasticsearch.Helpers; +namespace Elastic.Clients.Elasticsearch; internal static class RequestParametersExtensions { diff --git a/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs b/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs index aa68eefb18b..48a08af7088 100644 --- a/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs +++ b/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/DefaultSeeder.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.Threading.Tasks; using Elastic.Clients.Elasticsearch; -using Elastic.Clients.Elasticsearch.Helpers; using Elastic.Clients.Elasticsearch.IndexManagement; using Elastic.Transport; using Tests.Core.Client; diff --git a/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/TimeSeriesSeeder.cs b/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/TimeSeriesSeeder.cs index 3540f6cf424..3473ba71a9e 100644 --- a/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/TimeSeriesSeeder.cs +++ b/tests/Tests.Core/ManagedElasticsearch/NodeSeeders/TimeSeriesSeeder.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Diagnostics; using Elastic.Clients.Elasticsearch; -using Elastic.Clients.Elasticsearch.Helpers; using Elastic.Transport; using Tests.Domain; diff --git a/tests/Tests/ClientConcepts/HighLevel/Indexing/IndexingDocuments.doc.cs b/tests/Tests/ClientConcepts/HighLevel/Indexing/IndexingDocuments.doc.cs index 41a42cb8fb8..0ec92ae2a52 100644 --- a/tests/Tests/ClientConcepts/HighLevel/Indexing/IndexingDocuments.doc.cs +++ b/tests/Tests/ClientConcepts/HighLevel/Indexing/IndexingDocuments.doc.cs @@ -5,7 +5,6 @@ using System; using System.Reactive.Linq; using System.Threading.Tasks; -using Elastic.Clients.Elasticsearch.Helpers; using Tests.Framework.DocumentationTests; namespace Tests.ClientConcepts.HighLevel.Indexing diff --git a/tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs b/tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs index dbbc4793da3..bb43d0afad4 100644 --- a/tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs +++ b/tests/Tests/Document/Multiple/BulkAll/BulkAllCancellationTokenApiTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading; -using Elastic.Clients.Elasticsearch.Helpers; using Tests.Core.ManagedElasticsearch.Clusters; using Tests.Core.Xunit; diff --git a/tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs b/tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs index eb9da763ad8..f8f17accf33 100644 --- a/tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs +++ b/tests/Tests/Document/Multiple/BulkAll/BulkAllDeallocationApiTests.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; -using Elastic.Clients.Elasticsearch.Helpers; using Tests.Core.ManagedElasticsearch.Clusters; namespace Tests.Document.Multiple; diff --git a/tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs b/tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs index 6f1a6dc7af1..fe175afcee6 100644 --- a/tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs +++ b/tests/Tests/Document/Multiple/BulkAll/BulkAllDisposeApiTests.cs @@ -4,7 +4,6 @@ using System; using System.Threading; -using Elastic.Clients.Elasticsearch.Helpers; using Tests.Core.ManagedElasticsearch.Clusters; using Tests.Core.Xunit; diff --git a/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs b/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs index 6fce53e8fb1..2834528a28a 100644 --- a/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs +++ b/tests/Tests/Document/Multiple/BulkAll/BulkOnErrorApiTests.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Elastic.Clients.Elasticsearch.Helpers; using Tests.Core.ManagedElasticsearch.Clusters; namespace Tests.Document.Multiple;