couchbaselabs · emilienbev · Oct 1, 2025 · Sep 25, 2025
diff --git a/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs b/fit/Couchbase.Analytics.Performer/Internal/Utils/ExceptionExtensions.cs
@@ -3,6 +3,7 @@
 using InvalidCredentialException = Couchbase.AnalyticsClient.Exceptions.InvalidCredentialException;
 using QueryException = Couchbase.AnalyticsClient.Exceptions.QueryException;
 
+
 namespace Couchbase.Analytics.Performer.Internal.Utils;
 
 internal static class ExceptionExtensions

diff --git a/src/Couchbase.Analytics/Certificates/CertificateValidation.cs b/src/Couchbase.Analytics/Certificates/CertificateValidation.cs
@@ -19,9 +19,9 @@
  * ************************************************************/
 #endregion
 
+using System.Net.Security;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using System.Net.Security;
 using Couchbase.AnalyticsClient.Options;
 using Microsoft.Extensions.Logging;
 
@@ -210,16 +210,16 @@
            }
            else if (securityOptions.TrustMode == CertificateTrustMode.PemFilePath)
            {
                trustedCertificates.Add(new X509Certificate2(securityOptions.PathToPemFileValue));
            }
            else if (securityOptions.TrustMode == CertificateTrustMode.PemString)
            {
                trustedCertificates.Add(new X509Certificate2(
                    rawData: System.Text.Encoding.ASCII.GetBytes(securityOptions.CertificateValue)));
            }
            else if (securityOptions.TrustMode == CertificateTrustMode.CertificatesOnly)
            {
                trustedCertificates.AddRange(securityOptions.CertificatesValue);
            }

            LogBuiltCustomTrustCollection(logger, trustedCertificates.Count);

diff --git a/src/Couchbase.Analytics/Cluster.cs b/src/Couchbase.Analytics/Cluster.cs
@@ -20,8 +20,9 @@
 #endregion
 
 using System.Collections.Concurrent;
-using Couchbase.AnalyticsClient.DI;
 using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal;
+using Couchbase.AnalyticsClient.Internal.DI;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Results;
 using Microsoft.Extensions.Logging;
@@ -104,7 +105,7 @@
    /// <returns>A Cluster instance</returns>
    /// <exception cref="ArgumentException">Thrown when the connection string is null or empty, or the credential is null</exception>
    public static Cluster Create(string connectionString, Credential credential){
        return Create(connectionString, credential, (ClusterOptions?)null);
    }

    /// <summary>

diff --git a/src/Couchbase.Analytics/Couchbase.Analytics.csproj b/src/Couchbase.Analytics/Couchbase.Analytics.csproj
@@ -22,6 +22,15 @@
     <ItemGroup>
       <ProjectReference Include="..\Couchbase.Text.Json\Couchbase.Text.Json.csproj" />
     </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Internal\Certificates\" />
+      <Folder Include="Internal\Exceptions\" />
+      <Folder Include="Internal\Options\" />
+      <Folder Include="Internal\Query\" />
+      <Folder Include="Public\" />
+      <Folder Include="Retry\" />
+    </ItemGroup>
 
 
 </Project>
diff --git a/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs b/src/Couchbase.Analytics/Exceptions/AnalyticsException.cs
@@ -21,8 +21,7 @@
 
 using System.Runtime.Serialization;
 using System.Text;
-using System.Text.Json;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
 
 namespace Couchbase.AnalyticsClient.Exceptions;
 
@@ -37,7 +36,7 @@
    {
    }

    protected AnalyticsException(SerializationInfo info, StreamingContext context) : base(info, context)
    {
    }


diff --git a/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs b/src/Couchbase.Analytics/Exceptions/AnalyticsTimeoutException.cs
@@ -20,7 +20,7 @@
 #endregion
 
 using System.Runtime.Serialization;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
 
 namespace Couchbase.AnalyticsClient.Exceptions;
 

diff --git a/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs b/src/Couchbase.Analytics/Exceptions/InvalidCredentialException.cs
@@ -20,8 +20,7 @@
 #endregion
 
 using System.Runtime.Serialization;
-using System.Text.Json;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
 
 namespace Couchbase.AnalyticsClient.Exceptions;
 

diff --git a/src/Couchbase.Analytics/Exceptions/QueryException.cs b/src/Couchbase.Analytics/Exceptions/QueryException.cs
@@ -20,7 +20,7 @@
 #endregion
 
 using System.Runtime.Serialization;
-using Couchbase.AnalyticsClient.Retry;
+using Couchbase.AnalyticsClient.Internal.Retry;
 
 namespace Couchbase.AnalyticsClient.Exceptions;
 

diff --git a/src/Couchbase.Analytics/AnalyticsService.cs → ...se.Analytics/Internal/AnalyticsService.cs b/src/Couchbase.Analytics/AnalyticsService.cs → ...se.Analytics/Internal/AnalyticsService.cs
@@ -22,14 +22,16 @@
 using System.Text;
 using Couchbase.AnalyticsClient.Exceptions;
 using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
+using Couchbase.AnalyticsClient.Internal.Results;
+using Couchbase.AnalyticsClient.Internal.Retry;
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Results;
-using Couchbase.AnalyticsClient.Retry;
 using Couchbase.Text.Json;
 using Couchbase.Text.Json.Utils;
 using Microsoft.Extensions.Logging;
 
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
 
 internal sealed class AnalyticsService : HttpServiceBase, IAnalyticsService
 {

diff --git a/src/Couchbase.Analytics/ConnectionString.cs → ...se.Analytics/Internal/ConnectionString.cs b/src/Couchbase.Analytics/ConnectionString.cs → ...se.Analytics/Internal/ConnectionString.cs
@@ -21,9 +21,10 @@
 
 using System.Text;
 using System.Text.RegularExpressions;
+using Couchbase.AnalyticsClient.Internal.Utils;
 using Couchbase.AnalyticsClient.Utils;
 
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
 
 internal class ConnectionString
 {

diff --git a/...hbase.Analytics/DI/ConstructorSelector.cs → ...lytics/Internal/DI/ConstructorSelector.cs b/...hbase.Analytics/DI/ConstructorSelector.cs → ...lytics/Internal/DI/ConstructorSelector.cs
@@ -22,7 +22,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 internal static class ConstructorSelector
 {

diff --git a/....Analytics/DI/CouchbaseServiceProvider.cs → ...s/Internal/DI/CouchbaseServiceProvider.cs b/....Analytics/DI/CouchbaseServiceProvider.cs → ...s/Internal/DI/CouchbaseServiceProvider.cs
@@ -21,7 +21,7 @@
 
 using System.Collections.ObjectModel;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 internal sealed class CouchbaseServiceProvider : ICouchbaseServiceProvider
 {

diff --git a/.../DI/CouchbaseServiceProviderExtensions.cs → .../DI/CouchbaseServiceProviderExtensions.cs b/.../DI/CouchbaseServiceProviderExtensions.cs → .../DI/CouchbaseServiceProviderExtensions.cs
@@ -21,7 +21,7 @@
 
 using Couchbase.AnalyticsClient.Utils;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// Extensions for <seealso cref="IServiceProvider"/>.

diff --git a/...Couchbase.Analytics/DI/DefaultServices.cs → ....Analytics/Internal/DI/DefaultServices.cs b/...Couchbase.Analytics/DI/DefaultServices.cs → ....Analytics/Internal/DI/DefaultServices.cs
@@ -20,12 +20,12 @@
 #endregion
 
 using System.Text.Json;
-using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.HTTP;
 using Couchbase.Text.Json;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 internal static class DefaultServices
 {

diff --git a/...Analytics/DI/ICouchbaseServiceProvider.cs → .../Internal/DI/ICouchbaseServiceProvider.cs b/...Analytics/DI/ICouchbaseServiceProvider.cs → .../Internal/DI/ICouchbaseServiceProvider.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// Extends <see cref="IServiceProvider"/> with a method to test for service registration.

diff --git a/...Couchbase.Analytics/DI/IServiceFactory.cs → ....Analytics/Internal/DI/IServiceFactory.cs b/...Couchbase.Analytics/DI/IServiceFactory.cs → ....Analytics/Internal/DI/IServiceFactory.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// A factory capable of returning a service.

diff --git a/src/Couchbase.Analytics/DI/LazyService.cs → ...base.Analytics/Internal/DI/LazyService.cs b/src/Couchbase.Analytics/DI/LazyService.cs → ...base.Analytics/Internal/DI/LazyService.cs
@@ -22,7 +22,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Couchbase.AnalyticsClient.Exceptions;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// References a singleton of a service that isn't instantiated until required.

diff --git a/...ytics/DI/PreferredConstructorAttribute.cs → ...ernal/DI/PreferredConstructorAttribute.cs b/...ytics/DI/PreferredConstructorAttribute.cs → ...ernal/DI/PreferredConstructorAttribute.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// Marks a public constructor as preferred for selection by service factories. If applied, the
@@ -28,6 +28,6 @@ namespace Couchbase.AnalyticsClient.DI;
 /// attribute.
 /// </summary>
 [AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
-public sealed class PreferredConstructorAttribute : Attribute
+internal sealed class PreferredConstructorAttribute : Attribute
 {
 }
diff --git a/...tics/DI/SingletonGenericServiceFactory.cs → ...rnal/DI/SingletonGenericServiceFactory.cs b/...tics/DI/SingletonGenericServiceFactory.cs → ...rnal/DI/SingletonGenericServiceFactory.cs
@@ -23,7 +23,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Couchbase.AnalyticsClient.Utils;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// Implementation of <see cref="IServiceFactory"/> which constructs more specific types

diff --git a/...e.Analytics/DI/SingletonServiceFactory.cs → ...cs/Internal/DI/SingletonServiceFactory.cs b/...e.Analytics/DI/SingletonServiceFactory.cs → ...cs/Internal/DI/SingletonServiceFactory.cs
@@ -22,7 +22,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Couchbase.AnalyticsClient.Utils;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 internal sealed class SingletonServiceFactory : IServiceFactory
 {

diff --git a/...e.Analytics/DI/TransientServiceFactory.cs → ...cs/Internal/DI/TransientServiceFactory.cs b/...e.Analytics/DI/TransientServiceFactory.cs → ...cs/Internal/DI/TransientServiceFactory.cs
@@ -22,7 +22,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Couchbase.AnalyticsClient.Utils;
 
-namespace Couchbase.AnalyticsClient.DI;
+namespace Couchbase.AnalyticsClient.Internal.DI;
 
 /// <summary>
 /// Implementation of <see cref="IServiceFactory"/> which creates a transient

diff --git a/...Analytics/DnsUtil/DnsEndpointConnector.cs → .../Internal/DnsUtil/DnsEndpointConnector.cs b/...Analytics/DnsUtil/DnsEndpointConnector.cs → .../Internal/DnsUtil/DnsEndpointConnector.cs
@@ -21,9 +21,10 @@
 
 using System.Net;
 using System.Net.Sockets;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
 
 /// <summary>
 /// Adapted from https://github.com/MihaZupan/DnsRoundRobin.

diff --git a/....Analytics/DnsUtil/DnsEndpointResolver.cs → ...s/Internal/DnsUtil/DnsEndpointResolver.cs b/....Analytics/DnsUtil/DnsEndpointResolver.cs → ...s/Internal/DnsUtil/DnsEndpointResolver.cs
@@ -20,9 +20,10 @@
 #endregion
 
 using System.Net;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
 
 internal class DnsEndpointResolver : IDnsEndpointResolver
 {

diff --git a/...tics/DnsUtil/EndpointConnectionManager.cs → ...rnal/DnsUtil/EndpointConnectionManager.cs b/...tics/DnsUtil/EndpointConnectionManager.cs → ...rnal/DnsUtil/EndpointConnectionManager.cs
@@ -21,11 +21,11 @@
 
 using System.Net;
 using System.Net.Sockets;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
 
 internal class EndpointConnectionManager
 {

diff --git a/...nalytics/DnsUtil/EndpointSelectionMode.cs → ...Internal/DnsUtil/EndpointSelectionMode.cs b/...nalytics/DnsUtil/EndpointSelectionMode.cs → ...Internal/DnsUtil/EndpointSelectionMode.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DnsUtil;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil;
 
 internal enum EndpointSelectionMode
 {

diff --git a/...trategies/CountBasedDnsRefreshStrategy.cs → ...trategies/CountBasedDnsRefreshStrategy.cs b/...trategies/CountBasedDnsRefreshStrategy.cs → ...trategies/CountBasedDnsRefreshStrategy.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal class CountBasedDnsRefreshStrategy : IDnsRefreshStrategy
 {

diff --git a/...DnsUtil/Strategies/IDnsRefreshStrategy.cs → ...DnsUtil/Strategies/IDnsRefreshStrategy.cs b/...DnsUtil/Strategies/IDnsRefreshStrategy.cs → ...DnsUtil/Strategies/IDnsRefreshStrategy.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal interface IDnsRefreshStrategy
 {

diff --git a/.../Strategies/IEndpointSelectionStrategy.cs → .../Strategies/IEndpointSelectionStrategy.cs b/.../Strategies/IEndpointSelectionStrategy.cs → .../Strategies/IEndpointSelectionStrategy.cs
@@ -21,7 +21,7 @@
 
 using System.Net;
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal interface IEndpointSelectionStrategy
 {

diff --git a/...Util/Strategies/RandomEndpointSelector.cs → ...Util/Strategies/RandomEndpointSelector.cs b/...Util/Strategies/RandomEndpointSelector.cs → ...Util/Strategies/RandomEndpointSelector.cs
@@ -21,7 +21,7 @@
 
 using System.Net;
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal class RandomEndpointSelector : IEndpointSelectionStrategy
 {

diff --git a/.../Strategies/RoundRobinEndpointSelector.cs → .../Strategies/RoundRobinEndpointSelector.cs b/.../Strategies/RoundRobinEndpointSelector.cs → .../Strategies/RoundRobinEndpointSelector.cs
@@ -21,7 +21,7 @@
 
 using System.Net;
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal class RoundRobinEndpointSelector : IEndpointSelectionStrategy
 {

diff --git a/...Strategies/TimeBasedDnsRefreshStrategy.cs → ...Strategies/TimeBasedDnsRefreshStrategy.cs b/...Strategies/TimeBasedDnsRefreshStrategy.cs → ...Strategies/TimeBasedDnsRefreshStrategy.cs
@@ -21,7 +21,7 @@
 
 using System.Diagnostics;
 
-namespace Couchbase.AnalyticsClient.DnsUtil.Strategies;
+namespace Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
 
 internal class TimeBasedDnsRefreshStrategy : IDnsRefreshStrategy
 {

diff --git a/...e.Analytics/HTTP/AuthenticationHandler.cs → ...cs/Internal/HTTP/AuthenticationHandler.cs b/...e.Analytics/HTTP/AuthenticationHandler.cs → ...cs/Internal/HTTP/AuthenticationHandler.cs
@@ -21,8 +21,9 @@
 
 using System.Net.Http.Headers;
 using System.Text;
+using Couchbase.AnalyticsClient.HTTP;
 
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
 
 internal class AuthenticationHandler : DelegatingHandler
 {

diff --git a/...lytics/HTTP/CouchbaseHttpClientFactory.cs → ...ternal/HTTP/CouchbaseHttpClientFactory.cs b/...lytics/HTTP/CouchbaseHttpClientFactory.cs → ...ternal/HTTP/CouchbaseHttpClientFactory.cs
@@ -22,13 +22,14 @@
 using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
 using Couchbase.AnalyticsClient.Certificates;
-using Couchbase.AnalyticsClient.DnsUtil;
-using Couchbase.AnalyticsClient.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.HTTP;
+using Couchbase.AnalyticsClient.Internal.DnsUtil;
+using Couchbase.AnalyticsClient.Internal.DnsUtil.Strategies;
+using Couchbase.AnalyticsClient.Internal.Utils;
 using Couchbase.AnalyticsClient.Options;
-using Couchbase.AnalyticsClient.Utils;
 using Microsoft.Extensions.Logging;
 
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
 
 internal class CouchbaseHttpClientFactory : ICouchbaseHttpClientFactory
 {

diff --git a/...uchbase.Analytics/HTTP/HttpServiceBase.cs → ...nalytics/Internal/HTTP/HttpServiceBase.cs b/...uchbase.Analytics/HTTP/HttpServiceBase.cs → ...nalytics/Internal/HTTP/HttpServiceBase.cs
@@ -19,9 +19,9 @@
  * ************************************************************/
 #endregion
 
-using Couchbase.AnalyticsClient.Utils;
+using Couchbase.AnalyticsClient.Internal.Utils;
 
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
 
 /// <summary>
 /// Base class for HTTP services to inherit from to provide consistent access to clusterOptions,

diff --git a/...ytics/HTTP/ICouchbaseHttpClientFactory.cs → ...ernal/HTTP/ICouchbaseHttpClientFactory.cs b/...ytics/HTTP/ICouchbaseHttpClientFactory.cs → ...ernal/HTTP/ICouchbaseHttpClientFactory.cs
@@ -19,7 +19,7 @@
  * ************************************************************/
 #endregion
 
-namespace Couchbase.AnalyticsClient.HTTP;
+namespace Couchbase.AnalyticsClient.Internal.HTTP;
 
 /// <summary>
 /// Creates an <see cref="HttpClient"/> which may be safely configured and disposed, but while

diff --git a/src/Couchbase.Analytics/IAnalyticsService.cs → ...e.Analytics/Internal/IAnalyticsService.cs b/src/Couchbase.Analytics/IAnalyticsService.cs → ...e.Analytics/Internal/IAnalyticsService.cs
@@ -22,7 +22,7 @@
 using Couchbase.AnalyticsClient.Options;
 using Couchbase.AnalyticsClient.Results;
 
-namespace Couchbase.AnalyticsClient;
+namespace Couchbase.AnalyticsClient.Internal;
 
 internal interface IAnalyticsService
 {