Skip to content

Move EA-specific json classes to the SDK #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffrymorris merged 1 commit into from
Oct 7, 2025
Merged

Move EA-specific json classes to the SDK #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fit/Couchbase.Analytics.Performer/Internal/Utils/OptionsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Analytics/Internal/AnalyticsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Analytics/Internal/DI/DefaultServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Analytics/Internal/Results/AnalyticsResultBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/Couchbase.Analytics/Internal/Results/BlockingAnalyticsResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/Couchbase.Analytics/Internal/Results/StreamingAnalyticsResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/Couchbase.Core/Json/IDeserializer.cs → ...Couchbase.Analytics/Json/IDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
* ************************************************************/
#endregion

namespace Couchbase.Core.Json;
using Couchbase.Core.Json;

namespace Couchbase.AnalyticsClient.Json;

public interface IDeserializer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Core/Json/ISerializer.cs → src/Couchbase.Analytics/Json/ISerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* ************************************************************/
#endregion

namespace Couchbase.Core.Json;
namespace Couchbase.AnalyticsClient.Json;

/// <summary>
/// The Default serializer that is based on System.Text.Json
Expand Down
2 changes: 1 addition & 1 deletion ...base.Core/Json/ISerializerDeserializer.cs → ...Analytics/Json/ISerializerDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* ************************************************************/
#endregion

namespace Couchbase.Core.Json;
namespace Couchbase.AnalyticsClient.Json;

public interface ISerializerDeserializer
{
Expand Down
3 changes: 2 additions & 1 deletion ...ouchbase.Core/Json/StjJsonDeserializer.cs → ...ase.Analytics/Json/StjJsonDeserializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Core/Json/StjJsonSerializer.cs → ...hbase.Analytics/Json/StjJsonSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

using System.Text.Json;

namespace Couchbase.Core.Json;
namespace Couchbase.AnalyticsClient.Json;

/// <inheritdoc />
public class StjJsonSerializer(JsonSerializerOptions jsonSerializerOptions) : ISerializer
Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Analytics/Options/ClusterOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Couchbase.Analytics/Options/QueryOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/Couchbase.Analytics.UnitTests/Internal/AnalyticsServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Couchbase.Analytics.UnitTests/Internal/BlockingAnalyticsResultTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Couchbase.AnalyticsClient.Internal.Results;
using Couchbase.Core.Json;
using Couchbase.AnalyticsClient.Json;
using Xunit;

namespace Couchbase.AnalyticsClient.UnitTests.Internal;
Expand Down
2 changes: 1 addition & 1 deletion tests/Couchbase.Analytics.UnitTests/Internal/ClusterRetryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Couchbase.Analytics.UnitTests/Internal/QueryContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Couchbase.Analytics.UnitTests/Internal/QueryOptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions tests/Couchbase.Analytics.UnitTests/Internal/StreamingAnalyticsResultTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading