SteeltoeOSS
/
Common
зеркало из https://github.com/SteeltoeOSS/Common.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updates for stylecop compatability

This commit is contained in:
Dave Tillman 2017-12-12 13:29:26 -07:00
Родитель 46cbfe1f07
Коммит b06343362c
46 изменённых файлов: 643 добавлений и 543 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
Common.sln
Просмотреть файл

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2005
VisualStudioVersion = 15.0.27004.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9798FDE-76F4-4848-8AE0-95249C0101F0}"
EndProject
@ -34,6 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
README.md = README.md
stylecop.json = stylecop.json
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Steeltoe.Common", "src\Steeltoe.Common\Steeltoe.Common.csproj", "{4AEA9704-3B99-4317-A959-7D6E4CDD4811}"

1
config/versions-dev.props
Просмотреть файл

@ -6,6 +6,7 @@
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
<AutofacVersion>4.6.1</AutofacVersion>
<StyleCopVersion>1.0.2</StyleCopVersion>
<HttpVersion>4.3.3</HttpVersion>
<MockHttpVersion>3.2.1</MockHttpVersion>
<CoreFxVersion>4.4.0</CoreFxVersion>

1
config/versions-master.props
Просмотреть файл

@ -6,6 +6,7 @@
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
<AutofacVersion>4.6.1</AutofacVersion>
<StyleCopVersion>1.0.2</StyleCopVersion>
<HttpVersion>4.3.3</HttpVersion>
<MockHttpVersion>3.2.1</MockHttpVersion>
<CoreFxVersion>4.4.0</CoreFxVersion>

1
config/versions.props
Просмотреть файл

@ -6,6 +6,7 @@
<AspNetCoreTestVersion>2.0.0</AspNetCoreTestVersion>
<AspNetCoreMvcTestVersion>2.0.0</AspNetCoreMvcTestVersion>
<AutofacVersion>4.6.1</AutofacVersion>
<StyleCopVersion>1.0.2</StyleCopVersion>
<HttpVersion>4.3.3</HttpVersion>
<MockHttpVersion>3.2.1</MockHttpVersion>
<CoreFxVersion>4.4.0</CoreFxVersion>

15
src/Steeltoe.Common.Autofac/Configuration/ConfigurationContainerBuilderExtensions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,27 +11,35 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
using System;
namespace Steeltoe.Common.Configuration.Autofac
{
/// <summary>
/// Extension methods for registering IConfiguration with the Autofac container
/// </summary>
public static class ConfigurationContainerBuilderExtensions
{
/// <summary>
/// Register IConfiguration and IConfgurationRoot with the Autofac container
/// </summary>
/// <param name="container">the container builder to register with</param>
/// <param name="configuration">the configuration instance to add to the container</param>
public static void RegisterConfiguration(this ContainerBuilder container, IConfiguration configuration)
{
if (container == null)
{
throw new ArgumentNullException(nameof(container));
}
if (configuration == null)
{
throw new ArgumentNullException(nameof(configuration));
}
container.RegisterInstance(configuration).As<IConfigurationRoot>().SingleInstance();
container.RegisterInstance(configuration).As<IConfiguration>().SingleInstance();
}

18
src/Steeltoe.Common.Autofac/Logging/DefaultLoggerLevelConfigureOptions.cs
Просмотреть файл

@ -1,6 +1,4 @@
using Microsoft.Extensions.Logging;
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -13,17 +11,23 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace Steeltoe.Common.Logging.Autofac
{
/// <summary>
/// Default logger level configuration when using the Autofac container
/// </summary>
public class DefaultLoggerLevelConfigureOptions : ConfigureOptions<LoggerFilterOptions>
{
public DefaultLoggerLevelConfigureOptions(LogLevel level) :
base(options => options.MinLevel = level)
/// <summary>
/// Initializes a new instance of the <see cref="DefaultLoggerLevelConfigureOptions"/> class.
/// </summary>
/// <param name="level">default log level to configure</param>
public DefaultLoggerLevelConfigureOptions(LogLevel level)
: base(options => options.MinLevel = level)
{
}
}

48
src/Steeltoe.Common.Autofac/Logging/LoggerFilterConfigureOptions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,23 +11,21 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System;
namespace Steeltoe.Common.Logging.Autofac
{
public class LoggerFilterConfigureOptions : IConfigureOptions<LoggerFilterOptions>
{
private readonly IConfiguration _configuration;
private readonly IConfiguration configuration;
public LoggerFilterConfigureOptions(IConfiguration configuration)
{
_configuration = configuration;
this.configuration = configuration;
}
public void Configure(LoggerFilterOptions options)
@ -36,14 +33,31 @@ namespace Steeltoe.Common.Logging.Autofac
LoadDefaultConfigValues(options);
}
private static bool TryGetSwitch(string value, out LogLevel level)
{
if (string.IsNullOrEmpty(value))
{
level = LogLevel.None;
return false;
}
else if (Enum.TryParse(value, true, out level))
{
return true;
}
else
{
throw new InvalidOperationException($"Configuration value '{value}' is not supported.");
}
}
private void LoadDefaultConfigValues(LoggerFilterOptions options)
{
if (_configuration == null)
if (configuration == null)
{
return;
}
foreach (var configurationSection in _configuration.GetChildren())
foreach (var configurationSection in configuration.GetChildren())
{
if (configurationSection.Key == "LogLevel")
{
@ -75,27 +89,11 @@ namespace Steeltoe.Common.Logging.Autofac
{
category = null;
}
var newRule = new LoggerFilterRule(logger, category, level, null);
options.Rules.Add(newRule);
}
}
}
private static bool TryGetSwitch(string value, out LogLevel level)
{
if (string.IsNullOrEmpty(value))
{
level = LogLevel.None;
return false;
}
else if (Enum.TryParse(value, true, out level))
{
return true;
}
else
{
throw new InvalidOperationException($"Configuration value '{value}' is not supported.");
}
}
}
}

6
src/Steeltoe.Common.Autofac/Logging/LoggingContainerBuilderExtensions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
@ -45,12 +43,14 @@ namespace Steeltoe.Common.Logging.Autofac
container.RegisterInstance(new LoggerFilterConfigureOptions(config)).As<IConfigureOptions<LoggerFilterOptions>>().SingleInstance();
container.RegisterInstance(new ConfigurationChangeTokenSource<LoggerFilterOptions>(config)).As<IOptionsChangeTokenSource<LoggerFilterOptions>>().SingleInstance();
}
public static void RegisterConsoleLogging(this ContainerBuilder container)
{
if (container == null)
{
throw new ArgumentNullException(nameof(container));
}
container.RegisterType<ConsoleLoggerProvider>().As<ILoggerProvider>();
}
}

18
src/Steeltoe.Common.Autofac/Options/OptionsContainerBuilderExtensions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,14 +11,12 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options;
using System;
namespace Steeltoe.Common.Options.Autofac
{
public static class OptionsContainerBuilderExtensions
@ -38,10 +35,12 @@ namespace Steeltoe.Common.Options.Autofac
container.RegisterGeneric(typeof(OptionsFactory<>)).As(typeof(IOptionsFactory<>)).InstancePerDependency();
}
public static void RegisterOption<TOption>(this ContainerBuilder container, IConfiguration config) where TOption : class
public static void RegisterOption<TOption>(this ContainerBuilder container, IConfiguration config)
where TOption : class
=> container.RegisterOption<TOption>(Microsoft.Extensions.Options.Options.DefaultName, config);
public static void RegisterOption<TOption>(this ContainerBuilder container, string name, IConfiguration config) where TOption : class
public static void RegisterOption<TOption>(this ContainerBuilder container, string name, IConfiguration config)
where TOption : class
{
if (container == null)
{
@ -57,10 +56,12 @@ namespace Steeltoe.Common.Options.Autofac
container.RegisterInstance(new NamedConfigureFromConfigurationOptions<TOption>(name, config)).As<IConfigureOptions<TOption>>().SingleInstance();
}
public static void RegisterPostConfigure<TOptions>(this ContainerBuilder container, Action<TOptions> configureOptions) where TOptions : class
public static void RegisterPostConfigure<TOptions>(this ContainerBuilder container, Action<TOptions> configureOptions)
where TOptions : class
=> container.RegisterPostConfigure(Microsoft.Extensions.Options.Options.DefaultName, configureOptions);
public static void RegisterPostConfigure<TOptions>(this ContainerBuilder container, string name, Action<TOptions> configureOptions) where TOptions : class
public static void RegisterPostConfigure<TOptions>(this ContainerBuilder container, string name, Action<TOptions> configureOptions)
where TOptions : class
{
if (container == null)
{
@ -71,6 +72,7 @@ namespace Steeltoe.Common.Options.Autofac
{
throw new ArgumentNullException(nameof(configureOptions));
}
container.RegisterInstance(new PostConfigureOptions<TOptions>(name, configureOptions)).As<IPostConfigureOptions<TOptions>>().SingleInstance();
}
}

8
src/Steeltoe.Common.Autofac/Steeltoe.Common.Autofac.csproj
Просмотреть файл

@ -17,14 +17,16 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.Common.Autofac.xml</DocumentationFile>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1124;SA1202;SA1204;SA1309;SA1310;SA1313;SA1600;SA1611;1591;1701;1702;1705</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="$(AutofacVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json">

4
src/Steeltoe.Common.Http/Discovery/DiscoveryHttpClientHandler.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Logging;

46
src/Steeltoe.Common.Http/Discovery/DiscoveryHttpClientHandlerBase.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Logging;
using System;
@ -24,9 +22,9 @@ namespace Steeltoe.Common.Discovery
{
public class DiscoveryHttpClientHandlerBase : HttpClientHandler
{
protected static Random _random = new Random();
protected IDiscoveryClient _client;
protected ILogger _logger;
protected static Random _random = new Random();
public DiscoveryHttpClientHandlerBase(IDiscoveryClient client, ILogger logger = null)
{
@ -39,25 +37,6 @@ namespace Steeltoe.Common.Discovery
_logger = logger;
}
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
var current = request.RequestUri;
try
{
request.RequestUri = LookupService(current);
return await base.SendAsync(request, cancellationToken);
} catch(Exception e)
{
_logger?.LogDebug(e, "Exception during SendAsync()");
throw;
}
finally
{
request.RequestUri = current;
}
}
public virtual Uri LookupService(Uri current)
{
_logger?.LogDebug("LookupService({0})", current.ToString());
@ -72,11 +51,28 @@ namespace Steeltoe.Common.Discovery
int indx = _random.Next(instances.Count);
current = new Uri(instances[indx].Uri, current.PathAndQuery);
}
_logger?.LogDebug("LookupService() returning {0} ", current.ToString());
return current;
}
protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
{
var current = request.RequestUri;
try
{
request.RequestUri = LookupService(current);
return await base.SendAsync(request, cancellationToken);
}
catch (Exception e)
{
_logger?.LogDebug(e, "Exception during SendAsync()");
throw;
}
finally
{
request.RequestUri = current;
}
}
}
}

20
src/Steeltoe.Common.Http/HttpClientExtensions.cs
Просмотреть файл

@ -42,9 +42,9 @@ namespace Steeltoe.Common.Http
/// </summary>
/// <typeparam name="T">Type of object to serialize</typeparam>
/// <param name="httpClient">HttpClient doing the sending</param>
/// <param name="settings">Your Serializer Settings</param>
/// <param name="url">Url to POST to</param>
/// <param name="data">Object to send</param>
/// <param name="settings">Your Serializer Settings</param>
/// <returns>Task to be awaited</returns>
public static Task<HttpResponseMessage> PostAsJsonAsync<T>(this HttpClient httpClient, string url, T data, JsonSerializerSettings settings)
{
@ -57,10 +57,10 @@ namespace Steeltoe.Common.Http
/// <summary>
/// Convert an object to JSON and PUT it
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="httpClient"></param>
/// <param name="url"></param>
/// <param name="data"></param>
/// <typeparam name="T">the type of the data</typeparam>
/// <param name="httpClient">provided HttpClient</param>
/// <param name="url">the http endpoint to Put to</param>
/// <param name="data">the data to put</param>
/// <returns>Task to be awaited</returns>
public static Task<HttpResponseMessage> PutAsJsonAsync<T>(this HttpClient httpClient, string url, T data)
{
@ -73,11 +73,11 @@ namespace Steeltoe.Common.Http
/// <summary>
/// Convert an object to JSON and PUT it
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="httpClient"></param>
/// <param name="url"></param>
/// <param name="data"></param>
/// <param name="settings"></param>
/// <typeparam name="T">the type of the data</typeparam>
/// <param name="httpClient">provided HttpClient</param>
/// <param name="url">the http endpoint to Put to</param>
/// <param name="data">the data to put</param>
/// <param name="settings">the serialization setttings to use</param>
/// <returns>Task to be awaited</returns>
public static Task<HttpResponseMessage> PutAsJsonAsync<T>(this HttpClient httpClient, string url, T data, JsonSerializerSettings settings)
{

111
src/Steeltoe.Common.Http/HttpClientHelper.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
@ -32,34 +30,12 @@ namespace Steeltoe.Common.Http
{
public static class HttpClientHelper
{
internal static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> _reflectedDelegate = null;
private const int DEFAULT_GETACCESSTOKEN_TIMEOUT = 10000; // Milliseconds
private const bool DEFAULT_VALIDATE_CERTIFICATES = true;
private static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> DefaultDelegate { get; } = (sender, cert, chain, sslPolicyErrors) => true;
internal static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> _reflectedDelegate = null;
internal static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> GetDisableDelegate()
{
if (Platform.IsFullFramework)
{
return null;
}
if (_reflectedDelegate != null)
{
return _reflectedDelegate;
}
var property = typeof(HttpClientHandler).GetProperty("DangerousAcceptAnyServerCertificateValidator",
BindingFlags.Public | BindingFlags.Static);
if (property != null)
{
_reflectedDelegate = property.GetValue(null) as Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool>;
if (_reflectedDelegate != null)
{
return _reflectedDelegate;
}
}
return DefaultDelegate;
}
private static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> DefaultDelegate { get; } = (sender, cert, chain, sslPolicyErrors) => true;
public static HttpClient GetHttpClient(bool validateCertificates, int timeout)
{
@ -70,7 +46,6 @@ namespace Steeltoe.Common.Http
}
else
{
if (!validateCertificates)
{
var handler = new HttpClientHandler();
@ -83,10 +58,15 @@ namespace Steeltoe.Common.Http
client = new HttpClient();
}
}
client.Timeout = TimeSpan.FromMilliseconds(timeout);
return client;
}
public static void ConfigureCertificateValidatation(bool validateCertificates, out SecurityProtocolType protocolType, out RemoteCertificateValidationCallback prevValidator)
public static void ConfigureCertificateValidatation(
bool validateCertificates,
out SecurityProtocolType protocolType,
out RemoteCertificateValidationCallback prevValidator)
{
prevValidator = null;
protocolType = (SecurityProtocolType)0;
@ -102,9 +82,12 @@ namespace Steeltoe.Common.Http
}
}
}
public static void RestoreCertificateValidation(bool validateCertificates, SecurityProtocolType protocolType, RemoteCertificateValidationCallback prevValidator)
{
public static void RestoreCertificateValidation(
bool validateCertificates,
SecurityProtocolType protocolType,
RemoteCertificateValidationCallback prevValidator)
{
if (Platform.IsFullFramework)
{
if (!validateCertificates)
@ -112,26 +95,31 @@ namespace Steeltoe.Common.Http
ServicePointManager.SecurityProtocol = protocolType;
ServicePointManager.ServerCertificateValidationCallback = prevValidator;
}
}
}
public static string GetEncodedUserPassword(string user, string password)
{
if (user == null)
{
user = string.Empty;
}
if (password == null)
{
password = string.Empty;
}
return Convert.ToBase64String(Encoding.ASCII.GetBytes(user + ":" + password));
}
public static HttpRequestMessage GetRequestMessage(HttpMethod method, string requestUri, Func<string> GetAccessToken)
public static HttpRequestMessage GetRequestMessage(HttpMethod method, string requestUri, Func<string> getAccessToken)
{
var request = GetRequestMessage(method, requestUri, null, null);
if (GetAccessToken != null)
if (getAccessToken != null)
{
var accessToken = GetAccessToken();
var accessToken = getAccessToken();
if (accessToken != null)
{
@ -139,6 +127,7 @@ namespace Steeltoe.Common.Http
request.Headers.Authorization = auth;
}
}
return request;
}
@ -157,16 +146,22 @@ namespace Steeltoe.Common.Http
var request = new HttpRequestMessage(method, requestUri);
if (!string.IsNullOrEmpty(password))
{
AuthenticationHeaderValue auth = new AuthenticationHeaderValue("Basic",
AuthenticationHeaderValue auth = new AuthenticationHeaderValue(
"Basic",
GetEncodedUserPassword(userName, password));
request.Headers.Authorization = auth;
}
return request;
}
public static async Task<string> GetAccessToken(
string accessTokenUri, string clientId, string clientSecret,
int timeout = DEFAULT_GETACCESSTOKEN_TIMEOUT, bool validateCertificates = DEFAULT_VALIDATE_CERTIFICATES, ILogger logger = null)
string accessTokenUri,
string clientId,
string clientSecret,
int timeout = DEFAULT_GETACCESSTOKEN_TIMEOUT,
bool validateCertificates = DEFAULT_VALIDATE_CERTIFICATES,
ILogger logger = null)
{
if (string.IsNullOrEmpty(accessTokenUri))
@ -183,6 +178,7 @@ namespace Steeltoe.Common.Http
{
throw new ArgumentException(nameof(accessTokenUri));
}
var request = new HttpRequestMessage(HttpMethod.Post, accessTokenUri);
HttpClient client = GetHttpClient(validateCertificates, timeout);
@ -207,8 +203,10 @@ namespace Steeltoe.Common.Http
{
if (response.StatusCode != HttpStatusCode.OK)
{
logger?.LogInformation("GetAccessToken returned status: {0} while obtaining access token from: {1}",
response.StatusCode, accessTokenUri);
logger?.LogInformation(
"GetAccessToken returned status: {0} while obtaining access token from: {1}",
response.StatusCode,
accessTokenUri);
return null;
}
@ -226,7 +224,36 @@ namespace Steeltoe.Common.Http
{
HttpClientHelper.RestoreCertificateValidation(validateCertificates, prevProtocols, prevValidator);
}
return null;
}
internal static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> GetDisableDelegate()
{
if (Platform.IsFullFramework)
{
return null;
}
if (_reflectedDelegate != null)
{
return _reflectedDelegate;
}
var property = typeof(HttpClientHandler).GetProperty(
"DangerousAcceptAnyServerCertificateValidator",
BindingFlags.Public | BindingFlags.Static);
if (property != null)
{
_reflectedDelegate = property.GetValue(null) as Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool>;
if (_reflectedDelegate != null)
{
return _reflectedDelegate;
}
}
return DefaultDelegate;
}
}
}

17
src/Steeltoe.Common.Http/Properties/AssemblyInfo.cs
Просмотреть файл

@ -1,4 +1,17 @@
using System.Runtime.CompilerServices;
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Steeltoe.Common.Http.Test")]

4
src/Steeltoe.Common.Http/SerializationHelper.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;

8
src/Steeltoe.Common.Http/Steeltoe.Common.Http.csproj
Просмотреть файл

@ -17,14 +17,16 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.Common.Http.xml</DocumentationFile>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1124;SA1202;SA1204;SA1309;SA1310;SA1313;SA1600;SA1611;1591;1701;1702;1705</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
<PackageReference Include="System.Net.Http" Version="$(HttpVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(CI_BUILD)' == ''">

8
src/Steeltoe.Common.Net/Steeltoe.Common.Net.csproj
Просмотреть файл

@ -17,11 +17,13 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.Common.Net.xml</DocumentationFile>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;SA1307;1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1124;SA1202;SA1204;SA1309;SA1310;SA1313;SA1600;SA1611;1591;1701;1702;1705</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json">

238
src/Steeltoe.Common.Net/WindowsNetworkFileShare.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System;
using System.Net;
@ -23,7 +21,59 @@ namespace Steeltoe.Common.Net
{
public class WindowsNetworkFileShare
{
readonly string _networkName;
private const int NO_ERROR = 0;
private const int ERROR_ACCESS_DENIED = 5;
private const int ERROR_ALREADY_ASSIGNED = 85;
private const int ERROR_PATH_NOT_FOUND = 53;
private const int ERROR_BAD_DEVICE = 1200;
private const int ERROR_BAD_NET_NAME = 67;
private const int ERROR_BAD_PROVIDER = 1204;
private const int ERROR_CANCELLED = 1223;
private const int ERROR_EXTENDED_ERROR = 1208;
private const int ERROR_INVALID_ADDRESS = 487;
private const int ERROR_INVALID_PARAMETER = 87;
private const int ERROR_INVALID_PASSWORD = 86;
private const int ERROR_INVALID_PASSWORDNAME = 1216;
private const int ERROR_MORE_DATA = 234;
private const int ERROR_NO_MORE_ITEMS = 259;
private const int ERROR_NO_NET_OR_BAD_PATH = 1203;
private const int ERROR_NO_NETWORK = 1222;
private const int ERROR_BAD_PROFILE = 1206;
private const int ERROR_CANNOT_OPEN_PROFILE = 1205;
private const int ERROR_DEVICE_IN_USE = 2404;
private const int ERROR_NOT_CONNECTED = 2250;
private const int ERROR_OPEN_FILES = 2401;
private const int ERROR_LOGON_FAILURE = 1326;
// Created with excel formula:
// ="new ErrorClass("&A1&", """&PROPER(SUBSTITUTE(MID(A1,7,LEN(A1)-6), "_", " "))&"""), "
private static ErrorClass[] error_list = new ErrorClass[]
{
new ErrorClass(ERROR_ACCESS_DENIED, "Error: Access Denied"),
new ErrorClass(ERROR_ALREADY_ASSIGNED, "Error: Already Assigned"),
new ErrorClass(ERROR_BAD_DEVICE, "Error: Bad Device"),
new ErrorClass(ERROR_BAD_NET_NAME, "Error: Bad Net Name"),
new ErrorClass(ERROR_BAD_PROVIDER, "Error: Bad Provider"),
new ErrorClass(ERROR_CANCELLED, "Error: Cancelled"),
new ErrorClass(ERROR_EXTENDED_ERROR, "Error: Extended Error"),
new ErrorClass(ERROR_INVALID_ADDRESS, "Error: Invalid Address"),
new ErrorClass(ERROR_INVALID_PARAMETER, "Error: Invalid Parameter"),
new ErrorClass(ERROR_INVALID_PASSWORD, "Error: Invalid Password"),
new ErrorClass(ERROR_MORE_DATA, "Error: More Data"),
new ErrorClass(ERROR_NO_MORE_ITEMS, "Error: No More Items"),
new ErrorClass(ERROR_NO_NET_OR_BAD_PATH, "Error: No Net Or Bad Path"),
new ErrorClass(ERROR_NO_NETWORK, "Error: No Network"),
new ErrorClass(ERROR_BAD_PROFILE, "Error: Bad Profile"),
new ErrorClass(ERROR_CANNOT_OPEN_PROFILE, "Error: Cannot Open Profile"),
new ErrorClass(ERROR_DEVICE_IN_USE, "Error: Device In Use"),
new ErrorClass(ERROR_EXTENDED_ERROR, "Error: Extended Error"),
new ErrorClass(ERROR_NOT_CONNECTED, "Error: Not Connected"),
new ErrorClass(ERROR_OPEN_FILES, "Error: Open Files"),
new ErrorClass(ERROR_LOGON_FAILURE, "The user name or password is incorrect"),
new ErrorClass(ERROR_PATH_NOT_FOUND, "The network path not found")
};
private readonly string _networkName;
public WindowsNetworkFileShare(string networkName, NetworkCredential credentials)
{
@ -41,7 +91,6 @@ namespace Steeltoe.Common.Net
? credentials.UserName
: string.Format(@"{0}\{1}", credentials.Domain, credentials.UserName);
var result = WNetUseConnection(IntPtr.Zero, netResource, credentials.Password, userName, 0, null, null, null);
if (result != 0)
@ -55,53 +104,6 @@ namespace Steeltoe.Common.Net
Dispose(false);
}
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
WNetCancelConnection2(_networkName, 0, true);
}
[DllImport("mpr.dll")]
private static extern int WNetAddConnection2(NetResource netResource,
string password, string username, int flags);
[DllImport("mpr.dll")]
private static extern int WNetCancelConnection2(string name, int flags,
bool force);
[DllImport("mpr.dll")]
private static extern int WNetUseConnection(
IntPtr hwndOwner,
NetResource netResource,
string password, string username, int flags,
string lpAccessName,
string lpBufferSize,
string lpResult
);
[DllImport("mpr.dll", CharSet = CharSet.Auto)]
public static extern int WNetGetLastError(out int Error,
out StringBuilder ErrorBuf, int ErrorBufSize, out StringBuilder NameBuf, int NameBufSize);
[StructLayout(LayoutKind.Sequential)]
public class NetResource
{
public ResourceScope Scope;
public ResourceType ResourceType;
public ResourceDisplaytype DisplayType;
public int Usage;
public string LocalName;
public string RemoteName;
public string Comment;
public string Provider;
}
public enum ResourceScope : int
{
Connected = 1,
@ -109,7 +111,7 @@ namespace Steeltoe.Common.Net
Remembered,
Recent,
Context
};
}
public enum ResourceType : int
{
@ -134,80 +136,63 @@ namespace Steeltoe.Common.Net
Tree = 0x0a,
Ndscontainer = 0x0b
}
#region Errors
const int NO_ERROR = 0;
const int ERROR_ACCESS_DENIED = 5;
const int ERROR_ALREADY_ASSIGNED = 85;
const int ERROR_PATH_NOT_FOUND = 53;
const int ERROR_BAD_DEVICE = 1200;
const int ERROR_BAD_NET_NAME = 67;
const int ERROR_BAD_PROVIDER = 1204;
const int ERROR_CANCELLED = 1223;
const int ERROR_EXTENDED_ERROR = 1208;
const int ERROR_INVALID_ADDRESS = 487;
const int ERROR_INVALID_PARAMETER = 87;
const int ERROR_INVALID_PASSWORD = 86;
const int ERROR_INVALID_PASSWORDNAME = 1216;
const int ERROR_MORE_DATA = 234;
const int ERROR_NO_MORE_ITEMS = 259;
const int ERROR_NO_NET_OR_BAD_PATH = 1203;
const int ERROR_NO_NETWORK = 1222;
[DllImport("mpr.dll", CharSet = CharSet.Auto)]
public static extern int WNetGetLastError(
out int error,
out StringBuilder errorBuf,
int errorBufSize,
out StringBuilder nameBuf,
int nameBufSize);
const int ERROR_BAD_PROFILE = 1206;
const int ERROR_CANNOT_OPEN_PROFILE = 1205;
const int ERROR_DEVICE_IN_USE = 2404;
const int ERROR_NOT_CONNECTED = 2250;
const int ERROR_OPEN_FILES = 2401;
const int ERROR_LOGON_FAILURE = 1326;
private struct ErrorClass
public void Dispose()
{
public int num;
public string message;
public ErrorClass(int num, string message)
{
this.num = num;
this.message = message;
}
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing)
{
WNetCancelConnection2(_networkName, 0, true);
}
// Created with excel formula:
// ="new ErrorClass("&A1&", """&PROPER(SUBSTITUTE(MID(A1,7,LEN(A1)-6), "_", " "))&"""), "
private static ErrorClass[] ERROR_LIST = new ErrorClass[] {
new ErrorClass(ERROR_ACCESS_DENIED, "Error: Access Denied"),
new ErrorClass(ERROR_ALREADY_ASSIGNED, "Error: Already Assigned"),
new ErrorClass(ERROR_BAD_DEVICE, "Error: Bad Device"),
new ErrorClass(ERROR_BAD_NET_NAME, "Error: Bad Net Name"),
new ErrorClass(ERROR_BAD_PROVIDER, "Error: Bad Provider"),
new ErrorClass(ERROR_CANCELLED, "Error: Cancelled"),
new ErrorClass(ERROR_EXTENDED_ERROR, "Error: Extended Error"),
new ErrorClass(ERROR_INVALID_ADDRESS, "Error: Invalid Address"),
new ErrorClass(ERROR_INVALID_PARAMETER, "Error: Invalid Parameter"),
new ErrorClass(ERROR_INVALID_PASSWORD, "Error: Invalid Password"),
new ErrorClass(ERROR_MORE_DATA, "Error: More Data"),
new ErrorClass(ERROR_NO_MORE_ITEMS, "Error: No More Items"),
new ErrorClass(ERROR_NO_NET_OR_BAD_PATH, "Error: No Net Or Bad Path"),
new ErrorClass(ERROR_NO_NETWORK, "Error: No Network"),
new ErrorClass(ERROR_BAD_PROFILE, "Error: Bad Profile"),
new ErrorClass(ERROR_CANNOT_OPEN_PROFILE, "Error: Cannot Open Profile"),
new ErrorClass(ERROR_DEVICE_IN_USE, "Error: Device In Use"),
new ErrorClass(ERROR_EXTENDED_ERROR, "Error: Extended Error"),
new ErrorClass(ERROR_NOT_CONNECTED, "Error: Not Connected"),
new ErrorClass(ERROR_OPEN_FILES, "Error: Open Files"),
new ErrorClass(ERROR_LOGON_FAILURE,"The user name or password is incorrect"),
new ErrorClass(ERROR_PATH_NOT_FOUND,"The network path not found")
};
[DllImport("mpr.dll")]
private static extern int WNetAddConnection2(
NetResource netResource,
string password,
string username,
int flags);
[DllImport("mpr.dll")]
private static extern int WNetCancelConnection2(
string name,
int flags,
bool force);
[DllImport("mpr.dll")]
private static extern int WNetUseConnection(
IntPtr hwndOwner,
NetResource netResource,
string password,
string username,
int flags,
string lpAccessName,
string lpBufferSize,
string lpResult);
private static string GetErrorForNumber(int errNum)
{
foreach (ErrorClass er in ERROR_LIST)
foreach (ErrorClass er in error_list)
{
if (er.num == errNum) return er.message;
if (er.num == errNum)
{
return er.message;
}
}
return "Error: Unknown, " + errNum;
}
private static string GetLastError(int result)
{
StringBuilder sbErrorBuf = new StringBuilder(500);
@ -216,7 +201,30 @@ namespace Steeltoe.Common.Net
int res = WNetGetLastError(out resultref, out sbErrorBuf, sbErrorBuf.Capacity, out sbNameBuf, sbNameBuf.Capacity);
return sbErrorBuf.ToString();
}
#endregion
private struct ErrorClass
{
public int num;
public string message;
public ErrorClass(int num, string message)
{
this.num = num;
this.message = message;
}
}
[StructLayout(LayoutKind.Sequential)]
public class NetResource
{
public ResourceScope Scope;
public ResourceType ResourceType;
public ResourceDisplaytype DisplayType;
public int Usage;
public string LocalName;
public string RemoteName;
public string Comment;
public string Provider;
}
}
}

21
src/Steeltoe.Common/Configuration/ConfigurationValuesHelper.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,17 +11,14 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System;
namespace Steeltoe.Common.Configuration
{
public static class ConfigurationValuesHelper
{
public static string GetSetting(string key, IConfiguration primary, IConfiguration secondary, IConfiguration resolve, string def)
{
// First check for key in primary
@ -49,10 +45,14 @@ namespace Steeltoe.Common.Configuration
{
int result;
if (int.TryParse(val, out result))
{
return result;
}
}
return def;
}
public static double GetDouble(string key, IConfiguration config, IConfiguration resolve, double def)
{
var val = GetString(key, config, resolve, null);
@ -60,8 +60,11 @@ namespace Steeltoe.Common.Configuration
{
double result;
if (double.TryParse(val, out result))
{
return result;
}
}
return def;
}
@ -71,12 +74,15 @@ namespace Steeltoe.Common.Configuration
if (!string.IsNullOrEmpty(val))
{
bool result;
if (Boolean.TryParse(val, out result))
if (bool.TryParse(val, out result))
{
return result;
}
}
return def;
return def;
}
public static string GetString(string key, IConfiguration config, IConfiguration resolve, string def)
{
if (string.IsNullOrEmpty(key))
@ -94,6 +100,7 @@ namespace Steeltoe.Common.Configuration
{
return PropertyPlaceholderHelper.ResolvePlaceholders(val, resolve);
}
return def;
}
}

31
src/Steeltoe.Common/Configuration/PropertyPlaceHolderHelper.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
@ -25,9 +23,7 @@ namespace Steeltoe.Common.Configuration
/// <summary>
/// Utility class for working with configuration values that have placeholders in them.
/// A placeholder takes the form of <code> ${some:config:reference?default_if_not_present}></code>
///
/// Note: This was "inspired" by the Spring class: PropertyPlaceholderHelper
///
/// </summary>
public static class PropertyPlaceholderHelper
{
@ -50,14 +46,15 @@ namespace Steeltoe.Common.Configuration
private static string ParseStringValue(string property, IConfiguration config, ISet<string> visitedPlaceHolders, ILogger logger = null)
{
if (config == null)
{
return property;
}
if (string.IsNullOrEmpty(property))
{
return property;
}
StringBuilder result = new StringBuilder(property);
@ -67,19 +64,20 @@ namespace Steeltoe.Common.Configuration
int endIndex = FindEndIndex(result, startIndex);
if (endIndex != -1)
{
string placeholder = result.Substring(startIndex + PREFIX.Length, endIndex);
string originalPlaceholder = placeholder;
if (!visitedPlaceHolders.Add(originalPlaceholder))
{
throw new ArgumentException(String.Format("Circular placeholder reference '{0}' in property definitions",
originalPlaceholder));
throw new ArgumentException($"Circular placeholder reference '{originalPlaceholder}' in property definitions");
}
// Recursive invocation, parsing placeholders contained in the placeholder key.
placeholder = ParseStringValue(placeholder, config, visitedPlaceHolders);
// Handle array references foo:bar[1]:baz format -> foo:bar:1:baz
string lookup = placeholder.Replace('[', ':').Replace("]", "");
string lookup = placeholder.Replace('[', ':').Replace("]", string.Empty);
// Now obtain the value for the fully resolved key...
string propVal = config[lookup];
if (propVal == null)
@ -96,6 +94,7 @@ namespace Steeltoe.Common.Configuration
}
}
}
if (propVal != null)
{
// Recursive invocation, parsing placeholders contained in these
@ -110,6 +109,7 @@ namespace Steeltoe.Common.Configuration
// Proceed with unprocessed value.
startIndex = result.IndexOf(PREFIX, endIndex + PREFIX.Length);
}
visitedPlaceHolders.Remove(originalPlaceholder);
}
else
@ -121,14 +121,12 @@ namespace Steeltoe.Common.Configuration
return result.ToString();
}
private static int FindEndIndex(StringBuilder property, int startIndex)
{
int index = startIndex + PREFIX.Length;
int withinNestedPlaceholder = 0;
while (index < property.Length)
{
if (SubstringMatch(property, index, SUFFIX))
{
if (withinNestedPlaceholder > 0)
@ -151,9 +149,10 @@ namespace Steeltoe.Common.Configuration
index++;
}
}
return -1;
return -1;
}
private static bool SubstringMatch(StringBuilder str, int index, string substring)
{
for (int j = 0; j < substring.Length; j++)
@ -164,6 +163,7 @@ namespace Steeltoe.Common.Configuration
return false;
}
}
return true;
}
@ -172,12 +172,17 @@ namespace Steeltoe.Common.Configuration
builder.Remove(start, end - start);
builder.Insert(start, str);
}
private static int IndexOf(this StringBuilder builder, string str, int start)
{
if (start >= builder.Length)
{
return -1;
}
return builder.ToString().IndexOf(str, start);
}
private static string Substring(this StringBuilder builder, int start, int end)
{
return builder.ToString().Substring(start, end - start);

35
src/Steeltoe.Common/Discovery/DiscoveryOptions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,25 +11,34 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System;
namespace Steeltoe.Common.Discovery
{
public enum DiscoveryClientType
{
EUREKA, UNKNOWN
}
public class DiscoveryOptions
{
public DiscoveryOptions(IConfiguration config) : this()
protected string _type;
protected IDiscoveryClientOptions _clientOptions;
protected IDiscoveryRegistrationOptions _registrationOptions;
public DiscoveryOptions(IConfiguration config)
: this()
{
if (config == null)
{
throw new ArgumentNullException(nameof(config));
}
Configure(config);
Configure(config);
}
public DiscoveryOptions()
{
ClientType = DiscoveryClientType.UNKNOWN;
@ -44,7 +52,6 @@ namespace Steeltoe.Common.Discovery
}
}
protected string _type;
public DiscoveryClientType ClientType
{
get
@ -53,47 +60,45 @@ namespace Steeltoe.Common.Discovery
{
return DiscoveryClientType.UNKNOWN;
}
return (DiscoveryClientType)System.Enum.Parse(typeof(DiscoveryClientType), _type);
}
set
{
_type = System.Enum.GetName(typeof(DiscoveryClientType), value);
}
}
protected IDiscoveryClientOptions _clientOptions;
public IDiscoveryClientOptions ClientOptions
{
get
{
return _clientOptions;
}
set
{
_clientOptions = value;
}
}
protected IDiscoveryRegistrationOptions _registrationOptions;
public IDiscoveryRegistrationOptions RegistrationOptions
{
get
{
return _registrationOptions;
}
set
{
_registrationOptions = value;
}
}
public virtual void Configure(IConfiguration config)
{
ClientType = DiscoveryClientType.UNKNOWN;
}
}
public enum DiscoveryClientType { EUREKA, UNKNOWN }
}

17
src/Steeltoe.Common/Discovery/IDiscoveryClient.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,9 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
@ -23,30 +20,28 @@ namespace Steeltoe.Common.Discovery
public interface IDiscoveryClient
{
/// <summary>
/// A human readable description of the implementation
/// Gets a human readable description of the implementation
/// </summary>
string Description { get; }
/// <summary>
/// All known service Ids
/// Gets all known service Ids
/// </summary>
IList<string> Services { get; }
/// <summary>
/// ServiceInstance with information used to register the local service
/// </summary>
/// <returns></returns>
/// <returns>The IServiceInstance</returns>
IServiceInstance GetLocalServiceInstance();
/// <summary>
/// Get all ServiceInstances associated with a particular serviceId
/// </summary>
/// <param name="serviceId">the serviceId to lookup</param>
/// <returns></returns>
IList<IServiceInstance> GetInstances(String serviceId);
/// <returns>List of service instances</returns>
IList<IServiceInstance> GetInstances(string serviceId);
Task ShutdownAsync();
}
}

4
src/Steeltoe.Common/Discovery/IDiscoveryClientOptions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
namespace Steeltoe.Common.Discovery
{

4
src/Steeltoe.Common/Discovery/IDiscoveryLifecycle.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System.Threading;

4
src/Steeltoe.Common/Discovery/IDiscoveryRegistrationOptions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
namespace Steeltoe.Common.Discovery
{

21
src/Steeltoe.Common/Discovery/IServiceInstance.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System;
using System.Collections.Generic;
@ -22,27 +20,32 @@ namespace Steeltoe.Common.Discovery
public interface IServiceInstance
{
/// <summary>
/// The service id as register by the DiscoveryClient
/// Gets the service id as register by the DiscoveryClient
/// </summary>
string ServiceId { get; }
/// <summary>
/// The hostname of the registered ServiceInstance
/// Gets the hostname of the registered ServiceInstance
/// </summary>
string Host { get; }
/// <summary>
/// The port of the registered ServiceInstance
/// Gets the port of the registered ServiceInstance
/// </summary>
int Port { get; }
/// <summary>
/// If the port of the registered ServiceInstance is https or not
/// Gets a value indicating whether if the port of the registered ServiceInstance is https or not
/// </summary>
bool IsSecure { get; }
/// <summary>
/// the service uri address
/// Gets the service uri address
/// </summary>
Uri Uri { get; }
/// <summary>
/// The key value pair metadata associated with the service instance
/// Gets the key value pair metadata associated with the service instance
/// </summary>
IDictionary<string, string> Metadata { get; }
}

13
src/Steeltoe.Common/Options/AbstractOptions.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,8 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System;
@ -24,7 +21,6 @@ namespace Steeltoe.Common.Options
{
public AbstractOptions()
{
}
public AbstractOptions(IConfigurationRoot root, string sectionPrefix = null)
@ -34,17 +30,15 @@ namespace Steeltoe.Common.Options
throw new ArgumentNullException(nameof(root));
}
if (!string.IsNullOrEmpty(sectionPrefix))
{
var section = root.GetSection(sectionPrefix);
section.Bind(this);
} else
}
else
{
root.Bind(this);
}
}
public AbstractOptions(IConfiguration config)
@ -53,6 +47,7 @@ namespace Steeltoe.Common.Options
{
throw new ArgumentNullException(nameof(config));
}
config.Bind(this);
}
}

7
src/Steeltoe.Common/Platform.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System.Runtime.InteropServices;
@ -23,9 +21,8 @@ namespace Steeltoe.Common
public const string NET_FRAMEWORK = ".NET Framework";
public const string NET_CORE = ".NET Core";
public static bool IsFullFramework => RuntimeInformation.FrameworkDescription.StartsWith(NET_FRAMEWORK);
public static bool IsNetCore => RuntimeInformation.FrameworkDescription.StartsWith(NET_CORE);
public static bool IsNetCore => RuntimeInformation.FrameworkDescription.StartsWith(NET_CORE);
}
}

7
src/Steeltoe.Common/Steeltoe.Common.csproj
Просмотреть файл

@ -17,18 +17,23 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Steeltoe.Common.xml</DocumentationFile>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1124;SA1202;SA1204;SA1309;SA1310;SA1313;SA1600;SA1611;1591;1701;1702;1705</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json">
<Link>stylecop.json</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</AdditionalFiles>
</ItemGroup>
</Project>

5
test/Steeltoe.Common.Autofac.Test/Configuration/ConfigurationContainerBuilderExtensionsTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
@ -43,6 +41,5 @@ namespace Steeltoe.Common.Configuration.Autofac.Test
Assert.True(built.IsRegistered<IConfigurationRoot>());
Assert.True(built.IsRegistered<IConfiguration>());
}
}
}

5
test/Steeltoe.Common.Autofac.Test/Logging/LoggingContainerBuilderExtensionsTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
@ -50,7 +48,6 @@ namespace Steeltoe.Common.Autofac.Test.Logging
Assert.NotNull(fac);
var logger = built.Resolve<ILogger<LoggingContainerBuilderExtensionsTest>>();
Assert.NotNull(logger);
}
}
}

16
test/Steeltoe.Common.Autofac.Test/Options/OptionsContainerBuilderExtensions.cs → test/Steeltoe.Common.Autofac.Test/Options/OptionsContainerBuilderExtensionsTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Autofac;
using Microsoft.Extensions.Configuration;
@ -39,7 +37,6 @@ namespace Steeltoe.Common.Options.Autofac.Test
Assert.Throws<ArgumentNullException>(() => container.RegisterOption<MyOption>(null));
ContainerBuilder container2 = new ContainerBuilder();
Assert.Throws<ArgumentNullException>(() => container2.RegisterOption<MyOption>(null));
}
[Fact]
@ -60,10 +57,9 @@ namespace Steeltoe.Common.Options.Autofac.Test
var service = built.Resolve<IOptions<MyOption>>();
Assert.NotNull(service);
Assert.NotNull(service.Value);
Assert.Equal("foobar", service.Value.f1);
Assert.Equal("foobar", service.Value.F1);
}
[Fact]
public void RegisterPostConfigure_Registers_RunsPostAction()
{
@ -79,7 +75,7 @@ namespace Steeltoe.Common.Options.Autofac.Test
container.RegisterOption<MyOption>(config);
container.RegisterPostConfigure<MyOption>((opt) =>
{
opt.f1 = "changed";
opt.F1 = "changed";
});
var built = container.Build();
@ -87,12 +83,12 @@ namespace Steeltoe.Common.Options.Autofac.Test
var service = built.Resolve<IOptions<MyOption>>();
Assert.NotNull(service);
Assert.NotNull(service.Value);
Assert.Equal("changed", service.Value.f1);
Assert.Equal("changed", service.Value.F1);
}
class MyOption
private class MyOption
{
public string f1 { get; set; }
public string F1 { get; set; }
}
}
}

8
test/Steeltoe.Common.Autofac.Test/Steeltoe.Common.Autofac.Test.csproj
Просмотреть файл

@ -13,7 +13,7 @@
</None>
</ItemGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1202;SA1204;SA1309;SA1310;SA1313;SA1402;SA1600;SA1652;1591;1701;1702;1705</NoWarn>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;SA1652;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -25,9 +25,11 @@
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitStudioVersion)" />
<DotNetCliToolReference Include="dotnet-xunit" Version="$(XunitVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json">
<Link>stylecop.json</Link>

112
test/Steeltoe.Common.Http.Test/DiscoveryHttpClientHandlerBaseTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,12 +11,10 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Steeltoe.Common.Discovery;
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Xunit;
@ -43,10 +40,12 @@ namespace Steeltoe.Common.Http.Test
IDiscoveryClient client = new TestDiscoveryClient();
DiscoveryHttpClientHandlerBase handler = new DiscoveryHttpClientHandlerBase(client);
Uri uri = new Uri("http://foo:8080/test");
// Act and Assert
var result = handler.LookupService(uri);
Assert.Equal(uri, result);
}
[Fact]
public void LookupService_DoesntFindService_ReturnsOriginalURI()
{
@ -67,113 +66,10 @@ namespace Steeltoe.Common.Http.Test
IDiscoveryClient client = new TestDiscoveryClient(new TestServiceInstance(new Uri("http://foundit:5555")));
DiscoveryHttpClientHandlerBase handler = new DiscoveryHttpClientHandlerBase(client);
Uri uri = new Uri("http://foo/test/bar/foo?test=1&test2=2");
// Act and Assert
var result = handler.LookupService(uri);
Assert.Equal(new Uri("http://foundit:5555/test/bar/foo?test=1&test2=2"), result);
}
}
class TestDiscoveryClient : IDiscoveryClient
{
private IServiceInstance _instance;
public TestDiscoveryClient(IServiceInstance instance = null)
{
_instance = instance;
}
public string Description
{
get
{
throw new NotImplementedException();
}
}
public IList<string> Services
{
get
{
throw new NotImplementedException();
}
}
public IList<IServiceInstance> GetInstances(string serviceId)
{
if (_instance != null)
{
return new List<IServiceInstance>() { _instance };
}
return new List<IServiceInstance>();
}
public IServiceInstance GetLocalServiceInstance()
{
throw new NotImplementedException();
}
public Task ShutdownAsync()
{
throw new NotImplementedException();
}
}
class TestServiceInstance : IServiceInstance
{
private Uri _uri;
public TestServiceInstance(Uri uri)
{
_uri = uri;
}
public string Host
{
get
{
throw new NotImplementedException();
}
}
public bool IsSecure
{
get
{
throw new NotImplementedException();
}
}
public IDictionary<string, string> Metadata
{
get
{
throw new NotImplementedException();
}
}
public int Port
{
get
{
throw new NotImplementedException();
}
}
public string ServiceId
{
get
{
throw new NotImplementedException();
}
}
public Uri Uri
{
get
{
return _uri;
}
}
}
}

9
test/Steeltoe.Common.Http.Test/HttpClientHelperTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System;
using System.Net;
@ -79,6 +77,7 @@ namespace Steeltoe.Common.Http.Test
Assert.Null(ServicePointManager.ServerCertificateValidationCallback);
}
}
[Fact]
public void RestoreCertificateValidation_ValidateFalse()
{
@ -153,6 +152,7 @@ namespace Steeltoe.Common.Http.Test
Assert.Throws<ArgumentNullException>(() => HttpClientHelper.GetRequestMessage(null, null, null, null));
Assert.Throws<ArgumentNullException>(() => HttpClientHelper.GetRequestMessage(HttpMethod.Get, null, null, null));
}
[Fact]
public void GetRequestMessage_CreatesCorrectMessage()
{
@ -161,7 +161,6 @@ namespace Steeltoe.Common.Http.Test
Assert.Equal(HttpMethod.Put, message.Method);
Assert.Equal("http://localhost/foobar", message.RequestUri.ToString());
Assert.Null(message.Headers.Authorization);
}
[Fact]
@ -197,9 +196,7 @@ namespace Steeltoe.Common.Http.Test
else
{
Assert.NotNull(del1);
}
}
}
}

15
test/Steeltoe.Common.Http.Test/SerializationHelperTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using System;
using System.IO;
@ -47,13 +45,14 @@ namespace Steeltoe.Common.Http.Test
var result = SerializationHelper.Deserialize<Test>(memStream);
Assert.NotNull(result);
Assert.Equal(100, result.f1);
Assert.Equal(200, result.f2);
Assert.Equal(100, result.F1);
Assert.Equal(200, result.F2);
}
class Test
private class Test
{
public int f1=0;
public long f2=0;
public int F1 = 0;
public long F2 = 0;
}
}
}

5
test/Steeltoe.Common.Http.Test/Steeltoe.Common.Http.Test.csproj
Просмотреть файл

@ -14,7 +14,7 @@
</ItemGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1202;SA1204;SA1309;SA1310;SA1313;SA1402;SA1600;SA1652;1591;1701;1702;1705</NoWarn>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;SA1652;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -27,6 +27,9 @@
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitStudioVersion)" />
<DotNetCliToolReference Include="dotnet-xunit" Version="$(XunitVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>

67
test/Steeltoe.Common.Http.Test/TestDiscoveryClient.cs Normal file
Просмотреть файл

@ -0,0 +1,67 @@
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using Steeltoe.Common.Discovery;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Steeltoe.Common.Http.Test
{
internal class TestDiscoveryClient : IDiscoveryClient
{
private IServiceInstance _instance;
public TestDiscoveryClient(IServiceInstance instance = null)
{
_instance = instance;
}
public string Description
{
get
{
throw new NotImplementedException();
}
}
public IList<string> Services
{
get
{
throw new NotImplementedException();
}
}
public IList<IServiceInstance> GetInstances(string serviceId)
{
if (_instance != null)
{
return new List<IServiceInstance>() { _instance };
}
return new List<IServiceInstance>();
}
public IServiceInstance GetLocalServiceInstance()
{
throw new NotImplementedException();
}
public Task ShutdownAsync()
{
throw new NotImplementedException();
}
}
}

78
test/Steeltoe.Common.Http.Test/TestServiceInstance.cs Normal file
Просмотреть файл

@ -0,0 +1,78 @@
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using Steeltoe.Common.Discovery;
using System;
using System.Collections.Generic;
namespace Steeltoe.Common.Http.Test
{
internal class TestServiceInstance : IServiceInstance
{
private Uri _uri;
public TestServiceInstance(Uri uri)
{
_uri = uri;
}
public string Host
{
get
{
throw new NotImplementedException();
}
}
public bool IsSecure
{
get
{
throw new NotImplementedException();
}
}
public IDictionary<string, string> Metadata
{
get
{
throw new NotImplementedException();
}
}
public int Port
{
get
{
throw new NotImplementedException();
}
}
public string ServiceId
{
get
{
throw new NotImplementedException();
}
}
public Uri Uri
{
get
{
return _uri;
}
}
}
}

5
test/Steeltoe.Common.Test/Configuration/ConfigurationValuesHelperTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System;
@ -211,6 +209,7 @@ namespace Steeltoe.Common.Configuration.Test
var result = ConfigurationValuesHelper.GetSetting("a:b", config1, config2, null, "foobar");
Assert.Equal("setting1", result);
}
[Fact]
public void GetSetting_GetsFromSecond()
{

51
test/Steeltoe.Common.Test/Configuration/PropertyPlaceholderHelperTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System.Collections.Generic;
@ -23,17 +21,15 @@ namespace Steeltoe.Common.Configuration.Test
{
public class PropertyPlaceholderHelperTest
{
[Fact]
public void ResolvePlaceholders_ResolvesSinglePlaceholder()
{
// Arrange
string text = "foo=${foo}";
ConfigurationBuilder builder = new ConfigurationBuilder();
var dic1 = new Dictionary<string, string>()
{
{"foo", "bar"}
{ "foo", "bar" }
};
builder.AddInMemoryCollection(dic1);
var config = builder.Build();
@ -42,38 +38,35 @@ namespace Steeltoe.Common.Configuration.Test
string result = PropertyPlaceholderHelper.ResolvePlaceholders(text, config);
Assert.Equal("foo=bar", result);
}
[Fact]
public void ResolvePlaceholders_ResolvesMultiplePlaceholders()
{
// Arrange
string text = "foo=${foo},bar=${bar}";
ConfigurationBuilder builder = new ConfigurationBuilder();
var dic1 = new Dictionary<string, string>()
{
{"foo", "bar"},
{"bar", "baz" }
{ "foo", "bar" },
{ "bar", "baz" }
};
builder.AddInMemoryCollection(dic1);
var config = builder.Build();
// Act and Assert
string result = PropertyPlaceholderHelper.ResolvePlaceholders(text, config);
string result = PropertyPlaceholderHelper.ResolvePlaceholders(text, builder.Build());
Assert.Equal("foo=bar,bar=baz", result);
}
[Fact]
public void ResolvePlaceholders_ResolvesMultipleRecursivePlaceholders()
{
// Arrange
string text = "foo=${bar}";
ConfigurationBuilder builder = new ConfigurationBuilder();
var dic1 = new Dictionary<string, string>()
{
{"bar", "${baz}"},
{"baz", "bar"}
{ "bar", "${baz}" },
{ "baz", "bar" }
};
builder.AddInMemoryCollection(dic1);
var config = builder.Build();
@ -86,15 +79,13 @@ namespace Steeltoe.Common.Configuration.Test
[Fact]
public void ResolvePlaceholders_ResolvesMultipleRecursiveInPlaceholders()
{
// Arrange
string text1 = "foo=${b${inner}}";
ConfigurationBuilder builder1 = new ConfigurationBuilder();
var dic1 = new Dictionary<string, string>()
{
{"bar", "bar"},
{"inner", "ar"}
{ "bar", "bar" },
{ "inner", "ar" }
};
builder1.AddInMemoryCollection(dic1);
var config1 = builder1.Build();
@ -103,33 +94,30 @@ namespace Steeltoe.Common.Configuration.Test
ConfigurationBuilder builder2 = new ConfigurationBuilder();
var dic2 = new Dictionary<string, string>()
{
{"top", "${child}+${child}"},
{"child", "${${differentiator}.grandchild}" },
{"differentiator", "first" },
{"first.grandchild", "actualValue" }
{ "top", "${child}+${child}" },
{ "child", "${${differentiator}.grandchild}" },
{ "differentiator", "first" },
{ "first.grandchild", "actualValue" }
};
builder2.AddInMemoryCollection(dic2);
var config2 = builder2.Build();
// Act and Assert
string result1 = PropertyPlaceholderHelper.ResolvePlaceholders(text1, config1);
Assert.Equal("foo=bar", result1);
string result2 = PropertyPlaceholderHelper.ResolvePlaceholders(text2, config2);
Assert.Equal("actualValue+actualValue", result2);
}
[Fact]
public void ResolvePlaceholders_UnresolvedPlaceholderIsIgnored()
{
// Arrange
string text = "foo=${foo},bar=${bar}";
ConfigurationBuilder builder = new ConfigurationBuilder();
var dic1 = new Dictionary<string, string>()
{
{"foo", "bar"}
{ "foo", "bar" }
};
builder.AddInMemoryCollection(dic1);
var config = builder.Build();
@ -142,7 +130,6 @@ namespace Steeltoe.Common.Configuration.Test
[Fact]
public void ResolvePlaceholders_ResolvesArrayRefPlaceholder()
{
// Arrange
var json1 = @"
{
@ -187,13 +174,11 @@ namespace Steeltoe.Common.Configuration.Test
Assert.Equal("foo=my-app2.10.244.0.34.xip.io", result);
}
static string CreateTempFile(string contents)
private static string CreateTempFile(string contents)
{
var tempFile = Path.GetTempFileName();
File.WriteAllText(tempFile, contents);
return tempFile;
}
}
}

5
test/Steeltoe.Common.Test/Discovery/DiscoveryOptionsTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using System;
@ -39,6 +37,5 @@ namespace Steeltoe.Common.Discovery.Test
var ex = Assert.Throws<ArgumentNullException>(() => new DiscoveryOptions(config));
Assert.Contains(nameof(config), ex.Message);
}
}
}

23
test/Steeltoe.Common.Test/Options/AbstractOptionsTest.cs
Просмотреть файл

@ -1,5 +1,4 @@
//
// Copyright 2017 the original author or authors.
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -12,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
using Microsoft.Extensions.Configuration;
using Steeltoe.Common.Options;
@ -32,7 +30,6 @@ namespace Steeltoe.Common.Test.Options
Assert.Throws<ArgumentNullException>(() => new TestOptions(root, "foobar"));
Assert.Throws<ArgumentNullException>(() => new TestOptions(config));
}
[Fact]
@ -41,7 +38,7 @@ namespace Steeltoe.Common.Test.Options
var builder = new ConfigurationBuilder();
builder.AddInMemoryCollection(new Dictionary<string, string>()
{
{"foo", "bar" }
{ "foo", "bar" }
});
IConfigurationRoot root = builder.Build();
@ -50,31 +47,17 @@ namespace Steeltoe.Common.Test.Options
var opt1 = new TestOptions(root);
Assert.Equal("bar", opt1.Foo);
var opt2 = new TestOptions(config);
Assert.Equal("bar", opt2.Foo);
var builder2 = new ConfigurationBuilder();
builder2.AddInMemoryCollection(new Dictionary<string, string>()
{
{"prefix:foo", "bar" }
{ "prefix:foo", "bar" }
});
IConfigurationRoot root2 = builder2.Build();
var opt3 = new TestOptions(root2, "prefix");
Assert.Equal("bar", opt3.Foo);
}
}
class TestOptions : AbstractOptions
{
public string Foo { get; set; }
public TestOptions(IConfigurationRoot root , string prefix) : base(root, prefix)
{
}
public TestOptions(IConfiguration config) : base (config)
{
}
}
}

34
test/Steeltoe.Common.Test/Options/TestOptions.cs Normal file
Просмотреть файл

@ -0,0 +1,34 @@
// Copyright 2017 the original author or authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
using Microsoft.Extensions.Configuration;
using Steeltoe.Common.Options;
namespace Steeltoe.Common.Test.Options
{
internal class TestOptions : AbstractOptions
{
public TestOptions(IConfigurationRoot root, string prefix)
: base(root, prefix)
{
}
public TestOptions(IConfiguration config)
: base(config)
{
}
public string Foo { get; set; }
}
}

5
test/Steeltoe.Common.Test/Steeltoe.Common.Test.csproj
Просмотреть файл

@ -14,7 +14,7 @@
</ItemGroup>
<PropertyGroup>
<NoWarn>SA1100;SA1101;SA1202;SA1204;SA1309;SA1310;SA1313;SA1402;SA1600;SA1652;1591;1701;1702;1705</NoWarn>
<NoWarn>SA1101;SA1309;SA1310;SA1401;SA1600;SA1652;1591</NoWarn>
</PropertyGroup>
<ItemGroup>
@ -27,6 +27,9 @@
<PackageReference Include="xunit" Version="$(XunitVersion)" />
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitStudioVersion)" />
<DotNetCliToolReference Include="dotnet-xunit" Version="$(XunitVersion)" />
<PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopVersion)">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>