Rename Couchbase.Text.Json to Couchbase.Core

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

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;

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;

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;

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;

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;
 

src/Couchbase.Analytics/Couchbase.Analytics.csproj

@@ -34,7 +34,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Couchbase.Text.Json\Couchbase.Text.Json.csproj" />
+      <ProjectReference Include="..\Couchbase.Core\Couchbase.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>

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;

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;
 

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;
 
@@ -39,7 +39,7 @@
     /// <param name="responseStream"><see cref="Stream"/> to read.</param>
     /// <param name="serializer">The <see cref="ISerializer"/> to use for converting the response to an object.</param>
     /// <param name="ownedForCleanup">Additional object to dispose when complete.</param>
     protected AnalyticsResultBase(Stream responseStream, IDeserializer serializer, IDisposable? ownedForCleanup = null)
     {
         ResponseStream = responseStream ?? throw new ArgumentNullException(nameof(responseStream));
         Serializer = serializer;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 
@@ -52,4 +52,4 @@
     public int ProcessedObjects { get; init; }
 
     [JsonPropertyName("bufferCacheHitRatio")]
     public string BufferCacheHitRatio { get; init; }

src/Couchbase.Analytics/Results/AnalyticsRow.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-using Couchbase.Text.Json;
+using Couchbase.Core.Json;
 
 namespace Couchbase.AnalyticsClient.Results;
 

src/Couchbase.Text.Json/Internal/JsonElementExtensions.cs → src/Couchbase.Core/Internal/JsonElementExtensions.cs

@@ -2,7 +2,7 @@
 
 using System.Text.Json;
 
-namespace Couchbase.Text.Json.Internal;
+namespace Couchbase.Core.Internal;
 
 /// <summary>
 /// Extensions for <see cref="JsonElement"/>.

src/Couchbase.Text.Json/Internal/JsonToken.cs → 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
 {

src/Couchbase.Text.Json/IDeserializer.cs → src/Couchbase.Core/Json/IDeserializer.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 public interface IDeserializer
 {

src/Couchbase.Text.Json/IJsonStreamReader.cs → src/Couchbase.Core/Json/IJsonStreamReader.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <summary>
 /// Reads values and objects from a JSON stream asynchronously.

src/Couchbase.Text.Json/IJsonToken.cs → src/Couchbase.Core/Json/IJsonToken.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <summary>
 /// Used to support dynamic object reading during streaming JSON deserialization.

src/Couchbase.Text.Json/ISerializer.cs → src/Couchbase.Core/Json/ISerializer.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <summary>
 /// The Default serializer that is based on System.Text.Json

src/Couchbase.Text.Json/ISerializerDeserializer.cs → src/Couchbase.Core/Json/ISerializerDeserializer.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 public interface ISerializerDeserializer
 {

src/Couchbase.Text.Json/JsonStreamExtensions.cs → src/Couchbase.Core/Json/JsonStreamExtensions.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <summary>
 /// Extensions for <seealso cref="IJsonStreamReader"/>.

src/Couchbase.Text.Json/JsonStreamReader.cs → 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
 {

src/Couchbase.Text.Json/MillisecondsStringJsonConverter.cs → 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;
 
 /// <summary>
 /// Serializes and deserializes <see cref="TimeSpan"/> as the number of whole milliseconds in the format

src/Couchbase.Text.Json/StjJsonDeserializer.cs → src/Couchbase.Core/Json/StjJsonDeserializer.cs

@@ -21,7 +21,7 @@
 
 using System.Text.Json;
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <inheritdoc />>
 public class StjJsonDeserializer(JsonSerializerOptions jsonSerializerOptions): IDeserializer

src/Couchbase.Text.Json/StjJsonSerializer.cs → src/Couchbase.Core/Json/StjJsonSerializer.cs

@@ -21,7 +21,7 @@
 
 using System.Text.Json;
 
-namespace Couchbase.Text.Json;
+namespace Couchbase.Core.Json;
 
 /// <inheritdoc />
 public class StjJsonSerializer(JsonSerializerOptions jsonSerializerOptions) : ISerializer

src/Couchbase.Text.Json/Utils/InterfaceStabilityAttribute.cs → src/Couchbase.Core/Utils/InterfaceStabilityAttribute.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json.Utils;
+namespace Couchbase.Core.Utils;
 
 /// <summary>
 /// Annotation for the interface stability of a given API. A stable interface is one that

src/Couchbase.Text.Json/Utils/LightweightStopwatch.cs → src/Couchbase.Core/Utils/LightweightStopwatch.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json.Utils;
+namespace Couchbase.Core.Utils;
 
 /// <summary>
 /// A lightweight stopwatch implementation for measuring elapsed time.

src/Couchbase.Text.Json/Utils/StabilityLevel.cs → src/Couchbase.Core/Utils/StabilityLevel.cs

@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Text.Json.Utils;
+namespace Couchbase.Core.Utils;
 
 /// <summary>
 /// Designates the interface stability of a given API; how likely the interface is to change or be removed entirely.

tests/Couchbase.Analytics.FunctionalTests/ClusterTests.cs

@@ -1,4 +1,3 @@
-using System.Net;
 using Couchbase.AnalyticsClient.FunctionalTests.Fixtures;
 using Xunit;
 using Xunit.Abstractions;

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;
 

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;

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")]

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;
 

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;

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;

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
     {

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
 {