Browse Source

Enable nullable annotations for Volo.Abp.Dapr

pull/17303/head
liangshiwei 3 years ago
parent
commit
29f5b89114
  1. 2
      framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
  2. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs
  3. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
  4. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs
  5. 4
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs
  6. 8
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs
  7. 4
      framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs

2
framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj

@ -5,6 +5,8 @@
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<WarningsAsErrors>Nullable</WarningsAsErrors>
<RootNamespace />
</PropertyGroup>

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs

@ -24,7 +24,7 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
JsonSerializerOptions = CreateJsonSerializerOptions(systemTextJsonSerializerOptions.Value);
}
public virtual DaprClient Create(Action<DaprClientBuilder> builderAction = null)
public virtual DaprClient Create(Action<DaprClientBuilder>? builderAction = null)
{
var builder = new DaprClientBuilder()
.UseJsonSerializationOptions(JsonSerializerOptions);
@ -51,9 +51,9 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
}
public virtual HttpClient CreateHttpClient(
string appId = null,
string daprEndpoint = null,
string daprApiToken = null)
string? appId = null,
string? daprEndpoint = null,
string? daprApiToken = null)
{
if(daprEndpoint.IsNullOrWhiteSpace() &&
!DaprOptions.HttpEndpoint.IsNullOrWhiteSpace())

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs

@ -33,14 +33,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["DAPR_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
options.DaprApiToken = confEnv;
options.DaprApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("DAPR_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
options.DaprApiToken = env;
options.DaprApiToken = env!;
}
}
}
@ -50,14 +50,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["APP_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
options.AppApiToken = confEnv;
options.AppApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("APP_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
options.AppApiToken = env;
options.AppApiToken = env!;
}
}
}

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs

@ -2,11 +2,11 @@
public class AbpDaprOptions
{
public string HttpEndpoint { get; set; }
public string? HttpEndpoint { get; set; }
public string GrpcEndpoint { get; set; }
public string? GrpcEndpoint { get; set; }
public string DaprApiToken { get; set; }
public string? DaprApiToken { get; set; }
public string AppApiToken { get; set; }
public string? AppApiToken { get; set; }
}

4
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs

@ -12,12 +12,12 @@ public class DaprApiTokenProvider : IDaprApiTokenProvider, ISingletonDependency
Options = options.Value;
}
public virtual string GetDaprApiToken()
public virtual string? GetDaprApiToken()
{
return Options.DaprApiToken;
}
public virtual string GetAppApiToken()
public virtual string? GetAppApiToken()
{
return Options.AppApiToken;
}

8
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs

@ -6,11 +6,11 @@ namespace Volo.Abp.Dapr;
public interface IAbpDaprClientFactory
{
DaprClient Create(Action<DaprClientBuilder> builderAction = null);
DaprClient Create(Action<DaprClientBuilder>? builderAction = null);
HttpClient CreateHttpClient(
string appId = null,
string daprEndpoint = null,
string daprApiToken = null
string? appId = null,
string? daprEndpoint = null,
string? daprApiToken = null
);
}

4
framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs

@ -2,7 +2,7 @@ namespace Volo.Abp.Dapr;
public interface IDaprApiTokenProvider
{
string GetDaprApiToken();
string? GetDaprApiToken();
string GetAppApiToken();
string? GetAppApiToken();
}

Loading…
Cancel
Save