Move EA-specific json classes to the SDK

emilienbev · emilienbev · commit ff5b3006596e · 2025-10-07T16:31:57.000+02:00
diff --git 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.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.Grpc.Protocol.Columnar;
-using Couchbase.Core.Json;
 using Google.Protobuf.Collections;
 using Google.Protobuf.WellKnownTypes;
 using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;
diff --git a/src/Couchbase.Analytics/Internal/AnalyticsService.cs b/src/Couchbase.Analytics/Internal/AnalyticsService.cs
@@ -25,9 +25,9 @@
 using Couchbase.AnalyticsClient.Internal.HTTP;
 using Couchbase.AnalyticsClient.Internal.Results;
 using Couchbase.AnalyticsClient.Internal.Retry;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Results;
-using Couchbase.Core.Json;
 using Couchbase.Core.Utils;
 using Microsoft.Extensions.Logging;
 
diff --git 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.Core.Json;
+using Couchbase.AnalyticsClient.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
@@ -20,9 +20,9 @@
 #endregion
 
 using System.Net;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
-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
@@ -20,6 +20,7 @@
 #endregion
 
 using System.Runtime.CompilerServices;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
diff --git a/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs b/src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
@@ -20,6 +20,7 @@
 #endregion
 
 using System.Runtime.CompilerServices;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
 using Couchbase.AnalyticsClient.Results;
 using Couchbase.Core.Json;
diff --git a/src/Couchbase.Analytics/Json/IDeserializer.cs b/src/Couchbase.Analytics/Json/IDeserializer.cs
@@ -19,7 +19,9 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Core.Json;
+using Couchbase.Core.Json;
+
+namespace Couchbase.AnalyticsClient.Json;
 
 public interface IDeserializer
 {
diff --git a/src/Couchbase.Analytics/Json/ISerializer.cs b/src/Couchbase.Analytics/Json/ISerializer.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Core.Json;
+namespace Couchbase.AnalyticsClient.Json;
 
 /// <summary>
 /// The Default serializer that is based on System.Text.Json
diff --git a/src/Couchbase.Analytics/Json/ISerializerDeserializer.cs b/src/Couchbase.Analytics/Json/ISerializerDeserializer.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.Core.Json;
+namespace Couchbase.AnalyticsClient.Json;
 
 public interface ISerializerDeserializer
 {
diff --git a/src/Couchbase.Analytics/Json/StjJsonDeserializer.cs b/src/Couchbase.Analytics/Json/StjJsonDeserializer.cs
@@ -20,8 +20,9 @@
 #endregion
 
 using System.Text.Json;
+using Couchbase.Core.Json;
 
-namespace Couchbase.Core.Json;
+namespace Couchbase.AnalyticsClient.Json;
 
 /// <inheritdoc />>
 public class StjJsonDeserializer(JsonSerializerOptions jsonSerializerOptions): IDeserializer
diff --git a/src/Couchbase.Analytics/Json/StjJsonSerializer.cs b/src/Couchbase.Analytics/Json/StjJsonSerializer.cs
@@ -21,7 +21,7 @@
 
 using System.Text.Json;
 
-namespace Couchbase.Core.Json;
+namespace Couchbase.AnalyticsClient.Json;
 
 /// <inheritdoc />
 public class StjJsonSerializer(JsonSerializerOptions jsonSerializerOptions) : ISerializer
diff --git 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.Core.Json;
+using Couchbase.AnalyticsClient.Json;
 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
@@ -20,8 +20,8 @@
 #endregion
 
 using System.Text.Json;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Query;
-using Couchbase.Core.Json;
 using Couchbase.Core.Utils;
 
 namespace Couchbase.AnalyticsClient.Options;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
@@ -3,6 +3,7 @@
 using Couchbase.AnalyticsClient.Internal;
 using Couchbase.AnalyticsClient.Internal.HTTP;
 using Couchbase.AnalyticsClient.Internal.Results;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.Core.Json;
 using Microsoft.Extensions.Logging;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
@@ -1,5 +1,5 @@
 using Couchbase.AnalyticsClient.Internal.Results;
-using Couchbase.Core.Json;
+using Couchbase.AnalyticsClient.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
@@ -5,9 +5,9 @@
 using Couchbase.AnalyticsClient.Exceptions;
 using Couchbase.AnalyticsClient.HTTP;
 using Couchbase.AnalyticsClient.Internal.HTTP;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
-using Couchbase.Core.Json;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Moq.Protected;
diff --git a/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs b/tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
@@ -6,9 +6,9 @@
 using Couchbase.AnalyticsClient.DI;
 using Couchbase.AnalyticsClient.HTTP;
 using Couchbase.AnalyticsClient.Internal.HTTP;
+using Couchbase.AnalyticsClient.Json;
 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
@@ -1,6 +1,6 @@
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Query;
-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
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using Couchbase.AnalyticsClient.Internal.Results;
+using Couchbase.AnalyticsClient.Json;
 using Couchbase.Core.Json;
 using Moq;
 using Xunit;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@`
`19`	`19`	`* ************************************************************/`
`20`	`20`	`#endregion`
`21`	`21`
`22`		`-namespace Couchbase.Core.Json;`
	`22`	`+using Couchbase.Core.Json;`
	`23`	`+`
	`24`	`+namespace Couchbase.AnalyticsClient.Json;`
`23`	`25`
`24`	`26`	`public interface IDeserializer`
`25`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* ************************************************************/`
`20`	`20`	`#endregion`
`21`	`21`
`22`		`-namespace Couchbase.Core.Json;`
	`22`	`+namespace Couchbase.AnalyticsClient.Json;`
`23`	`23`
`24`	`24`	`public interface ISerializerDeserializer`
`25`	`25`	`{`