diff --git a/Couchbase.Analytics.sln b/Couchbase.Analytics.sln index 9c47b3d..3263e60 100644 --- a/Couchbase.Analytics.sln +++ b/Couchbase.Analytics.sln @@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fit", "fit", "{A58FEC0E-429 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchbase.Analytics.Performer.UnitTests", "fit\Couchbase.Analytics.Performer.UnitTests\Couchbase.Analytics.Performer.UnitTests.csproj", "{65B53BDA-D674-4CD8-A5DC-763A8F816F0B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchbase.Text.Json", "src\Couchbase.Text.Json\Couchbase.Text.Json.csproj", "{0B9D51A9-E71B-4151-A177-73BE3BE34FCD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchbase.Core", "src\Couchbase.Core\Couchbase.Core.csproj", "{0B9D51A9-E71B-4151-A177-73BE3BE34FCD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -68,4 +68,4 @@ Global {0B9D51A9-E71B-4151-A177-73BE3BE34FCD}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B9D51A9-E71B-4151-A177-73BE3BE34FCD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection -EndGlobal +EndGlobal \ No newline at end of file diff --git a/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerCrossService.cs b/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerCrossService.cs index cefa189..4aa86f1 100644 --- a/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerCrossService.cs +++ b/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerCrossService.cs @@ -6,7 +6,7 @@ using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Results; using Couchbase.Grpc.Protocol.Columnar; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Utils; using Google.Protobuf.WellKnownTypes; using Grpc.Core; using Error = Couchbase.Grpc.Protocol.Columnar.Error; diff --git a/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerService.cs b/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerService.cs index c051361..6c9dc31 100644 --- a/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerService.cs +++ b/fit/Couchbase.Analytics.Performer/Internal/Services/AnalyticsPerformerService.cs @@ -6,7 +6,7 @@ using Couchbase.AnalyticsClient; using Couchbase.Grpc.Protocol.Columnar; using Couchbase.Grpc.Protocol.Shared; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Utils; using Google.Protobuf.WellKnownTypes; using Grpc.Core; using Exception = System.Exception; diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/EmptyResultOrFailureResponseExtensions.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/EmptyResultOrFailureResponseExtensions.cs index 39b2d51..780572b 100644 --- a/fit/Couchbase.Analytics.Performer/Internal/Utils/EmptyResultOrFailureResponseExtensions.cs +++ b/fit/Couchbase.Analytics.Performer/Internal/Utils/EmptyResultOrFailureResponseExtensions.cs @@ -1,6 +1,5 @@ -using System.Diagnostics; using Couchbase.Grpc.Protocol.Columnar; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Utils; using Google.Protobuf.WellKnownTypes; namespace Couchbase.Analytics.Performer.Internal.Utils; diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs index b5055ed..d495ce3 100644 --- a/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs +++ b/fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs @@ -1,7 +1,7 @@ using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Query; using Couchbase.Grpc.Protocol.Columnar; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Google.Protobuf.Collections; using Google.Protobuf.WellKnownTypes; using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException; diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/PerformerQuery.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/PerformerQuery.cs index 0720323..24fbd5e 100644 --- a/fit/Couchbase.Analytics.Performer/Internal/Utils/PerformerQuery.cs +++ b/fit/Couchbase.Analytics.Performer/Internal/Utils/PerformerQuery.cs @@ -1,9 +1,5 @@ using Couchbase.AnalyticsClient.Results; using Couchbase.Grpc.Protocol.Columnar; -using Google.Protobuf; -using Google.Protobuf.Collections; -using Google.Protobuf.WellKnownTypes; -using Error = Couchbase.Grpc.Protocol.Columnar.Error; namespace Couchbase.Analytics.Performer.Internal.Utils; diff --git a/src/Couchbase.Analytics/Couchbase.Analytics.csproj b/src/Couchbase.Analytics/Couchbase.Analytics.csproj index 50c361d..b05885b 100644 --- a/src/Couchbase.Analytics/Couchbase.Analytics.csproj +++ b/src/Couchbase.Analytics/Couchbase.Analytics.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/Couchbase.Analytics/Internal/AnalyticsService.cs b/src/Couchbase.Analytics/Internal/AnalyticsService.cs index 91e0e13..36978bf 100644 --- a/src/Couchbase.Analytics/Internal/AnalyticsService.cs +++ b/src/Couchbase.Analytics/Internal/AnalyticsService.cs @@ -27,8 +27,8 @@ using Couchbase.AnalyticsClient.Internal.Retry; using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Results; -using Couchbase.Text.Json; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Json; +using Couchbase.Core.Utils; using Microsoft.Extensions.Logging; namespace Couchbase.AnalyticsClient.Internal; diff --git a/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs index 0912c4a..f970e79 100644 --- a/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs +++ b/src/Couchbase.Analytics/Internal/DI/DefaultServices.cs @@ -21,7 +21,7 @@ using System.Text.Json; using Couchbase.AnalyticsClient.Internal.HTTP; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs index a7edf97..b80875e 100644 --- a/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs +++ b/src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs @@ -22,7 +22,7 @@ using System.Net; using Couchbase.AnalyticsClient.Query; using Couchbase.AnalyticsClient.Results; -using Couchbase.Text.Json; +using Couchbase.Core.Json; namespace Couchbase.AnalyticsClient.Internal.Results; diff --git a/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs index 65c66f7..5e3c0f5 100644 --- a/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs +++ b/src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs @@ -24,7 +24,7 @@ using Couchbase.AnalyticsClient.Query; using Couchbase.AnalyticsClient.Results; using Couchbase.AnalyticsClient.Utils; -using Couchbase.Text.Json; +using Couchbase.Core.Json; namespace Couchbase.AnalyticsClient.Internal.Results; diff --git a/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs index 5e724b9..027579e 100644 --- a/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs +++ b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs @@ -22,7 +22,7 @@ using System.Runtime.CompilerServices; using Couchbase.AnalyticsClient.Query; using Couchbase.AnalyticsClient.Results; -using Couchbase.Text.Json; +using Couchbase.Core.Json; namespace Couchbase.AnalyticsClient.Internal.Results; diff --git a/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs b/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs index 00be13e..30fcc15 100644 --- a/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs +++ b/src/Couchbase.Analytics/Internal/Retry/ErrorContext.cs @@ -23,7 +23,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using Couchbase.AnalyticsClient.Query; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Utils; namespace Couchbase.AnalyticsClient.Internal.Retry; diff --git a/src/Couchbase.Analytics/Options/ClusterOptions.cs b/src/Couchbase.Analytics/Options/ClusterOptions.cs index 96708af..465cfcc 100644 --- a/src/Couchbase.Analytics/Options/ClusterOptions.cs +++ b/src/Couchbase.Analytics/Options/ClusterOptions.cs @@ -26,7 +26,7 @@ using Couchbase.AnalyticsClient.Internal; using Couchbase.AnalyticsClient.Internal.DI; using Couchbase.AnalyticsClient.Internal.Utils; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Utils; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Couchbase.Analytics/Options/QueryOptions.cs b/src/Couchbase.Analytics/Options/QueryOptions.cs index 5c31c2b..cdeb72c 100644 --- a/src/Couchbase.Analytics/Options/QueryOptions.cs +++ b/src/Couchbase.Analytics/Options/QueryOptions.cs @@ -21,8 +21,8 @@ using System.Text.Json; using Couchbase.AnalyticsClient.Query; -using Couchbase.Text.Json; -using Couchbase.Text.Json.Utils; +using Couchbase.Core.Json; +using Couchbase.Core.Utils; namespace Couchbase.AnalyticsClient.Options; diff --git a/src/Couchbase.Analytics/Query/QueryMetrics.cs b/src/Couchbase.Analytics/Query/QueryMetrics.cs index bf3bcff..94e1e70 100644 --- a/src/Couchbase.Analytics/Query/QueryMetrics.cs +++ b/src/Couchbase.Analytics/Query/QueryMetrics.cs @@ -20,7 +20,7 @@ #endregion using System.Text.Json.Serialization; -using Couchbase.Text.Json; +using Couchbase.Core.Json; namespace Couchbase.AnalyticsClient.Query; diff --git a/src/Couchbase.Analytics/Results/AnalyticsRow.cs b/src/Couchbase.Analytics/Results/AnalyticsRow.cs index bb51ce6..6c5fa91 100644 --- a/src/Couchbase.Analytics/Results/AnalyticsRow.cs +++ b/src/Couchbase.Analytics/Results/AnalyticsRow.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -using Couchbase.Text.Json; +using Couchbase.Core.Json; namespace Couchbase.AnalyticsClient.Results; diff --git a/src/Couchbase.Text.Json/Couchbase.Text.Json.csproj b/src/Couchbase.Core/Couchbase.Core.csproj similarity index 100% rename from src/Couchbase.Text.Json/Couchbase.Text.Json.csproj rename to src/Couchbase.Core/Couchbase.Core.csproj diff --git a/src/Couchbase.Text.Json/Internal/JsonElementExtensions.cs b/src/Couchbase.Core/Internal/JsonElementExtensions.cs similarity index 99% rename from src/Couchbase.Text.Json/Internal/JsonElementExtensions.cs rename to src/Couchbase.Core/Internal/JsonElementExtensions.cs index b785090..a702e3b 100644 --- a/src/Couchbase.Text.Json/Internal/JsonElementExtensions.cs +++ b/src/Couchbase.Core/Internal/JsonElementExtensions.cs @@ -2,7 +2,7 @@ using System.Text.Json; -namespace Couchbase.Text.Json.Internal; +namespace Couchbase.Core.Internal; /// /// Extensions for . diff --git a/src/Couchbase.Text.Json/Internal/JsonToken.cs b/src/Couchbase.Core/Internal/JsonToken.cs similarity index 96% rename from src/Couchbase.Text.Json/Internal/JsonToken.cs rename to src/Couchbase.Core/Internal/JsonToken.cs index 79f5773..d5a15dd 100644 --- a/src/Couchbase.Text.Json/Internal/JsonToken.cs +++ b/src/Couchbase.Core/Internal/JsonToken.cs @@ -1,7 +1,8 @@ using System.Dynamic; using System.Text.Json; +using Couchbase.Core.Json; -namespace Couchbase.Text.Json.Internal; +namespace Couchbase.Core.Internal; internal sealed class JsonToken : IJsonToken { diff --git a/src/Couchbase.Text.Json/IDeserializer.cs b/src/Couchbase.Core/Json/IDeserializer.cs similarity index 98% rename from src/Couchbase.Text.Json/IDeserializer.cs rename to src/Couchbase.Core/Json/IDeserializer.cs index f6ff723..a119fb8 100644 --- a/src/Couchbase.Text.Json/IDeserializer.cs +++ b/src/Couchbase.Core/Json/IDeserializer.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; public interface IDeserializer { diff --git a/src/Couchbase.Text.Json/IJsonStreamReader.cs b/src/Couchbase.Core/Json/IJsonStreamReader.cs similarity index 99% rename from src/Couchbase.Text.Json/IJsonStreamReader.cs rename to src/Couchbase.Core/Json/IJsonStreamReader.cs index 9fe19a2..c01d320 100644 --- a/src/Couchbase.Text.Json/IJsonStreamReader.cs +++ b/src/Couchbase.Core/Json/IJsonStreamReader.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// /// Reads values and objects from a JSON stream asynchronously. diff --git a/src/Couchbase.Text.Json/IJsonToken.cs b/src/Couchbase.Core/Json/IJsonToken.cs similarity index 98% rename from src/Couchbase.Text.Json/IJsonToken.cs rename to src/Couchbase.Core/Json/IJsonToken.cs index b06bd1c..f9aa73c 100644 --- a/src/Couchbase.Text.Json/IJsonToken.cs +++ b/src/Couchbase.Core/Json/IJsonToken.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// /// Used to support dynamic object reading during streaming JSON deserialization. diff --git a/src/Couchbase.Text.Json/ISerializer.cs b/src/Couchbase.Core/Json/ISerializer.cs similarity index 97% rename from src/Couchbase.Text.Json/ISerializer.cs rename to src/Couchbase.Core/Json/ISerializer.cs index fb43fd7..c57432b 100644 --- a/src/Couchbase.Text.Json/ISerializer.cs +++ b/src/Couchbase.Core/Json/ISerializer.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// /// The Default serializer that is based on System.Text.Json diff --git a/src/Couchbase.Text.Json/ISerializerDeserializer.cs b/src/Couchbase.Core/Json/ISerializerDeserializer.cs similarity index 96% rename from src/Couchbase.Text.Json/ISerializerDeserializer.cs rename to src/Couchbase.Core/Json/ISerializerDeserializer.cs index 5fa536b..5670963 100644 --- a/src/Couchbase.Text.Json/ISerializerDeserializer.cs +++ b/src/Couchbase.Core/Json/ISerializerDeserializer.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; public interface ISerializerDeserializer { diff --git a/src/Couchbase.Text.Json/JsonStreamExtensions.cs b/src/Couchbase.Core/Json/JsonStreamExtensions.cs similarity index 99% rename from src/Couchbase.Text.Json/JsonStreamExtensions.cs rename to src/Couchbase.Core/Json/JsonStreamExtensions.cs index b0e9493..3ea6a7b 100644 --- a/src/Couchbase.Text.Json/JsonStreamExtensions.cs +++ b/src/Couchbase.Core/Json/JsonStreamExtensions.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// /// Extensions for . diff --git a/src/Couchbase.Text.Json/JsonStreamReader.cs b/src/Couchbase.Core/Json/JsonStreamReader.cs similarity index 99% rename from src/Couchbase.Text.Json/JsonStreamReader.cs rename to src/Couchbase.Core/Json/JsonStreamReader.cs index fade99e..388cbd0 100644 --- a/src/Couchbase.Text.Json/JsonStreamReader.cs +++ b/src/Couchbase.Core/Json/JsonStreamReader.cs @@ -27,9 +27,9 @@ using System.Runtime.InteropServices; using System.Text.Json; using System.Text.Json.Serialization.Metadata; -using Couchbase.Text.Json.Internal; +using Couchbase.Core.Internal; -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; public sealed class JsonStreamReader : IJsonStreamReader { diff --git a/src/Couchbase.Text.Json/MillisecondsStringJsonConverter.cs b/src/Couchbase.Core/Json/MillisecondsStringJsonConverter.cs similarity index 99% rename from src/Couchbase.Text.Json/MillisecondsStringJsonConverter.cs rename to src/Couchbase.Core/Json/MillisecondsStringJsonConverter.cs index e87978f..1f52faa 100644 --- a/src/Couchbase.Text.Json/MillisecondsStringJsonConverter.cs +++ b/src/Couchbase.Core/Json/MillisecondsStringJsonConverter.cs @@ -19,11 +19,11 @@ * ************************************************************/ #endregion +using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; -using System.Globalization; -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// /// Serializes and deserializes as the number of whole milliseconds in the format diff --git a/src/Couchbase.Text.Json/StjJsonDeserializer.cs b/src/Couchbase.Core/Json/StjJsonDeserializer.cs similarity index 98% rename from src/Couchbase.Text.Json/StjJsonDeserializer.cs rename to src/Couchbase.Core/Json/StjJsonDeserializer.cs index 0be07d8..85a23e2 100644 --- a/src/Couchbase.Text.Json/StjJsonDeserializer.cs +++ b/src/Couchbase.Core/Json/StjJsonDeserializer.cs @@ -21,7 +21,7 @@ using System.Text.Json; -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// > public class StjJsonDeserializer(JsonSerializerOptions jsonSerializerOptions): IDeserializer diff --git a/src/Couchbase.Text.Json/StjJsonSerializer.cs b/src/Couchbase.Core/Json/StjJsonSerializer.cs similarity index 97% rename from src/Couchbase.Text.Json/StjJsonSerializer.cs rename to src/Couchbase.Core/Json/StjJsonSerializer.cs index f3ceae6..6ce2808 100644 --- a/src/Couchbase.Text.Json/StjJsonSerializer.cs +++ b/src/Couchbase.Core/Json/StjJsonSerializer.cs @@ -21,7 +21,7 @@ using System.Text.Json; -namespace Couchbase.Text.Json; +namespace Couchbase.Core.Json; /// public class StjJsonSerializer(JsonSerializerOptions jsonSerializerOptions) : ISerializer diff --git a/src/Couchbase.Text.Json/Utils/InterfaceStabilityAttribute.cs b/src/Couchbase.Core/Utils/InterfaceStabilityAttribute.cs similarity index 97% rename from src/Couchbase.Text.Json/Utils/InterfaceStabilityAttribute.cs rename to src/Couchbase.Core/Utils/InterfaceStabilityAttribute.cs index 4c18611..fd5edd9 100644 --- a/src/Couchbase.Text.Json/Utils/InterfaceStabilityAttribute.cs +++ b/src/Couchbase.Core/Utils/InterfaceStabilityAttribute.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json.Utils; +namespace Couchbase.Core.Utils; /// /// Annotation for the interface stability of a given API. A stable interface is one that diff --git a/src/Couchbase.Text.Json/Utils/LightweightStopwatch.cs b/src/Couchbase.Core/Utils/LightweightStopwatch.cs similarity index 97% rename from src/Couchbase.Text.Json/Utils/LightweightStopwatch.cs rename to src/Couchbase.Core/Utils/LightweightStopwatch.cs index 113c0ae..f5f9e7b 100644 --- a/src/Couchbase.Text.Json/Utils/LightweightStopwatch.cs +++ b/src/Couchbase.Core/Utils/LightweightStopwatch.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json.Utils; +namespace Couchbase.Core.Utils; /// /// A lightweight stopwatch implementation for measuring elapsed time. diff --git a/src/Couchbase.Text.Json/Utils/StabilityLevel.cs b/src/Couchbase.Core/Utils/StabilityLevel.cs similarity index 98% rename from src/Couchbase.Text.Json/Utils/StabilityLevel.cs rename to src/Couchbase.Core/Utils/StabilityLevel.cs index e12d09f..eba1b83 100644 --- a/src/Couchbase.Text.Json/Utils/StabilityLevel.cs +++ b/src/Couchbase.Core/Utils/StabilityLevel.cs @@ -19,7 +19,7 @@ * ************************************************************/ #endregion -namespace Couchbase.Text.Json.Utils; +namespace Couchbase.Core.Utils; /// /// Designates the interface stability of a given API; how likely the interface is to change or be removed entirely. diff --git a/tests/Couchbase.Analytics.FunctionalTests/ClusterTests.cs b/tests/Couchbase.Analytics.FunctionalTests/ClusterTests.cs index 9628225..82983f1 100644 --- a/tests/Couchbase.Analytics.FunctionalTests/ClusterTests.cs +++ b/tests/Couchbase.Analytics.FunctionalTests/ClusterTests.cs @@ -1,4 +1,3 @@ -using System.Net; using Couchbase.AnalyticsClient.FunctionalTests.Fixtures; using Xunit; using Xunit.Abstractions; diff --git a/tests/Couchbase.Analytics.FunctionalTests/Fixtures/Analytics2Fixture.cs b/tests/Couchbase.Analytics.FunctionalTests/Fixtures/Analytics2Fixture.cs index 7ecf5bf..04a6395 100644 --- a/tests/Couchbase.Analytics.FunctionalTests/Fixtures/Analytics2Fixture.cs +++ b/tests/Couchbase.Analytics.FunctionalTests/Fixtures/Analytics2Fixture.cs @@ -1,8 +1,6 @@ -using System.Net; using Couchbase.AnalyticsClient.HTTP; using Couchbase.AnalyticsClient.Options; using Microsoft.Extensions.Configuration; -using Xunit; namespace Couchbase.AnalyticsClient.FunctionalTests.Fixtures; diff --git a/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs b/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs index 7a7c6fd..585714a 100644 --- a/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs +++ b/tests/Couchbase.Analytics.FunctionalTests/Internal/CouchbaseHttpClientTests.cs @@ -5,6 +5,7 @@ using System.Net; using Couchbase.AnalyticsClient.DnsUtil; using Couchbase.AnalyticsClient.Exceptions; +using Couchbase.AnalyticsClient.FunctionalTests.Utils; using Couchbase.AnalyticsClient.Internal; using Couchbase.AnalyticsClient.Internal.DI; using Couchbase.AnalyticsClient.Internal.DnsUtil; diff --git a/tests/Couchbase.Analytics.FunctionalTests/Utils/GreetingResponse.cs b/tests/Couchbase.Analytics.FunctionalTests/Utils/GreetingResponse.cs index 045f9be..32d2879 100644 --- a/tests/Couchbase.Analytics.FunctionalTests/Utils/GreetingResponse.cs +++ b/tests/Couchbase.Analytics.FunctionalTests/Utils/GreetingResponse.cs @@ -1,5 +1,7 @@ using System.Text.Json.Serialization; + namespace Couchbase.AnalyticsClient.FunctionalTests.Utils; + public class GreetingResponse { [JsonPropertyName("greeting")] diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs index 0942c92..3973a86 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs @@ -1,16 +1,13 @@ using System.Net; -using System.Net.Http.Headers; -using System.Runtime.InteropServices.JavaScript; using System.Text; using Couchbase.AnalyticsClient.Internal; using Couchbase.AnalyticsClient.Internal.HTTP; using Couchbase.AnalyticsClient.Internal.Results; using Couchbase.AnalyticsClient.Options; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Microsoft.Extensions.Logging; using Moq; using Moq.Protected; -using Newtonsoft.Json; using Xunit; using Xunit.Abstractions; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs index 6e07a6b..739b8d7 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs @@ -1,7 +1,5 @@ -using System.Text.Json; using Couchbase.AnalyticsClient.Internal.Results; -using Couchbase.Text.Json; -using Newtonsoft.Json; +using Couchbase.Core.Json; using Xunit; namespace Couchbase.AnalyticsClient.UnitTests.Internal; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs index 87d0660..934c91b 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs @@ -7,7 +7,7 @@ using Couchbase.AnalyticsClient.Internal.HTTP; using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Query; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Microsoft.Extensions.Logging; using Moq; using Moq.Protected; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs index d406e87..5f16cc9 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/DI/ConstructorSelectorTests.cs @@ -1,9 +1,8 @@ -using System; using Couchbase.AnalyticsClient.Internal.DI; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace Couchbase.Analytics.UnitTests.Internal +namespace Couchbase.AnalyticsClient.UnitTests.Internal.DI { public class ConstructorSelectorTests { diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs index a9fe285..6107a8b 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/ConnectCallbackRoundRobinTests.cs @@ -11,7 +11,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -namespace Couchbase.AnalyticsClient.UnitTests.Internal.HTTP; +namespace Couchbase.AnalyticsClient.UnitTests.Internal.DnsUtil; public class ConnectCallbackRoundRobinTests { diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs index b244b21..abb573c 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/DnsUtil/EndpointSelectionStrategyTests.cs @@ -1,7 +1,5 @@ using System.Net; using Xunit; -using System.Linq; -using System.Reflection; using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies; using Xunit.Abstractions; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs index 27ae055..969f3c0 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs @@ -1,6 +1,5 @@ using Moq; using Xunit; -using Couchbase.Text.Json; using Microsoft.Extensions.Logging; using System.Net; using System.Text; @@ -9,6 +8,7 @@ using Couchbase.AnalyticsClient.Internal.HTTP; using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Query; +using Couchbase.Core.Json; using Moq.Protected; namespace Couchbase.AnalyticsClient.UnitTests.Internal; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs index 247cd6c..e8ccf11 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; -using Couchbase.AnalyticsClient; using Couchbase.AnalyticsClient.Options; using Couchbase.AnalyticsClient.Query; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Xunit; namespace Couchbase.AnalyticsClient.UnitTests.Internal; diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs index 646d045..a956ff7 100644 --- a/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs +++ b/tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs @@ -1,6 +1,6 @@ using System.Text.Json; using Couchbase.AnalyticsClient.Internal.Results; -using Couchbase.Text.Json; +using Couchbase.Core.Json; using Moq; using Xunit; using Xunit.Abstractions;