Skip to content
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

Jump to bottom

updated IValidable implementation #12

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

updated IValidable implementation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7ce34b0
updated IValidable implementation
TomasPilatDisig Jun 20, 2023
9341441
updated references
TomasPilatDisig Jul 18, 2023
84b1597
updated references
TomasPilatDisig Aug 10, 2023
2484824
updated references
TomasPilatDisig Aug 19, 2023
91dff45
updated references
TomasPilatDisig Oct 1, 2023
fdc7733
v1.2.19
TomasPilatDisig Feb 25, 2024
e4d3846
fixed GetRequestUri
TomasPilatDisig Feb 28, 2024
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
4 changes: 2 additions & 2 deletions src/Envelope.NetHttp/Envelope.NetHttp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Authors>Tomas Pilat</Authors>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Envelope.snk</AssemblyOriginatorKeyFile>
<Version>1.2.13</Version>
<Version>1.2.20</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Envelope.Logging" Version="1.1.11" />
<PackageReference Include="Envelope.Logging" Version="1.1.17" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.27">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/Envelope.NetHttp/Extensions/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Envelope.Extensions;

public static class ServiceCollectionExtensions
{
public static IServiceCollection AddHttpApiClient<TClient, TOptions>(this IServiceCollection services,
public static IServiceCollection AddHttpApiClient<TClient, TOptions, TCorrelation>(this IServiceCollection services,
Action<TOptions>? configureOptions,
Action<HttpClient>? configureClient = null,
Action<IHttpClientBuilder>? configureHttpClientBuilder = null)
Expand All @@ -26,7 +26,7 @@ public static class ServiceCollectionExtensions
configureOptions?.Invoke(opt);
});

services.TryAddTransient<LogHandler<TOptions>>();
services.TryAddTransient<LogHandler<TOptions, TCorrelation>>();
services.TryAddTransient<PolicyHandler<TOptions>>();

var httpClientBuilder =
Expand All @@ -51,7 +51,7 @@ public static class ServiceCollectionExtensions

//na konci, aby to bol najviac inner handler
httpClientBuilder
.AddHttpMessageHandler<LogHandler<TOptions>>();
.AddHttpMessageHandler<LogHandler<TOptions, TCorrelation>>();

if (options.ApplyToHttpClientHandler)
{
Expand Down
50 changes: 45 additions & 5 deletions src/Envelope.NetHttp/Http/HttpApiClientRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,51 @@ public HttpRequestMessage ToHttpRequestMessage()
}

public string? GetRequestUri()
=> string.IsNullOrWhiteSpace(BaseAddress)
? UriHelper.Combine($"{RelativePath}{QueryString}")
: UriHelper.Combine(
BaseAddress,
$"{RelativePath}{QueryString}");
{
if (string.IsNullOrWhiteSpace(BaseAddress))
{
if (string.IsNullOrWhiteSpace(RelativePath))
{
return QueryString;
}
else
{
if (string.IsNullOrWhiteSpace(QueryString))
{
return RelativePath;
}
else
{
return $"{RelativePath}{QueryString}";
}
}
}
else
{
if (string.IsNullOrWhiteSpace(RelativePath))
{
if (string.IsNullOrWhiteSpace(QueryString))
{
return BaseAddress;
}
else
{
return $"{BaseAddress}{QueryString}";
}
}
else
{
if (string.IsNullOrWhiteSpace(QueryString))
{
return UriHelper.Combine(BaseAddress, RelativePath);
}
else
{
return UriHelper.Combine(BaseAddress, $"{RelativePath}{QueryString}");
}
}
}
}

public System.Net.Http.HttpContent? ToHttpContent()
{
Expand Down
44 changes: 18 additions & 26 deletions src/Envelope.NetHttp/HttpApiClientOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public abstract class HttpApiClientOptions : IValidable
public Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool>? RemoteCertificateValidationCallback { get; set; }
= DefaultServerCertificateValidation.ServerCertificateValidation;

public void SetDefaultRequestResponseLogger<T>()
where T : IRequestResponseLogger
public void SetDefaultRequestResponseLogger<T, TCorrelation>()
where T : IRequestResponseLogger<TCorrelation>
{
_defaultRequestResponseLoggerType = typeof(T);
}
Expand Down Expand Up @@ -241,42 +241,34 @@ public void AddCredentialCache(string uriPrefix, AuthenticationType authenticati
CredentialCache.Add(new Uri(uriPrefix), authenticationType.ToString(), credential);
}

public List<IValidationMessage>? Validate(string? propertyPrefix = null, List<IValidationMessage>? parentErrorBuffer = null, Dictionary<string, object>? validationContext = null)
public List<IValidationMessage>? Validate(
string? propertyPrefix = null,
ValidationBuilder? validationBuilder = null,
Dictionary<string, object>? globalValidationContext = null,
Dictionary<string, object>? customValidationContext = null)
{
//if (string.IsNullOrWhiteSpace(BaseAddress))
//{
// parentErrorBuffer ??= new List<IValidationMessage>();
// parentErrorBuffer.Add(ValidationMessageFactory.Error($"{StringHelper.ConcatIfNotNullOrEmpty(propertyPrefix, ".", nameof(BaseAddress))} == null"));
//}
validationBuilder ??= new ValidationBuilder();
validationBuilder.SetValidationMessages(propertyPrefix, globalValidationContext)
.IfNullOrWhiteSpace(ClientName)
.If(Credentials != null && CredentialCache != null)
;

if (string.IsNullOrWhiteSpace(ClientName))
{
parentErrorBuffer ??= new List<IValidationMessage>();
parentErrorBuffer.Add(ValidationMessageFactory.Error($"{StringHelper.ConcatIfNotNullOrEmpty(propertyPrefix, ".", nameof(ClientName))} == null"));
}

if (Credentials != null && CredentialCache != null)
{
parentErrorBuffer ??= new List<IValidationMessage>();
parentErrorBuffer.Add(ValidationMessageFactory.Error($"{StringHelper.ConcatIfNotNullOrEmpty(propertyPrefix, ".", nameof(Credentials))} != null && {StringHelper.ConcatIfNotNullOrEmpty(propertyPrefix, ".", nameof(CredentialCache))} != null"));
}

return parentErrorBuffer;
return validationBuilder.Build();
}

public virtual IRequestResponseLogger? GetLogger(string? uri, IServiceProvider? serviceProvider = null)
public virtual IRequestResponseLogger<TCorrelation>? GetLogger<TCorrelation>(string? uri, IServiceProvider? serviceProvider = null)
{
if (serviceProvider != null)
{
if (_defaultRequestResponseLoggerType != null)
{
var requestResponseLogger = serviceProvider.GetService(_defaultRequestResponseLoggerType);
if (requestResponseLogger != null)
return (IRequestResponseLogger)requestResponseLogger;
return (IRequestResponseLogger<TCorrelation>)requestResponseLogger;
}
else
{
var requestResponseLogger = serviceProvider.GetService<IRequestResponseLogger>();
var requestResponseLogger = serviceProvider.GetService<IRequestResponseLogger<TCorrelation>>();
if (requestResponseLogger != null)
return requestResponseLogger;
}
Expand All @@ -293,10 +285,10 @@ public void AddCredentialCache(string uriPrefix, AuthenticationType authenticati

var key = UriLoggers.Keys.FirstOrDefault(x => uri!.StartsWith(x));
if (!string.IsNullOrWhiteSpace(key) && UriLoggers.TryGetValue(key, out var logger))
return logger;
return logger as IRequestResponseLogger<TCorrelation>;

if (UriLoggers.TryGetValue("*", out var defaultLogger))
return defaultLogger;
return defaultLogger as IRequestResponseLogger<TCorrelation>;

return null;
}
Expand Down
8 changes: 6 additions & 2 deletions src/Envelope.NetHttp/IRequestResponseLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ namespace Envelope.NetHttp;

public interface IRequestResponseLogger
{
Task<Guid?> LogRequestAsync<TOptions>(
}

public interface IRequestResponseLogger<T> : IRequestResponseLogger
{
Task<T> LogRequestAsync<TOptions>(
RequestDto request,
HttpContentDto requestContent,
ITraceInfo traceInfo,
Expand All @@ -16,7 +20,7 @@ public interface IRequestResponseLogger
where TOptions : HttpApiClientOptions;

Task LogResponseAsync<TOptions>(
Guid requestIdentifier,
T requestIdentifier,
ResponseDto response,
HttpContentDto responseContent,
ITraceInfo traceInfo,
Expand Down
36 changes: 18 additions & 18 deletions src/Envelope.NetHttp/LogHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Envelope.NetHttp;

/// <inheritdoc />
internal class LogHandler<TOptions> : DelegatingHandler
internal class LogHandler<TOptions, TCorrelation> : DelegatingHandler
where TOptions : HttpApiClientOptions
{
#if NET6_0_OR_GREATER
Expand All @@ -21,7 +21,7 @@ internal class LogHandler<TOptions> : DelegatingHandler
private readonly TOptions _options;
private readonly ILogger _errorLogger;

public LogHandler(IOptions<TOptions> options, IServiceProvider serviceProvider, ILogger<LogHandler<TOptions>> errorLogger)
public LogHandler(IOptions<TOptions> options, IServiceProvider serviceProvider, ILogger<LogHandler<TOptions, TCorrelation>> errorLogger)
{
_options = options?.Value ?? throw new ArgumentNullException(nameof(options));
_errorLogger = errorLogger ?? throw new ArgumentNullException(nameof(errorLogger));
Expand All @@ -43,7 +43,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
var exception = $"{nameof(serviceProvider)} == null";
_errorLogger.LogErrorMessage(
_options.SourceSystemName,
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)}"),
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)}"),
true);

throw new InvalidOperationException(exception);
Expand All @@ -54,7 +54,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
var exception = $"{nameof(traceInfo)} == null";
_errorLogger.LogErrorMessage(
_options.SourceSystemName,
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)}"),
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)}"),
true);

throw new InvalidOperationException(exception);
Expand All @@ -65,7 +65,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
var exception = $"{nameof(serviceProvider)} == null";
_errorLogger.LogErrorMessage(
_options.SourceSystemName,
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)}"),
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)}"),
true);

throw new InvalidOperationException(exception);
Expand All @@ -76,7 +76,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
var exception = $"{nameof(traceInfo)} == null";
_errorLogger.LogErrorMessage(
_options.SourceSystemName,
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)}"),
x => x.InternalMessage(exception).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)}"),
true);

throw new InvalidOperationException(exception);
Expand All @@ -85,8 +85,8 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage

traceInfo = TraceInfo.Create(traceInfo);

Guid? requestLogIdentifier = null;
var logger = _options.GetLogger(uri, serviceProvider);
TCorrelation requestLogIdentifier = default;
var logger = _options.GetLogger<TCorrelation>(uri, serviceProvider);
if (logger != null)
{
var requestDto = await RequestDtoMapper.MapAsync(request, null, null, null, true, false, false, cancellationToken).ConfigureAwait(false);
Expand All @@ -106,9 +106,9 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
{
var applicationCoxntext = serviceProvider.GetService<IApplicationContext>();
if (applicationCoxntext != null)
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(ex).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogRequestAsync)}"), true);
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(ex).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogRequestAsync)}"), true);
else
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(ex).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogRequestAsync)}"), true);
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(ex).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogRequestAsync)}"), true);
}

sw = Stopwatch.StartNew();
Expand All @@ -120,7 +120,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
{
response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);

if (logger != null && requestLogIdentifier.HasValue)
if (logger != null && requestLogIdentifier != null)
{
sw?.Stop();

Expand All @@ -130,7 +130,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
try
{
await logger.LogResponseAsync(
requestLogIdentifier.Value,
requestLogIdentifier,
responseDto,
httpContentDto,
traceInfo,
Expand All @@ -142,9 +142,9 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
{
var applicationCoxntext = serviceProvider.GetService<IApplicationContext>();
if (applicationCoxntext != null)
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(ex).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(ex).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
else
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(ex).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(ex).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
}
}

Expand All @@ -154,7 +154,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
{
error = ex.ToStringTrace();

if (logger != null && requestLogIdentifier.HasValue)
if (logger != null && requestLogIdentifier != null)
{
sw?.Stop();

Expand All @@ -164,7 +164,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
try
{
await logger.LogResponseAsync(
requestLogIdentifier.Value,
requestLogIdentifier,
responseDto,
httpContentDto,
traceInfo,
Expand All @@ -176,9 +176,9 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
{
var applicationCoxntext = serviceProvider.GetService<IApplicationContext>();
if (applicationCoxntext != null)
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(exLog).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
_errorLogger.LogErrorMessage(applicationCoxntext, x => x.ExceptionInfo(exLog).Detail($"{_options.SourceSystemName}: {nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
else
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(exLog).Detail($"{nameof(LogHandler<TOptions>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
_errorLogger.LogErrorMessage(_options.SourceSystemName, x => x.ExceptionInfo(exLog).Detail($"{nameof(LogHandler<TOptions, TCorrelation>)}.{nameof(SendAsync)} - {nameof(logger.LogResponseAsync)}"), true);
}
}

Expand Down