Skip to content

Commit aa2772f

Browse files
toniarnoldtoniarnold
committed
Silence nullable warnings
1 parent 4ef5568 commit aa2772f

File tree

12 files changed

+36
-53
lines changed

12 files changed

+36
-53
lines changed

‎asp.core.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29230.61
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32407.343
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "smc", "src\smc\smc.csproj", "{E31521FE-8F57-476A-85E2-8B7501F872DE}"
77
EndProject

‎src/apicaller.core/Services/ServiceClient.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task<ActionResult<string>> Authenticate(string phonenumber)
5959
{
6060
using (var client = GetHttpClient())
6161
{
62-
var request = new AuthenticateRequest() { Phonenumber = phonenumber };
62+
var request = new AuthenticateRequest(phonenumber);
6363
var response = await client.PostAsync(ResouceUri("authenticate"), JsonContent.Serialize(request));
6464
if (response.StatusCode != HttpStatusCode.OK) return new StatusCodeResult((int)HttpStatusCode.ServiceUnavailable);
6565
this.Cookies = response.Headers.GetValues(SetCookie).ToArray();
@@ -73,7 +73,7 @@ public async Task<ActionResult<string>> Verify(string accesscode)
7373
{
7474
using (var client = GetHttpClient())
7575
{
76-
var request = new VerifyRequest() { Accesscode = accesscode };
76+
var request = new VerifyRequest(accesscode);
7777
var response = await client.PostAsync(ResouceUri("verify"), JsonContent.Serialize(request));
7878
if (response.StatusCode != HttpStatusCode.OK) return new StatusCodeResult((int)HttpStatusCode.ServiceUnavailable);
7979
var result = JsonContent.Deserialize<MessageResponseDto>(response.Content) ??

‎src/apiservice.core/Controllers/Accesscode_sm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/* <auto-generated>
22
* ex: set ro:
33
* DO NOT EDIT.
44
* generated by smc (http://smc.sourceforge.net/)

‎src/apiservice.core/Controllers/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Accesscode_sm.cs: Accesscode.sm
77

88
Accesscode_sm.dot: Accesscode.sm
99
java -jar ..\..\smc\Smc.jar -graph -glevel 1 Accesscode.sm
10+
rem Replace the first comment line to silence nullable warnings:
11+
powershell -Command "@('/* <auto-generated>') + ((Get-Content Accesscode_sm.cs) | Select-Object -Skip 1) | Set-Content -Path Accesscode_sm.cs"
1012

1113
Accesscode_sm.png: Accesscode_sm.dot
1214
dot -T png -o Accesscode_sm.png Accesscode_sm.dot

‎src/apiservice.core/View/AuthenticateRequest.cs

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
{
33
public class AuthenticateRequest
44
{
5+
public AuthenticateRequest(string phonenumber)
6+
{
7+
Phonenumber = phonenumber;
8+
}
9+
510
public string Phonenumber { get; set; }
611
}
712
}

‎src/apiservice.core/View/AuthenticateResponse.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
{
33
public class AuthenticateResponse : IMessageResponse
44
{
5-
private readonly AccesscodeContext.AccesscodeControllerState _state;
5+
private readonly AccesscodeContext.AccesscodeControllerState _state = default!;
66

7-
public string State { get; set; }
8-
public string Phonenumber { get; set; }
7+
public string State { get; set; } = default!;
8+
public string Phonenumber { get; set; } = default!;
99

1010
public string Message
1111
{

‎src/apiservice.core/View/VerifyRequest.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
{
33
public class VerifyRequest
44
{
5-
// Phonenumber not needed within the session
5+
public VerifyRequest(string accesscode)
6+
{
7+
Accesscode = accesscode;
8+
}
9+
610
public string Accesscode { get; set; }
711
}
812
}

‎src/apiservice.core/View/VerifyResponse.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ namespace apiservice.View
55
{
66
public class VerifyResponse : IMessageResponse
77
{
8-
private readonly AccesscodeContext.AccesscodeControllerState _state;
8+
private readonly AccesscodeContext.AccesscodeControllerState _state = default!;
99

10-
public string State { get; set; }
11-
public string Phonenumber { get; set; }
10+
public string State { get; set; } = default!;
11+
public string Phonenumber { get; set; } = default!;
1212

1313
public string Message
1414
{

‎src/apitest.core/apiservice/Controllers/AccesscodeControllerTest.cs

+4-16
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,7 @@ public void HeloTest()
6767
[Test]
6868
public void AuthenticateTest()
6969
{
70-
var query = new AuthenticateRequest()
71-
{
72-
Phonenumber = DbTestData.PHONENUMBER
73-
};
70+
var query = new AuthenticateRequest(DbTestData.PHONENUMBER);
7471
var response = Authenticate(query).Result.Value;
7572

7673
Assert.That(response, Is.Not.Null);
@@ -85,10 +82,7 @@ public void VerifySucceedTest()
8582
_pnonenumber = DbTestData.PHONENUMBER;
8683
this.State = Unverified;
8784

88-
var query = new VerifyRequest()
89-
{
90-
Accesscode = ACCESSCODE
91-
};
85+
var query = new VerifyRequest(ACCESSCODE);
9286
var response = Verify(query).Result.Value;
9387

9488
Assert.That(response, Is.Not.Null);
@@ -107,10 +101,7 @@ public void VerifyFailTest()
107101
_pnonenumber = DbTestData.PHONENUMBER;
108102
this.State = Unverified;
109103

110-
var query = new VerifyRequest()
111-
{
112-
Accesscode = "wrong"
113-
};
104+
var query = new VerifyRequest("wrong");
114105
var response = Verify(query).Result.Value;
115106

116107
Assert.That(response, Is.Not.Null);
@@ -129,10 +120,7 @@ public void VerifyDeniedTest()
129120
_pnonenumber = DbTestData.PHONENUMBER;
130121
this.State = Unverified;
131122

132-
var query = new VerifyRequest()
133-
{
134-
Accesscode = "wrong"
135-
};
123+
var query = new VerifyRequest("wrong");
136124
var fail1 = Verify(query).Result.Value;
137125
var fail2 = Verify(query).Result.Value;
138126
var fail3 = Verify(query).Result.Value;

‎src/apitest.core/apiservice/ServerTest.cs

+6-24
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,7 @@ public void AuthenticateTest()
101101
{
102102
using (var client = GetHttpClient())
103103
{
104-
var query = new AuthenticateRequest()
105-
{
106-
Phonenumber = DbTestData.PHONENUMBER
107-
};
104+
var query = new AuthenticateRequest(DbTestData.PHONENUMBER);
108105
var response = client.PostAsync("/api/accesscode/authenticate", JsonContent.Serialize(query)).Result;
109106
var cookies = response.Headers.GetValues(SetCookie).ToArray();
110107
Assert.That(cookies, Has.Exactly(1).Items);
@@ -129,10 +126,7 @@ public void AuthenticateVerifyTest()
129126
{
130127
using (var client = GetHttpClient()) // doessn't retain session cookies by itself
131128
{
132-
var queryAuth = new AuthenticateRequest()
133-
{
134-
Phonenumber = DbTestData.PHONENUMBER
135-
};
129+
var queryAuth = new AuthenticateRequest(DbTestData.PHONENUMBER);
136130
var responseAuth = client.PostAsync("/api/accesscode/authenticate", JsonContent.Serialize(queryAuth)).Result;
137131
var cookies = responseAuth.Headers.GetValues(SetCookie).ToList();
138132
client.DefaultRequestHeaders.Add(Cookie, cookies[0]); // set session
@@ -148,19 +142,13 @@ public void AuthenticateVerifyTest()
148142
// Get the correct access code that "leaks" through IStaticController:
149143
var accesscodeOk = ServiceController._accesscode;
150144

151-
var queryVerifyWrong = new VerifyRequest()
152-
{
153-
Accesscode = "wrong code"
154-
};
145+
var queryVerifyWrong = new VerifyRequest("wrong code");
155146
var responseWrong = client.PostAsync("/api/accesscode/verify", JsonContent.Serialize(queryVerifyWrong)).Result;
156147
var resultWrong = JsonContent.Deserialize<AuthenticateResponse>(responseWrong.Content);
157148
Assert.That(resultWrong, Is.Not.Null);
158149
Assert.That(resultWrong!.State, Is.EqualTo("AuthMap.Unverified"));
159150

160-
var queryVerifyOk = new VerifyRequest()
161-
{
162-
Accesscode = accesscodeOk
163-
};
151+
var queryVerifyOk = new VerifyRequest(accesscodeOk);
164152
var responseOk = client.PostAsync("/api/accesscode/verify", JsonContent.Serialize(queryVerifyOk)).Result;
165153
var resultOk = JsonContent.Deserialize<AuthenticateResponse>(responseOk.Content);
166154
Assert.That(resultOk, Is.Not.Null);
@@ -173,18 +161,12 @@ public void AuthenticateVerifyDeniedTest()
173161
{
174162
using (var client = GetHttpClient()) // doessn't retain session cookies by itself
175163
{
176-
var queryAuth = new AuthenticateRequest()
177-
{
178-
Phonenumber = DbTestData.PHONENUMBER
179-
};
164+
var queryAuth = new AuthenticateRequest(DbTestData.PHONENUMBER);
180165
var responseAuth = client.PostAsync("/api/accesscode/authenticate", JsonContent.Serialize(queryAuth)).Result;
181166
var cookies = responseAuth.Headers.GetValues(SetCookie).ToList();
182167
client.DefaultRequestHeaders.Add(Cookie, cookies[0]); // set session
183168

184-
var queryVerifyWrong = new VerifyRequest()
185-
{
186-
Accesscode = "wrong code"
187-
};
169+
var queryVerifyWrong = new VerifyRequest("wrong code");
188170
for (int i = 0; i < 3; i++)
189171
{
190172
var responseWrong = client.PostAsync("/api/accesscode/verify", JsonContent.Serialize(queryVerifyWrong)).Result;

‎src/iselenium.blazor/TestRunnerSmc/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ TestRunnerFsm_sm.cs: TestRunnerFsm.sm
77

88
TestRunnerFsm_sm.dot: TestRunnerFsm.sm
99
java -jar ..\..\smc\Smc.jar -graph -glevel 1 TestRunnerFsm.sm
10+
rem Replace the first comment line to silence nullable warnings:
11+
powershell -Command "@('/* <auto-generated>') + ((Get-Content TestRunnerFsm_sm.cs) | Select-Object -Skip 1) | Set-Content -Path TestRunnerFsm_sm.cs"
1012

1113
TestRunnerFsm_sm.png: TestRunnerFsm_sm.dot
1214
dot -T png -o TestRunnerFsm_sm.png TestRunnerFsm_sm.dot

‎src/iselenium.blazor/TestRunnerSmc/TestRunnerFsm_sm.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/* <auto-generated>
22
* ex: set ro:
33
* DO NOT EDIT.
44
* generated by smc (http://smc.sourceforge.net/)

0 commit comments

Comments
 (0)