Skip to content

Commit f17ba3d

Browse files
committed
enable nullable reference types across the project to improve null safety
1 parent 54f85a6 commit f17ba3d

63 files changed

Lines changed: 194 additions & 617 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## 3.0.9
2+
- Feature: 开启Nullable特性,在编译阶段检查潜在的 NullReferenceException 问题
13
## 3.0.8
24
- Feature[#842]: 新增新版青龙添加鉴权的说明文档
35
## 3.0.7

common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<Authors>Ray</Authors>
4-
<Version>3.0.8</Version>
4+
<Version>3.0.9</Version>
55
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
66
</PropertyGroup>
77
</Project>

src/Ray.BiliBiliTool.Agent/Attributes/AppendHeaderAttribute.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using System;
2-
using System.Diagnostics;
1+
using System.Diagnostics;
32
using System.Net.Http.Headers;
4-
using System.Threading.Tasks;
53
using WebApiClientCore;
64
using WebApiClientCore.Attributes;
75

@@ -14,19 +12,19 @@ namespace Ray.BiliBiliTool.Agent.Attributes;
1412
)]
1513
public class AppendHeaderAttribute(
1614
string name,
17-
string value,
15+
string? value,
1816
AppendHeaderType appendHeaderType = AppendHeaderType.AddOrReplace
1917
) : ApiActionAttribute, IApiParameterAttribute
2018
{
2119
//添加的顺序为:子类、基类、子类函数、子类函数入参
2220

23-
private readonly string _aliasName;
21+
private readonly string? _aliasName;
2422

2523
public AppendHeaderAttribute(
2624
string aliasName,
2725
AppendHeaderType appendHeaderType = AppendHeaderType.AddOrReplace
2826
)
29-
: this(null, null, appendHeaderType)
27+
: this("", null, appendHeaderType)
3028
{
3129
_aliasName = aliasName;
3230
}
@@ -39,13 +37,13 @@ public override Task OnRequestAsync(ApiRequestContext context)
3937

4038
public Task OnRequestAsync(ApiParameterContext context)
4139
{
42-
string parameterName = _aliasName;
40+
var parameterName = _aliasName;
4341
if (string.IsNullOrEmpty(parameterName))
4442
{
4543
parameterName = context.ParameterName;
4644
}
4745

48-
string text = context.ParameterValue?.ToString();
46+
var text = context.ParameterValue?.ToString();
4947
if (!string.IsNullOrEmpty(text))
5048
{
5149
AddByAppendType(context.HttpContext.RequestMessage.Headers, parameterName, text);
@@ -54,7 +52,7 @@ public Task OnRequestAsync(ApiParameterContext context)
5452
return Task.CompletedTask;
5553
}
5654

57-
private void AddByAppendType(HttpRequestHeaders headers, string key, string value)
55+
private void AddByAppendType(HttpRequestHeaders headers, string key, string? value)
5856
{
5957
switch (appendHeaderType)
6058
{

src/Ray.BiliBiliTool.Agent/Attributes/LogFilterAttribute.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Reflection;
3-
using System.Threading.Tasks;
1+
using System.Reflection;
42
using Microsoft.Extensions.DependencyInjection;
53
using Microsoft.Extensions.Logging;
64
using WebApiClientCore;
@@ -18,13 +16,13 @@ protected override Task WriteLogAsync(ApiResponseContext context, LogMessage log
1816
return Task.CompletedTask;
1917
}
2018

21-
MethodInfo member = context.ApiAction.Member;
22-
var strArray = new string[5];
23-
Type declaringType1 = member.DeclaringType;
24-
strArray[0] = (object)declaringType1 != null ? declaringType1.Namespace : null;
19+
MethodInfo member = context.ActionDescriptor.Member;
20+
var strArray = new string?[5];
21+
var declaringType1 = member.DeclaringType;
22+
strArray[0] = declaringType1?.Namespace;
2523
strArray[1] = ".";
26-
Type declaringType2 = member.DeclaringType;
27-
strArray[2] = (object)declaringType2 != null ? declaringType2.Name : null;
24+
var declaringType2 = member.DeclaringType;
25+
strArray[2] = declaringType2?.Name;
2826
strArray[3] = ".";
2927
strArray[4] = member.Name;
3028
string categoryName = string.Concat(strArray);

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/Article/SearchArticlesByUpIdFullFto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public class SearchArticlesByUpIdDto : IWrid
1616

1717
public string platform { get; set; } = "web";
1818

19-
public string w_rid { get; set; }
19+
public string? w_rid { get; set; }
2020
public long wts { get; set; }
2121
}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/Article/SearchUpArticlesResponse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ namespace Ray.BiliBiliTool.Agent.BiliBiliAgent.Dtos.Article;
44

55
public class SearchUpArticlesResponse
66
{
7-
public List<ArticleInfo> Articles { get; set; }
7+
public List<ArticleInfo> Articles { get; set; } = [];
88
public int Count { get; set; }
99
}
1010

1111
public class ArticleInfo
1212
{
1313
public long Id { get; set; }
1414

15-
public string Title { get; set; }
15+
public required string Title { get; set; }
1616
}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/BaseAppRequest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ public class BaseAppRequest
2626

2727
// public long ts { get; set; }
2828

29-
public string sign { get; set; }
29+
public string? sign { get; set; }
3030
}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/BiliApiResponse.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class BiliApiResponse<TData>
66
{
77
public int Code { get; set; } = int.MinValue;
88

9-
public string Message { get; set; }
9+
public string? Message { get; set; }
1010

11-
public TData Data { get; set; }
11+
public TData? Data { get; set; }
1212
}

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/ChargeResponse.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class ChargeResponse
44
{
55
public int Status { get; set; }
66

7-
public string Order_no { get; set; }
7+
public required string Order_no { get; set; }
88
}
99

1010
public class ChargeV2Response

src/Ray.BiliBiliTool.Agent/BiliBiliAgent/Dtos/GetSpaceInfoFullDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ public class GetSpaceInfoDto : IWrid
66
{
77
public long mid { get; set; }
88

9-
public string w_rid { get; set; }
9+
public string? w_rid { get; set; }
1010
public long wts { get; set; }
1111
}

0 commit comments

Comments
 (0)