Skip to content

Commit

Permalink
Core: add GlobalUsings.cs and remove redundant usings
Browse files Browse the repository at this point in the history
- help cleanup the using sections a bit
  • Loading branch information
KrzysFR committed Jul 31, 2024
1 parent cfc6489 commit 0290664
Show file tree
Hide file tree
Showing 57 changed files with 80 additions and 101 deletions.
6 changes: 1 addition & 5 deletions Aspire.FoundationDB.Hosting/FdbAspireHostingExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@

namespace Aspire.Hosting
{
using System;
using System.Globalization;
using System.Net;
using System.Net.Sockets;
using System.Text;
using Aspire.Hosting.ApplicationModel;
using Aspire.Hosting.Publishing;
using Doxense.Diagnostics.Contracts;
using FoundationDB.Client;
using JetBrains.Annotations;

/// <summary>Provides extension methods for adding FoundationDB resources to an <see cref="IDistributedApplicationBuilder"/>.</summary>
[PublicAPI]
Expand Down Expand Up @@ -147,6 +143,7 @@ public static IResourceBuilder<FdbConnectionResource> WithClusterVersion(this IR
/// <param name="name">Name of the FoundationDB cluster resource (ex: "fdb")</param>
/// <param name="apiVersion">API version that is requested by the application</param>
/// <param name="root">Root subspace location used by the application, in the cluster keyspace.</param>
/// <param name="port">Custom port for the docker container</param>
/// <param name="clusterVersion">If not <c>null</c>, specifies the targeted version for the cluster nodes (ex: "7.2.5", "7.3.27", "7.2.*", "7.*", ..)</param>
/// <param name="rollForward">Specifies the policy used to optionally select a more recent version</param>
public static IResourceBuilder<FdbClusterResource> AddFoundationDb(this IDistributedApplicationBuilder builder, string name, int apiVersion, string root, int? port = null, string? clusterVersion = null, FdbVersionPolicy? rollForward = null)
Expand Down Expand Up @@ -242,7 +239,6 @@ public static IResourceBuilder<FdbClusterResource> AddFoundationDb(this IDistrib
// we are the coordinator so point it back to itself
context.EnvironmentVariables["FDB_COORDINATOR_PORT"] = ep.Port.ToString(CultureInfo.InvariantCulture);
});
;

return cluster;
}
Expand Down
2 changes: 0 additions & 2 deletions Aspire.FoundationDB.Hosting/FdbClusterResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@

namespace Aspire.Hosting.ApplicationModel
{
using System;
using System.Data.Common;
using System.Globalization;
using FoundationDB.Client;

/// <summary>Represents a FoundationDB cluster resource in a distributed application.</summary>
/// <remarks>During local developement, a local docker image is used to run a single-node cluster.</remarks>
Expand Down
2 changes: 0 additions & 2 deletions Aspire.FoundationDB.Hosting/FdbConnectionResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@

namespace Aspire.Hosting.ApplicationModel
{
using System;
using System.Data.Common;
using FoundationDB.Client;

/// <summary>Represents an externally hosted FoundationDB Cluster in a distributed application.</summary>
public class FdbConnectionResource : Resource, IFdbResource
Expand Down
1 change: 0 additions & 1 deletion Aspire.FoundationDB.Hosting/FdbVersionPolicy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace Aspire.Hosting.ApplicationModel
{
using System;

/// <summary>Specify the versionning rules for the FoundationDB docker image</summary>
public enum FdbVersionPolicy
Expand Down
22 changes: 22 additions & 0 deletions Aspire.FoundationDB.Hosting/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
global using System;
global using Doxense.Diagnostics.Contracts;
global using FoundationDB.Client;

// JetBrains Annotations
global using CollectionAccessAttribute = JetBrains.Annotations.CollectionAccessAttribute;
global using CollectionAccessType = JetBrains.Annotations.CollectionAccessType;
global using ContractAnnotationAttribute = JetBrains.Annotations.ContractAnnotationAttribute;
global using InstantHandleAttribute = JetBrains.Annotations.InstantHandleAttribute;
global using InvokerParameterNameAttribute = JetBrains.Annotations.InvokerParameterNameAttribute;
global using ImplicitUseTargetFlags = JetBrains.Annotations.ImplicitUseTargetFlags;
global using LinqTunnelAttribute = JetBrains.Annotations.LinqTunnelAttribute;
global using MustUseReturnValueAttribute = JetBrains.Annotations.MustUseReturnValueAttribute;
global using MustDisposeResourceAttribute = JetBrains.Annotations.MustDisposeResourceAttribute;
global using NoEnumerationAttribute = JetBrains.Annotations.NoEnumerationAttribute;
global using PositiveAttribute = JetBrains.Annotations.PositiveAttribute;
global using PowerOfTwoAttribute = JetBrains.Annotations.PowerOfTwoAttribute;
global using PublicAPIAttribute = JetBrains.Annotations.PublicAPIAttribute;
global using PureAttribute = System.Diagnostics.Contracts.PureAttribute;
global using StringFormatMethodAttribute = JetBrains.Annotations.StringFormatMethodAttribute;
global using UsedImplicitlyAttribute = JetBrains.Annotations.UsedImplicitlyAttribute;
global using UsedImplUsedImplicitlyAttributeicitly = JetBrains.Annotations.UsedImplicitlyAttribute;
1 change: 0 additions & 1 deletion Aspire.FoundationDB.Hosting/IFdbResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace Aspire.Hosting.ApplicationModel
{
using System;

/// <summary>Represents a FoundationDB resource that requires a cluster file.</summary>
public interface IFdbResource : IResourceWithConnectionString
Expand Down
22 changes: 22 additions & 0 deletions Doxense.Networking.Http/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
global using System;
global using Doxense.Diagnostics.Contracts;
global using Doxense.Serialization.Json;

// JetBrains Annotations
global using CollectionAccessAttribute = JetBrains.Annotations.CollectionAccessAttribute;
global using CollectionAccessType = JetBrains.Annotations.CollectionAccessType;
global using ContractAnnotationAttribute = JetBrains.Annotations.ContractAnnotationAttribute;
global using InstantHandleAttribute = JetBrains.Annotations.InstantHandleAttribute;
global using InvokerParameterNameAttribute = JetBrains.Annotations.InvokerParameterNameAttribute;
global using ImplicitUseTargetFlags = JetBrains.Annotations.ImplicitUseTargetFlags;
global using LinqTunnelAttribute = JetBrains.Annotations.LinqTunnelAttribute;
global using MustUseReturnValueAttribute = JetBrains.Annotations.MustUseReturnValueAttribute;
global using MustDisposeResourceAttribute = JetBrains.Annotations.MustDisposeResourceAttribute;
global using NoEnumerationAttribute = JetBrains.Annotations.NoEnumerationAttribute;
global using PositiveAttribute = JetBrains.Annotations.PositiveAttribute;
global using PowerOfTwoAttribute = JetBrains.Annotations.PowerOfTwoAttribute;
global using PublicAPIAttribute = JetBrains.Annotations.PublicAPIAttribute;
global using PureAttribute = System.Diagnostics.Contracts.PureAttribute;
global using StringFormatMethodAttribute = JetBrains.Annotations.StringFormatMethodAttribute;
global using UsedImplicitlyAttribute = JetBrains.Annotations.UsedImplicitlyAttribute;
global using UsedImplUsedImplicitlyAttributeicitly = JetBrains.Annotations.UsedImplicitlyAttribute;
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http.Headers;
Expand Down
2 changes: 0 additions & 2 deletions Doxense.Networking.Http/Networking/Http/BetterHttpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Net;
Expand All @@ -36,7 +35,6 @@ namespace Doxense.Networking.Http
using System.Runtime.ExceptionServices;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Diagnostics.Contracts;
using Microsoft.Extensions.Logging;
using NodaTime;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
Expand All @@ -37,9 +36,6 @@ namespace Doxense.Networking.Http
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Linq;
using Doxense.Diagnostics.Contracts;
using Doxense.Serialization.Json;
using JetBrains.Annotations;
using Microsoft.IO;
using OpenTelemetry.Trace;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,9 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Net;
using System.Net.Http;
Expand All @@ -19,8 +17,6 @@ namespace Doxense.Networking.Http
using System.Security.Cryptography.X509Certificates;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Diagnostics.Contracts;
using JetBrains.Annotations;

/// <summary>Version non-"protected" de <see cref="System.Net.Http.HttpClientHandler"/></summary>
[PublicAPI]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@

namespace Doxense.Networking.Http
{
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Http;
using System.Net.Security;
using System.Security.Authentication;
using System.Security.Cryptography.X509Certificates;
using Doxense.Diagnostics.Contracts;

/// <summary>Base class of generic options for <see cref="BetterHttpClient">HTTP clients</see></summary>
public record BetterHttpClientOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;
using Doxense.Diagnostics.Contracts;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Linq;
using System.Net;
using System.Net.Http;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Threading;

internal static class CorrelationIdGenerator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Diagnostics.Contracts;
using Doxense.Serialization.Json;

public static class CrystalJsonContentExtensions
{
Expand All @@ -53,7 +50,7 @@ public static class CrystalJsonContentExtensions
return ReadFromJsonObjectAsyncCore(content, sourceEncoding, settings, ct);
}

private static async Task<JsonObject> ReadFromJsonObjectAsyncCore(HttpContent content, Encoding? sourceEncoding, CrystalJsonSettings? settings, CancellationToken ct)
private static async Task<JsonObject?> ReadFromJsonObjectAsyncCore(HttpContent content, Encoding? sourceEncoding, CrystalJsonSettings? settings, CancellationToken ct)
{
var bytes = await content.ReadAsByteArrayAsync(ct).ConfigureAwait(false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;
using Doxense.Diagnostics.Contracts;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using static Doxense.Networking.Http.BetterHttpClient;

public class DefaultBetterHttpClientFactory : IBetterHttpClientFactory
{
Expand Down Expand Up @@ -66,7 +63,7 @@ public HttpMessageHandler CreateHttpHandler(Uri hostAddress, BetterHttpClientOpt
var handler = this.Map.CreateBetterHttpHandler(hostAddress, options);

// add our own delegating handler that will be able to hook into the request lifecycle
handler = new MagicalHandler(handler);
handler = new BetterHttpClient.MagicalHandler(handler);

// add any optional wrappers on top of that
if (options.Handlers.Count > 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;

public interface IBetterHttpClientFactory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Threading.Tasks;

public interface IBetterHttpFilter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Sockets;

public interface IBetterHttpHooks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;

public interface IBetterHttpProtocol : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;

public interface IBetterHttpProtocolFactory<out TProtocol, out TOptions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Networking.Http
{
using System;

public record RestHttpClientOptions : BetterHttpClientOptions
{
Expand Down
3 changes: 0 additions & 3 deletions Doxense.Networking.Http/Networking/Http/RestHttpProtocol.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@

namespace Doxense.Networking.Http
{
using System;
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Serialization.Json;
using JetBrains.Annotations;

/// <summary>Generic HTTP protocol that exposes all HTTP verbes without any custom processing</summary>
[PublicAPI]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

namespace Doxense.Networking.Http
{
using System;
using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection;

[PublicAPI]
Expand Down
2 changes: 0 additions & 2 deletions Doxense.Networking.Http/Networking/INetworkMap.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ namespace Doxense.Networking
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Net;
using System.Net.Http;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Networking.Http;
using JetBrains.Annotations;
using NodaTime;

/// <summary>Provides services to interract with the real (or simulated) network</summary>
Expand Down
3 changes: 0 additions & 3 deletions Doxense.Networking.Http/Networking/Json/CrystalJsonContent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

namespace Doxense.Serialization.Json
{
using System;
using System.Buffers;
using System.Diagnostics;
using System.IO;
Expand All @@ -35,9 +34,7 @@ namespace Doxense.Serialization.Json
using System.Net.Http.Headers;
using System.Text;
using System.Threading.Tasks;
using Doxense.Diagnostics.Contracts;
using Doxense.Serialization;
using JetBrains.Annotations;
using OpenTelemetry.Trace;

/// <summary><see cref="HttpContent"/> that uses <see cref="CrystalJson"/> to serialize JSON payloads</summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,9 @@

namespace Doxense.AspNetCore.Common.Json
{
using System;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Doxense.Diagnostics.Contracts;
using Doxense.Serialization.Json;
using JetBrains.Annotations;

[PublicAPI]
public static class CrystalJsonHttpMessageExtensions
Expand Down
Loading

0 comments on commit 0290664

Please sign in to comment.